Improve depreaction options

* Add options
* Add a cached value

diff --git a/configure.ac b/configure.ac
index 6d73de7be83ae789108e3b08c266c854d5dc31be..3197a0c9f8c3c7ccec5cc61fd4fa54ba61b20c64 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -77,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

diff --git a/src/Makefile.am b/src/Makefile.am
index e598210e25a324f5130a1b6d3af7efd2973b2699..efb14fd171800e942a7138deb50cfa0e825e4a4b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -145,7 +145,6 @@ if REALTIME_GPS_TRACKING
 LDADD           += -lgps
 endif
 AM_CFLAGS              = -Wall -g -D_GNU_SOURCE \
-       $(DISABLE_DEPRECATED_CFLAGS) \
        $(PACKAGE_CFLAGS) \
        @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@