[WINDOWS] Update to compile with GCC4.8.1

[andy/viking.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 58a9237cae0b806c1ac4eab4fc33e94f2dc8aca0..9bf0f871c36409c2bf6bf94790e8ddbe43990825 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,20 @@ AC_CHECK_LIB(m, tan)
 AC_CHECK_LIB(z, inflate)
 AC_CHECK_LIB(X11, XSetErrorHandler)
 
+# ATM not running automake under Windows
+#AC_CHECK_PROG(USE_WINDOWS, cmd.exe, yes, no)
+#AM_CONDITIONAL([WINDOWS], [test x$USE_WINDOWS = xyes])
+# So pass in as an option instead
+# This is only to perform slightly different build steps
+#  (the code uses standard WINDOWS defines for any specific different behaviour)
+AC_ARG_ENABLE(windows, AC_HELP_STRING([--enable-windows],
+              [Perform specific Windows build steps (default is no)]),
+              [ac_cv_enable_windows=$enableval],
+              [ac_cv_enable_windows=no])
+AC_CACHE_CHECK([whether to enable Windows build steps],
+               [ac_cv_enable_windows], [ac_cv_enable_windows=no])
+AM_CONDITIONAL([WINDOWS], [test x$ac_cv_enable_windows = xyes])
+
 # Expat
 AM_WITH_EXPAT
 
@@ -134,9 +148,9 @@ esac
 AM_CONDITIONAL([GOOGLE], [test x$ac_cv_enable_google = xyes])
 
 AC_ARG_ENABLE(terraserver, AC_HELP_STRING([--enable-terraserver],
-              [enable Terraserver stuff (default is enable)]),
+              [enable Terraserver stuff (default is disabled as the tileserver is no longer available)]),
               [ac_cv_enable_terraserver=$enableval],
-              [ac_cv_enable_terraserver=yes])
+              [ac_cv_enable_terraserver=no])
 AC_CACHE_CHECK([whether to enable Terraserver stuff],
                [ac_cv_enable_terraserver], [ac_cv_enable_terraserver=yes])
 case $ac_cv_enable_terraserver in
@@ -228,20 +242,6 @@ case $ac_cv_enable_geotag in
 esac
 AM_CONDITIONAL([GEOTAG], [test x$ac_cv_enable_geotag = xyes])
 
-AC_ARG_ENABLE(spotmaps, AC_HELP_STRING([--enable-spotmaps],
-             [enable SPOTMaps map (default is enable).]),
-              [ac_cv_enable_spotmaps=$enableval],
-              [ac_cv_enable_spotmaps=yes])
-AC_CACHE_CHECK([whether to enable SPOTMaps map],
-               [ac_cv_enable_spotmaps], [ac_cv_enable_spotmaps=yes])
-case $ac_cv_enable_spotmaps in
-  yes)
-    AC_DEFINE(VIK_CONFIG_SPOTMAPS, [], [SPOTMAPS STUFF])
-    ;;
-esac
-AM_CONDITIONAL([SPOTMAPS], [test x$ac_cv_enable_spotmaps = xyes])
-
-
 AC_ARG_ENABLE(dem24k, AC_HELP_STRING([--enable-dem24k],
              [enable USGS 24k DEM (default is disable) download source. Requires dem24k.pl script in path.]),
               [ac_cv_enable_dem24k=$enableval],
@@ -367,6 +367,7 @@ AC_ARG_WITH(tileage,
              [VIK_CONFIG_DEFAULT_TILE_AGE=604800])
 AC_DEFINE_UNQUOTED(VIK_CONFIG_DEFAULT_TILE_AGE, ${VIK_CONFIG_DEFAULT_TILE_AGE},
                    [Age of tiles before checking it (in seconds)])
+AC_DEFINE(HAVE_VIKING, 1, [Enable Viking specifics in otherwise reusable code])
 
 dnl man pages processing
 DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
@@ -389,6 +390,7 @@ AC_CONFIG_FILES([
                src/icons/Makefile
                po/Makefile.in
                data/Makefile
+               tools/Makefile
                test/Makefile
                help/Makefile
                win32/Makefile
@@ -416,7 +418,6 @@ echo "Terraserver Maps                 : $ac_cv_enable_terraserver"
 echo "Expedia Maps                     : $ac_cv_enable_expedia"
 echo "Open Street Map                  : $ac_cv_enable_openstreetmap"
 echo "BlueMarble                       : $ac_cv_enable_bluemarble"
-echo "SPOTMaps                         : $ac_cv_enable_spotmaps"
 echo "Geonames                         : $ac_cv_enable_geonames"
 echo "Geocaches Acquire                : $ac_cv_enable_geocaches"
 echo "Geotag Support                   : $ac_cv_enable_geotag"