Improve libgps test with the consistently available function: gps_close

[andy/viking.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index aff91b69b443e6649f675e977656499d0d028520..e2d2fd511f1320ea983259f82662d39af238afb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,10 +2,11 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(viking, 1.0)
+AC_INIT(viking, 1.2.1)
 AM_INIT_AUTOMAKE()
 dnl AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([src/config.h])
+GTK_DOC_CHECK(1.0)
 
 # Checks for programs.
 AC_PROG_CC
@@ -53,7 +54,7 @@ LIBCURL_CHECK_CONFIG([yes],[],[],[AC_MSG_ERROR([libcurl is needed but not found]
 
 # gdk-pixbuf-csource
 AC_CHECK_PROG([GDK_PIXBUF_CSOURCE],gdk-pixbuf-csource,[yes])
-if test $GDK_PIXBUF_CSOURCE != "yes"
+if test "x$GDK_PIXBUF_CSOURCE" != "xyes"
 then
   AC_MSG_ERROR([gdk-pixbuf-csource is needed but not found])
 fi
@@ -114,6 +115,19 @@ case $ac_cv_enable_alpha_trw in
     ;;
 esac
 
+AC_ARG_ENABLE(bing, AC_HELP_STRING([--enable-bing],
+              [enable Bing stuff (default is enable)]),
+              [ac_cv_enable_bing=$enableval],
+              [ac_cv_enable_bing=yes])
+AC_CACHE_CHECK([whether to enable Bing stuff],
+               [ac_cv_enable_bing], [ac_cv_enable_bing=yes])
+case $ac_cv_enable_bing in
+  yes)
+    AC_DEFINE(VIK_CONFIG_BING, [], [BING STUFF])
+    ;;
+esac
+AM_CONDITIONAL([BING], [test x$ac_cv_enable_bing = xyes])
+
 AC_ARG_ENABLE(google, AC_HELP_STRING([--enable-google],
               [enable Google stuff (default is enable)]),
               [ac_cv_enable_google=$enableval],
@@ -244,18 +258,11 @@ AC_CACHE_CHECK([whether to enable Realtime GPS Tracking stuff],
                [ac_cv_enable_realtimegpstracking], [ac_cv_enable_realtimegpstracking=yes])
 case $ac_cv_enable_realtimegpstracking in
   yes)
-    AC_CHECK_LIB(gps,gps_poll,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking]))
+    AC_CHECK_LIB(gps,gps_close,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking]))
     AC_DEFINE(VIK_CONFIG_REALTIME_GPS_TRACKING, [], [REALTIME GPS TRACKING STUFF])
     ;;
 esac
 AM_CONDITIONAL([REALTIME_GPS_TRACKING], [test x$ac_cv_enable_realtimegpstracking = xyes])
-# Viking supports two incompatibles versions of GPSd: 2.39 and 2.90
-# But GPSd does not provides easy way to test features.
-if test x$ac_cv_enable_realtimegpstracking = xyes
-then
-  AC_CHECK_FUNCS(gps_stream)
-  AC_CHECK_FUNCS(gps_open_r)
-fi
 
 AC_ARG_WITH(search,
             [AC_HELP_STRING([--with-search],
@@ -296,7 +303,7 @@ AC_DEFINE_UNQUOTED(VIK_CONFIG_MAPCACHE_SIZE, ${VIK_CONFIG_MAPCACHE_SIZE},
 
 AC_ARG_WITH(tileage,
             [AC_HELP_STRING([--with-tileage],
-                            [specify the age of a tile before checking it (default is 30 s)])],
+                            [specify the age of a tile before checking it (default is 7 days)])],
             [if test "x$withval" = "xno"; then
                 VIK_CONFIG_DEFAULT_TILE_AGE=0;
              elif test "x$withval" = "xyes"; then
@@ -304,9 +311,9 @@ AC_ARG_WITH(tileage,
              else
                 VIK_CONFIG_DEFAULT_TILE_AGE=${withval}
              fi],
-             [VIK_CONFIG_DEFAULT_TILE_AGE=30])
+             [VIK_CONFIG_DEFAULT_TILE_AGE=604800])
 AC_DEFINE_UNQUOTED(VIK_CONFIG_DEFAULT_TILE_AGE, ${VIK_CONFIG_DEFAULT_TILE_AGE},
-                   [Age of tiles before cheking it (in seconds)])
+                   [Age of tiles before checking it (in seconds)])
 
 dnl man pages processing
 DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
@@ -330,6 +337,9 @@ AC_CONFIG_FILES([Makefile
                  doc/Makefile
                  doc/examples/Makefile
                  doc/dev/Makefile])
+if test x$enable_gtk_doc = xyes; then
+AC_CONFIG_FILES([doc/reference/Makefile])
+fi
 AC_OUTPUT([
           viking.spec
           ])
@@ -340,6 +350,7 @@ echo "==========================================="
 echo "$PACKAGE $VERSION"
 echo "-------------------------------------------"
 echo "Alphabetized track & waypoints   : $ac_cv_enable_alpha_trw"
+echo "Bing Maps                        : $ac_cv_enable_bing"
 echo "Google Maps                      : $ac_cv_enable_google"
 echo "Terraserver Maps                 : $ac_cv_enable_terraserver"
 echo "Expedia Maps                     : $ac_cv_enable_expedia"
@@ -347,7 +358,7 @@ 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 "Geocaches Acquire                : $ac_cv_enable_geocaches"
 echo "USGS 24k DEM                     : $ac_cv_enable_dem24k"
 echo "Realtime GPS Tracking            : $ac_cv_enable_realtimegpstracking"
 echo "Size of map cache (in memory)    : ${VIK_CONFIG_MAPCACHE_SIZE}"