Diff of /trunk/configure.in

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

revision 26 by harbaum, Tue Jul 7 15:31:32 2009 UTC revision 36 by harbaum, Thu Jul 30 12:41:20 2009 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.7.3],[till@harbaum.org])  AC_INIT([GPXView],[0.7.4],[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 64  LIBS="$LIBS $gnome_vfs_module_LIBS" Line 64  LIBS="$LIBS $gnome_vfs_module_LIBS"
64  PKG_CHECK_MODULES([libxml2], [libxml-2.0], [], [AC_MSG_ERROR([libxml-2.0 missing])])  PKG_CHECK_MODULES([libxml2], [libxml-2.0], [], [AC_MSG_ERROR([libxml-2.0 missing])])
65  CFLAGS="$CFLAGS $libxml2_CFLAGS"  CFLAGS="$CFLAGS $libxml2_CFLAGS"
66  LIBS="$LIBS $libxml2_LIBS"  LIBS="$LIBS $libxml2_LIBS"
67    # check for libsoup
68    PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [
69      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"
70      CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
71      LIBS="$LIBS $libsoup24_LIBS"
72    ], [
73      PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [
74        EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"
75        CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
76        LIBS="$LIBS $libsoup22_LIBS"
77      ], [
78        AC_MSG_NOTICE([WARNING: libsoup-2.4/2.2 missing, disabling internal map])
79      ])
80    ])
81    
82  # check for gtkhtml-3.14  # check for gtkhtml-3.14
83  PKG_CHECK_MODULES([libgtkhtml3_14], [libgtkhtml-3.14], [  PKG_CHECK_MODULES([libgtkhtml3_14], [libgtkhtml-3.14], [
# Line 141  PKG_CHECK_EXISTS(maemo-version, [ Line 155  PKG_CHECK_EXISTS(maemo-version, [
155    ])    ])
156    
157    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
158    EXTRA_OBJS="mm_poi.o dbus.o"    EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"
   AC_SUBST(EXTRA_OBJS)  
159    
160    INSTALL_PLATTFORM="install-maemo"    INSTALL_PLATTFORM="install-maemo"
   AC_SUBST(INSTALL_PLATTFORM)  
161    
162  ], [  ], [
163    AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
# Line 161  PKG_CHECK_EXISTS(maemo-version, [ Line 173  PKG_CHECK_EXISTS(maemo-version, [
173    LIBS="$LIBS $gnome2_LIBS"    LIBS="$LIBS $gnome2_LIBS"
174    
175    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
   AC_SUBST(INSTALL_PLATTFORM)  
176  ])  ])
177    
178    AC_SUBST(EXTRA_OBJS)
179    AC_SUBST(INSTALL_PLATTFORM)
180  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])
181    
182  AC_OUTPUT  AC_OUTPUT
Legend:
Removed from v.26  
changed lines
  Added in v.36