Diff of /trunk/configure.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 256 by harbaum, Wed Feb 10 19:19:55 2010 UTC revision 301 by harbaum, Fri Aug 27 19:30:44 2010 UTC
# Line 21  Line 21 
21  # along with GPXView.  If not, see <http://www.gnu.org/licenses/>.  # along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
22    
23  AC_PREREQ(2.61)  AC_PREREQ(2.61)
24  AC_INIT([GPXView],[0.9.3],[till@harbaum.org])  AC_INIT([GPXView],[0.9.6],[till@harbaum.org])
25  AC_CONFIG_SRCDIR([src/main.c])  AC_CONFIG_SRCDIR([src/main.c])
26  # AC_CONFIG_HEADER([src/config.h])  # AC_CONFIG_HEADER([src/config.h])
27    
# Line 78  PKG_CHECK_MODULES([libsoup24], [libsoup- Line 78  PKG_CHECK_MODULES([libsoup24], [libsoup-
78  ], [  ], [
79    PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [    PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [
80      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
81      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DUSE_LIBSOUP22 -DENABLE_OSM_GPS_MAP"
82      LIBS="$LIBS $libsoup22_LIBS"      LIBS="$LIBS $libsoup22_LIBS"
83    ], [    ], [
84      AC_MSG_NOTICE([WARNING: libsoup-2.4/2.2 missing, disabling internal map])      AC_MSG_NOTICE([WARNING: libsoup-2.4/2.2 missing, disabling internal map])
# Line 220  XB-Maemo-Icon-26: Line 220  XB-Maemo-Icon-26:
220      LIBS="$LIBS -lespeak"      LIBS="$LIBS -lespeak"
221    ])    ])
222    
223      # check for libgps
224      PKG_CHECK_MODULES([gps], [libgps], [
225        CFLAGS="$CFLAGS $gps_CFLAGS -DUSE_LIBGPS"
226        LIBS="$LIBS $gps_LIBS"
227      ], [AC_MSG_NOTICE([No libgps found, using direct GPSD])])
228    
229    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
230    
231    ICON=" No icon"    ICON=" No icon"

Legend:
Removed from v.256  
changed lines
  Added in v.301