Allows to enable/disable OpenStreetMap module

diff --git a/ChangeLog b/ChangeLog
index a5e84f4d200df8802aefe539740f14a1a448b96d..f8ca44ec27daf891d78e6e94c00e71a8dd587bde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2007-04-28
 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
        * OpenSourceMap slippy maps (in osm.c) -- Maplink tiles
+       * Add configuration option for OpenStreetMap sources
 
 2007-04-23
 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>

diff --git a/configure.ac b/configure.ac
index fb949b419423cac97917bd7402db44ba49589ea9..ed45e33050153737ec24d1bb22649683ac932fde 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,20 @@ case $ac_cv_enable_expedia in
 esac
 AM_CONDITIONAL([EXPEDIA], [test x$ac_cv_enable_expedia = xyes])
 
+# OpenStreetMap http://www.openstreetmap.org/
+AC_ARG_ENABLE(openstreetmap, AC_HELP_STRING([--enable-openstreetmap],
+              [enable OpenStreetMap stuff (default is enable)]),
+              [ac_cv_enable_openstreetmap=$enableval],
+              [ac_cv_enable_openstreetmap=yes])
+AC_CACHE_CHECK([whether to enable OpenStreetMap stuff],
+               [ac_cv_enable_openstreetmap], [ac_cv_enable_openstreetmap=yes])
+case $ac_cv_enable_openstreetmap in
+  yes)
+    AC_DEFINE(VIK_CONFIG_OPENSTREETMAP, [], [OPENSTREETMAP STUFF])
+    ;;
+esac
+AM_CONDITIONAL([OPENSTREETMAP], [test x$ac_cv_enable_openstreetmap = xyes])
+
 AC_ARG_WITH(mapcache,
             [AC_HELP_STRING([--with-mapcache],
                             [specify the size of the map cache (default is 50331648)])],

diff --git a/src/Makefile.am b/src/Makefile.am
index fc652c6e5e90346efa09af6c275136b7192ffcdc..9a0ef886a68bddf492257a07a72b0ecf9ac95873 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,8 +83,10 @@ viking_SOURCES += \
        expedia.c expedia.h
 endif
 
+if OPENSTREETMAP
 viking_SOURCES += \
        osm.c osm.h
+endif
 
 
 INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@

diff --git a/src/modules.c b/src/modules.c
index da528b089986b464677ad4cd3cfb514102b117f3..f750e48972b0315b9c294f1feee9d418085f7628 100644 (file)
--- a/src/modules.c
+++ b/src/modules.c
@@ -45,6 +45,8 @@ void modules_init()
 #ifdef VIK_CONFIG_TERRASERVER
   terraserver_init();
 #endif
+#ifdef VIK_CONFIG_OPENSTREETMAP
   osm_init();
+#endif
 }