Diff of /trunk/configure.in

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

revision 30 by harbaum, Fri Jul 24 19:24:42 2009 UTC revision 32 by harbaum, Tue Jul 28 13:21:22 2009 UTC
# 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 164  PKG_CHECK_EXISTS(maemo-version, [ Line 178  PKG_CHECK_EXISTS(maemo-version, [
178    AC_SUBST(INSTALL_PLATTFORM)    AC_SUBST(INSTALL_PLATTFORM)
179  ])  ])
180    
   
181  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])
182    
183  AC_OUTPUT  AC_OUTPUT
Legend:
Removed from v.30  
changed lines
  Added in v.32