--- trunk/configure.in	2009/07/05 17:38:06	21
+++ trunk/configure.in	2009/07/30 12:41:20	36
@@ -21,7 +21,7 @@
 # along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([GPXView],[0.7.1],[till@harbaum.org])
+AC_INIT([GPXView],[0.7.4],[till@harbaum.org])
 AC_CONFIG_SRCDIR([src/main.c])
 # AC_CONFIG_HEADER([src/config.h])
 
@@ -64,6 +64,20 @@
 PKG_CHECK_MODULES([libxml2], [libxml-2.0], [], [AC_MSG_ERROR([libxml-2.0 missing])])
 CFLAGS="$CFLAGS $libxml2_CFLAGS"
 LIBS="$LIBS $libxml2_LIBS"
+# check for libsoup
+PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [
+  EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"
+  CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
+  LIBS="$LIBS $libsoup24_LIBS"
+], [
+  PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [
+    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"
+    CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
+    LIBS="$LIBS $libsoup22_LIBS"
+  ], [
+    AC_MSG_NOTICE([WARNING: libsoup-2.4/2.2 missing, disabling internal map])
+  ])
+])
 
 # check for gtkhtml-3.14
 PKG_CHECK_MODULES([libgtkhtml3_14], [libgtkhtml-3.14], [
@@ -141,11 +155,9 @@
   ])
 
   # maemo uses dbus for ipc with maemo mapper
-  EXTRA_OBJS="mm_poi.o dbus.o"
-  AC_SUBST(EXTRA_OBJS)
+  EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"
 
   INSTALL_PLATTFORM="install-maemo"
-  AC_SUBST(INSTALL_PLATTFORM)
   
 ], [
   AC_MSG_RESULT(no)
@@ -161,10 +173,10 @@
   LIBS="$LIBS $gnome2_LIBS"
 
   INSTALL_PLATTFORM="install-debian"
-  AC_SUBST(INSTALL_PLATTFORM)
 ])
 
-
+AC_SUBST(EXTRA_OBJS)
+AC_SUBST(INSTALL_PLATTFORM)
 AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])
 
 AC_OUTPUT