[gtpd-cvs] [gtkpod/gtk-3.0] Conditional inclusion of DISABLE_DEPRECATED flags

[phantomjinx <pha...@us...>]

commit 6f66bf1afcc44ecb42b7611a634d35c29c392255
Author: phantomjinx <p.g...@ph...>
Date:   Sun Sep 18 01:46:33 2011 +0100

    Conditional inclusion of DISABLE_DEPRECATED flags
    
    * Including DISABLE_DEPRECATED flags consistently can cause problems when
      including library includes from other projects that are still using
      deprecated functions.
    
    * To avoid this, use DISABLE_DEPRECATED flags in development and unstable
      releases but avoid using them in actual releases.
    
    * See FS#84 at http://gtkpod.org/bugs/index.php

 configure.ac |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ea3098e..7220666 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,22 @@ PKG_CHECK_MODULES(LIBANJUTA, libanjuta-3.0 >= 2.91,, [AC_MSG_FAILURE([*** $LIBAN
 PKG_CHECK_MODULES(LIBGDL, gdl-3.0 >= 3.0.0,, [AC_MSG_FAILURE([*** $LIBGDL_PKG_ERRORS])])
 PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.28.5,, [AC_MSG_FAILURE([*** $GIO_PKG_ERRORS])])
 PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.7.7,, [AC_MSG_FAILURE([*** $LIBXML_PKG_ERRORS])])
-	
-GTK_CLEANLINESS_FLAGS="-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
+
+
+GTK_CLEANLINESS_FLAGS="-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DGSEAL_ENABLE"
+
+AC_MSG_CHECKING(for using DISABLE_DEPRECATED flags)
+if expr "$LIBGTKPOD_VERSION" : '.*~' >/dev/null; then
+  dnl The version contains a tilde so this is not a release
+  dnl Thus, we can add in disable deprecated flags to avoid
+  dnl using deprecated functions
+  GTK_CLEANLINESS_FLAGS="$GTK_CLEANLINESS_FLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+  AC_MSG_RESULT(yes)
+else
+  dnl The version is a release so do not include deprecated
+  dnl flags.
+  AC_MSG_RESULT(no)
+fi
 
 dnl Force C99 mode (no implicit int declarations)
 CFLAGS="$CFLAGS -std=gnu99 -Werror-implicit-function-declaration"