From ca9eb04adfba884a01a5035f97ce4d9658a4a254 Mon Sep 17 00:00:00 2001 From: Guilhem Bonnefille Date: Sat, 28 Apr 2007 15:14:19 +0000 Subject: [PATCH] Allows to enable/disable OpenStreetMap module --- ChangeLog | 1 + configure.ac | 14 ++++++++++++++ src/Makefile.am | 2 ++ src/modules.c | 2 ++ 4 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index a5e84f4d..f8ca44ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2007-04-28 Guilhem Bonnefille * OpenSourceMap slippy maps (in osm.c) -- Maplink tiles + * Add configuration option for OpenStreetMap sources 2007-04-23 Guilhem Bonnefille diff --git a/configure.ac b/configure.ac index fb949b41..ed45e330 100644 --- 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 fc652c6e..9a0ef886 100644 --- 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 da528b08..f750e489 100644 --- 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 } -- 2.39.5