Merge branch 'master' into GPSD-API-v5

Resolve conflicts:
	src/vikgpslayer.c

diff --combined configure.ac
index fd4924cc485e734bbd6f90ccaa5fc85ecce0bc6d,bd2dffe67b29c51b8a62028e298df9fbf4dd2468..0967a0cd1492aee2170713d49eeea95035732b3c
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -263,6 -263,13 +263,6 @@@ case $ac_cv_enable_realtimegpstracking 
      ;;
  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],
@@@ -303,7 -310,7 +303,7 @@@ AC_DEFINE_UNQUOTED(VIK_CONFIG_MAPCACHE_
  
  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
@@@ -311,9 -318,9 +311,9 @@@
               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
@@@ -358,7 -365,7 +358,7 @@@ echo "Open Street Map                  
  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}"