Add conditional compilation for geonames

diff --git a/configure.ac b/configure.ac
index a76d9890cc951454d810ea19a06332af78941c73..1cd8a0be33b559d1603e56514d95f79f35e2ffca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,20 @@ case $ac_cv_enable_openaerial in
 esac
 AM_CONDITIONAL([OPENAERIAL], [test x$ac_cv_enable_openaerial = xyes])
 
+# GeoNames http://www.geonames.org/
+AC_ARG_ENABLE(geonames, AC_HELP_STRING([--enable-geonames],
+              [enable Geonames stuff (default is enable)]),
+              [ac_cv_enable_geonames=$enableval],
+              [ac_cv_enable_geonames=yes])
+AC_CACHE_CHECK([whether to enable Geonames stuff],
+               [ac_cv_enable_geonames], [ac_cv_enable_geonames=yes])
+case $ac_cv_enable_geonames in
+  yes)
+    AC_DEFINE(VIK_CONFIG_GEONAMES, [], [GEONAMES STUFF])
+    ;;
+esac
+AM_CONDITIONAL([GEONAMES], [test x$ac_cv_enable_geonames = xyes])
+
 AC_ARG_ENABLE(geocaches, AC_HELP_STRING([--enable-geocaches],
              [enable Geocaches Acquire (default is disable).]),
               [ac_cv_enable_geocaches=$enableval],
@@ -240,6 +254,7 @@ echo "Google Maps                      : $ac_cv_enable_google"
 echo "Terraserver Maps                 : $ac_cv_enable_terraserver"
 #echo "Expedia Maps                     : $ac_cv_enable_expedia"
 echo "Open Street Map                  : $ac_cv_enable_openstreetmap"
+echo "Geonames                         : $ac_cv_enable_geonames"
 #echo "Geocaches Acquire                : $ac_cv_enable_geocaches"
 echo "USGS 24k DEM                     : $ac_cv_enable_dem24k"
 echo "Realtime GPS Tracking            : $ac_cv_enable_realtimegpstracking"

diff --git a/src/Makefile.am b/src/Makefile.am
index 994c858bb78ba99b9d31a70a73a3244b26bfbd54..d12f10bdf9d83533fdea285b217d45c2728e2936 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,7 +65,6 @@ libviking_a_SOURCES = \
        datasource_gc.c \
        datasource_bfilter.c \
        datasources.h \
-       geonamessearch.c geonamessearch.h \
        dem.c dem.h \
        vikdemlayer.h vikdemlayer.c \
        vikfilelist.c vikfilelist.h \
@@ -101,6 +100,11 @@ libviking_a_SOURCES += \
        osm-traces.c osm-traces.h
 endif
 
+if GEONAMES
+libviking_a_SOURCES += \
+       geonamessearch.c geonamessearch.h
+endif
+
 viking_SOURCES = main.c
 
 INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@

diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
index e43b88d8bb7f03d58de58c7158ff01f1193759c4..1cd3878451b7e9de7165410725b19d4503f33dd3 100644 (file)
--- a/src/viktrwlayer.c
+++ b/src/viktrwlayer.c
@@ -1757,6 +1757,7 @@ void vik_trw_layer_add_menu_items ( VikTrwLayer *vtl, GtkMenu *menu, gpointer vl
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show ( item );
 
+#ifdef VIK_CONFIG_GEONAMES
   wikipedia_submenu = gtk_menu_new();
   item = gtk_menu_item_new_with_label ( _("Add Wikipedia Waypoints") );
   gtk_menu_shell_append(GTK_MENU_SHELL (menu), item);
@@ -1772,6 +1773,7 @@ void vik_trw_layer_add_menu_items ( VikTrwLayer *vtl, GtkMenu *menu, gpointer vl
   g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_new_wikipedia_wp_viewport), pass_along );
   gtk_menu_shell_append (GTK_MENU_SHELL (wikipedia_submenu), item);
   gtk_widget_show ( item );
+#endif
 
 #ifdef VIK_CONFIG_OPENSTREETMAP 
   item = gtk_menu_item_new_with_label ( _("Upload to OSM") );