Make the find best zoom level function reusable.

[andy/viking.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 66fa53baa25acfb634cb89b9e98003278a70a4ac..87c2dbb4a418a77c862050c8d4533ece328d6c23 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,17 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.64)
-AC_INIT(viking, 1.6, , viking, http://viking.sf.net/)
+AC_INIT(viking, 1.6.1, , viking, http://viking.sf.net/)
 AM_INIT_AUTOMAKE([dist-bzip2 dist-zip subdir-objects])
 dnl AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([src/config.h])
-GTK_DOC_CHECK(1.0)
+
+# check for gtk-doc
+m4_ifdef([GTK_DOC_CHECK], [
+GTK_DOC_CHECK([1.0],[--flavour no-tmpl])
+],[
+AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+])
 
 AC_PROG_CC
 AC_PROG_CC_STDC
@@ -327,6 +333,31 @@ case $ac_cv_enable_mbtiles in
 esac
 AM_CONDITIONAL([SQLITE], [test x$ac_cv_enable_mbtiles = xyes])
 
+# Standard compression is handled by libz
+# libzip enables a friendlier file based interface
+# libzip itself depends on libz (which is required in the Viking build ATM)
+# ZIP
+AC_ARG_ENABLE(zip, AC_HELP_STRING([--enable-zip],
+              [enable zip support (default is enable).]),
+              [ac_cv_enable_zip=$enableval],
+              [ac_cv_enable_zip=yes])
+AC_CACHE_CHECK([whether to enable zip Support],
+               [ac_cv_enable_zip], [ac_cv_enable_zip=yes])
+case $ac_cv_enable_zip in
+  yes)
+    # NB As far as I can tell libzip doesn't provide any versioning info within the header code itself
+    # Thus supporting old versions via simple #if #else #endif directives is seemingly not possible
+    # Resort to checking versioning only via pkgconfig
+    PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11],
+      [ AC_CHECK_HEADERS([zip.h],[],[AC_MSG_ERROR([zip.h is needed but not found - you will need to install package 'libzip-dev' or similar. The feature can be disabled with --disable-zip])]) 
+        AC_CHECK_LIB(zip, [main], [], [AC_MSG_ERROR([libzip is needed but not found.])]) ],
+      [ AC_MSG_WARN([libzip version needs to be at least 0.11, use of libzip is disabled])
+        ac_cv_enable_zip=no ]
+  )
+    ;;
+esac
+AM_CONDITIONAL([ZIP], [test x$ac_cv_enable_zip = xyes])
+
 # Mapnik rendering layer
 AC_ARG_ENABLE(mapnik, AC_HELP_STRING([--enable-mapnik],
               [enable Mapnik (default is enable)]),
@@ -363,27 +394,6 @@ AC_PROG_CXX
 m4_popdef([AC_MSG_ERROR])
 ##
 
-AC_ARG_WITH(search,
-            [AC_HELP_STRING([--with-search],
-                            [specify google or geonames for searching (default is google)])],
-            [case "x$withval" in
-               "xgoogle")
-                 VIK_CONFIG_SEARCH=VIK_CONFIG_SEARCH_GOOGLE
-                 ;;
-               "xgeonames")
-                 VIK_CONFIG_SEARCH=VIK_CONFIG_SEARCH_GEONAMES
-                 ;;
-               *)
-                AC_MSG_ERROR([Please, set a value for search method])
-             esac],
-             [VIK_CONFIG_SEARCH=VIK_CONFIG_SEARCH_GOOGLE])
-AC_DEFINE_UNQUOTED(VIK_CONFIG_SEARCH_GOOGLE, 1,
-                   [Id. for searching via GOOGLE])
-AC_DEFINE_UNQUOTED(VIK_CONFIG_SEARCH_GEONAMES, 2,
-                   [Id. for searching via GEONAMES])
-AC_DEFINE_UNQUOTED(VIK_CONFIG_SEARCH, ${VIK_CONFIG_SEARCH},
-                   [Method for the search])
-
 
 AC_ARG_WITH(mapcache,
             [AC_HELP_STRING([--with-mapcache],
@@ -420,14 +430,11 @@ DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
 AC_SUBST(DB2MAN_XSL)
 AC_PATH_PROG(XP,xsltproc)
 AM_CONDITIONAL([HAVE_XSLTPROC],[test "x$XP" != "x"])
-AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"])
-
-dnl This will cause the automake generated makefiles to pass the
-dnl correct flags to aclocal.
-ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-AC_SUBST(ACLOCAL_AMFLAGS)
+AC_CHECK_PROG([HAVE_SCROLLKEEPER],scrollkeeper-config,"yes")
+AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"] && test "${HAVE_SCROLLKEEPER}" == "yes" )
 
-AM_CONDITIONAL([VIKING_DOC], test x${enable_gtk_doc} = xyes)
+ISODATE=`date +%Y-%m-%d`
+AC_SUBST(ISODATE)
 
 # Configuration
 AC_CONFIG_FILES([
@@ -439,15 +446,14 @@ AC_CONFIG_FILES([
                tools/Makefile
                test/Makefile
                help/Makefile
+               help/viking.xml
                win32/Makefile
                win32/installer/Makefile
                win32/installer/pixmaps/Makefile
-               win32/installer/translations/Makefile])
-AM_COND_IF([VIKING_DOC],
-       [AC_CONFIG_FILES([
+               win32/installer/translations/Makefile
                doc/Makefile
                doc/reference/Makefile
-               doc/examples/Makefile])])
+               doc/examples/Makefile])
 
 AC_OUTPUT([
           viking.spec
@@ -472,9 +478,12 @@ echo "Realtime GPS Tracking            : $ac_cv_enable_realtimegpstracking"
 echo "bzip2 Support                    : $ac_cv_enable_bzip2"
 echo "File Magic Support               : $ac_cv_enable_magic"
 echo "MBTiles Support (SQLite3)        : $ac_cv_enable_mbtiles"
+echo "Zip File Support (with libzip)   : $ac_cv_enable_zip"
 echo "Mapnik Rendering Support (C++)   : $ac_cv_enable_mapnik"
 echo "Size of map cache (in memory)    : ${VIK_CONFIG_MAPCACHE_SIZE}"
 echo "Age of tiles (in seconds)        : ${VIK_CONFIG_DEFAULT_TILE_AGE}"
+echo -n "Man page generation              : "
+AM_COND_IF([GEN_MANPAGES], [echo "yes"], [echo "no"])
 echo "Documentation (+HTML)            : ${enable_gtk_doc} (HTML: ${enable_gtk_doc_html})"
 echo "-------------------------------------------"
 echo ""