Correct DocBook usage

[andy/viking.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 85d37fcaf8d58dbe008c7d86e1eb89fd86551070..3197a0c9f8c3c7ccec5cc61fd4fa54ba61b20c64 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.94)
+AC_INIT(viking, 0.9.96)
 AM_INIT_AUTOMAKE()
 dnl AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([src/config.h])
@@ -42,6 +42,8 @@ AC_TYPE_MODE_T
 AC_FUNC_STAT
 AC_FUNC_STRTOD
 AC_CHECK_FUNCS([floor gethostbyname memset mkdtemp pow realpath socket sqrt strcasecmp strchr strdup strncasecmp strtol strtoul])
+AC_CHECK_LIB(m, tan)
+AC_CHECK_LIB(z, inflate)
 
 # Expat
 AM_WITH_EXPAT
@@ -75,21 +77,28 @@ dnl | User Manual |---------------------------------------
 dnl  -------------
 GNOME_DOC_INIT
 
-###############
-# Depecations #
-###############
+dnl ---------------------------------------------------------------------------
+dnl - Use deprecated options (default enabled for devs, disabled in releases) 
+dnl ---------------------------------------------------------------------------
+
 AC_ARG_ENABLE(deprecations,
               [AC_HELP_STRING([--enable-deprecations],
-                              [warn about deprecated usages [default=no]])],,
-              [enable_deprecations=no])
+                              [warn about deprecated usages [default=no]])],
+                              [ac_cv_enable_deprecations=$enableval],
+                              [ac_cv_enable_deprecations=no])
+AC_CACHE_CHECK([whether to enable deprecated features],
+               [ac_cv_enable_deprecations], [ac_cv_enable_deprecations=no])
 
-if test "x$enable_deprecations" = "xyes"; then
+if test "x$ac_cv_enable_deprecations" = "xyes"; then
    DISABLE_DEPRECATED_CFLAGS="\
+-DG_DISABLE_SINGLE_INCLUDES \
+-DGSEAL_ENABLE \
 -DG_DISABLE_DEPRECATED \
 -DGDK_DISABLE_DEPRECATED \
--DGTK_DISABLE_DEPRECATED \
--DGDK_PIXBUF_DISABLE_DEPRECATED"
-   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+-DGDK_PIXBUF_DISABLE_DEPRECATED \
+-DGTK_DISABLE_SINGLE_INCLUDES \
+-DGTK_DISABLE_DEPRECATED"
+   CPPFLAGS="$CPPFLAGS $DISABLE_DEPRECATED_CFLAGS"
 fi
 
 # Options
@@ -319,7 +328,7 @@ echo "-------------------------------------------"
 echo "Alphabetized track & waypoints   : $ac_cv_enable_alpha_trw"
 echo "Google Maps                      : $ac_cv_enable_google"
 echo "Terraserver Maps                 : $ac_cv_enable_terraserver"
-#echo "Expedia Maps                     : $ac_cv_enable_expedia"
+echo "Expedia Maps                     : $ac_cv_enable_expedia"
 echo "Open Street Map                  : $ac_cv_enable_openstreetmap"
 echo "BlueMarble                       : $ac_cv_enable_bluemarble"
 echo "Geonames                         : $ac_cv_enable_geonames"