Ctrl-shift-scroll to zoom like google, scroll to zoom w/o changing

[andy/viking.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8a6370e77c3b03bebcc09ecacf410bb7dc28de8f..aab1e3853c4535b64906c30f65c11b133b8dfa3a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(viking, 0.9)
+AC_INIT(viking, 0.9.2)
 AM_INIT_AUTOMAKE()
 dnl AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([src/config.h])
@@ -22,7 +22,7 @@ AC_TYPE_MODE_T
 # Checks for library functions.
 AC_FUNC_STAT
 AC_FUNC_STRTOD
-AC_CHECK_FUNCS([bzero floor gethostbyname memset mkdir pow realpath socket sqrt strcasecmp strchr strdup strncasecmp strtol strtoul])
+AC_CHECK_FUNCS([bzero floor gethostbyname memset mkdir mkdtemp pow realpath socket sqrt strcasecmp strchr strdup strncasecmp strtol strtoul])
 
 # Expat
 AM_WITH_EXPAT
@@ -30,6 +30,9 @@ AM_WITH_EXPAT
 # Curl
 LIBCURL_CHECK_CONFIG([yes],[],[],[AC_MSG_ERROR([libcurl is needed but not found])])
 
+# libgps
+AC_CHECK_LIB(gps,gps_poll,,AC_MSG_ERROR([libgps is needed but not found]))
+
 AC_CHECK_PROG([GDK_PIXBUF_CSOURCE],gdk-pixbuf-csource,[yes])
 if test $GDK_PIXBUF_CSOURCE != "yes"
 then
@@ -92,9 +95,9 @@ esac
 AM_CONDITIONAL([TERRASERVER], [test x$ac_cv_enable_terraserver = xyes])
 
 AC_ARG_ENABLE(expedia, AC_HELP_STRING([--enable-expedia],
-              [enable Expedia stuff (default is enable)]),
+              [enable Expedia stuff (default is disable)]),
               [ac_cv_enable_expedia=$enableval],
-              [ac_cv_enable_expedia=yes])
+              [ac_cv_enable_expedia=no])
 AC_CACHE_CHECK([whether to enable Expedia stuff],
                [ac_cv_enable_expedia], [ac_cv_enable_expedia=yes])
 case $ac_cv_enable_expedia in
@@ -131,6 +134,20 @@ case $ac_cv_enable_geocaches in
 esac
 AM_CONDITIONAL([GEOCACHES], [test x$ac_cv_enable_geocaches = 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],
+              [ac_cv_enable_dem24k=no])
+AC_CACHE_CHECK([whether to enable USGS DEM 24k download source],
+               [ac_cv_enable_dem24k], [ac_cv_enable_dem24k=yes])
+case $ac_cv_enable_dem24k in
+  yes)
+    AC_DEFINE(VIK_CONFIG_DEM24K, [], [DEM24K STUFF])
+    ;;
+esac
+AM_CONDITIONAL([DEM24K], [test x$ac_cv_enable_dem24k = xyes])
+
 AC_ARG_WITH(mapcache,
             [AC_HELP_STRING([--with-mapcache],
                             [specify the size of the map cache (default is 50331648)])],