[clutter-gtk] build: Toggle deprecation when building from git

[Emmanuele Bassi <ebassi src gnome org>]

commit f488e2522fa46aff57413bb6909104d35ddffc0b
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Fri Mar 25 17:11:26 2011 +0000

    build: Toggle deprecation when building from git
    
    Deprecation guards for dependencies should only be turned on when
    building from Git, not from tarballs.

 clutter-gtk/Makefile.am |   18 +++++++-----------
 configure.ac            |   15 ++++++++++++++-
 2 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
index f643f24..fd65eef 100644
--- a/clutter-gtk/Makefile.am
+++ b/clutter-gtk/Makefile.am
@@ -6,19 +6,15 @@ CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
 
-INCLUDES = -I$(srcdir) -I$(top_srcdir) -I $(top_builddir)
+INCLUDES = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Clutter-Gtk\" 	\
-	-DPREFIX=\""$(prefix)"\" 	\
-	-DLIBDIR=\""$(libdir)"\"	\
-	-DCLUTTER_GTK_COMPILATION	\
-	-DG_DISABLE_DEPRECATED		\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
-	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED	\
-	-DCLUTTER_DISABLE_DEPRECATED	\
-	$(CLUTTER_GTK_DEBUG_CFLAGS) 	\
+	-DG_LOG_DOMAIN=\"Clutter-Gtk\" 		\
+	-DPREFIX=\""$(prefix)"\" 		\
+	-DLIBDIR=\""$(libdir)"\"		\
+	-DCLUTTER_GTK_COMPILATION		\
+	$(CLUTTER_GTK_DEPRECATED_CFLAGS)	\
+	$(CLUTTER_GTK_DEBUG_CFLAGS) 		\
 	$(NULL)
 
 AM_CFLAGS = $(MAINTAINER_CFLAGS) $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
diff --git a/configure.ac b/configure.ac
index d371231..cb4b607 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,17 @@ AC_SUBST(CLUTTER_LIBS)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+AS_IF([test clutter_gtk_release_status = 'git'],
+      [
+        CLUTTER_GTK_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DCOGL_DISABLE_DEPRECATED -DCLUTTER_DISABLE_DEPRECATED"
+      ],
+      [
+        CLUTTER_GTK_DEPRECATED_CFLAGS=""
+      ]
+)
+
+AC_SUBST(CLUTTER_GTK_DEPRECATED_CFLAGS)
+
 dnl = Enable debug level ===================================================
 
 m4_define([debug_default], [m4_if(m4_eval(clutter_gtk_minor % 2), [1], [yes], [minimum])])
@@ -153,6 +164,8 @@ AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"],
       ]
 )
 
+# strip leading spaces
+MAINTAINER_CFLAGS=${MAINTAINER_CFLAGS#*  }
 AC_SUBST(MAINTAINER_CFLAGS)
 
 dnl = I18N =================================================================
@@ -215,6 +228,6 @@ echo ""
 echo "   Flavour: ${CLUTTER_GTK_FLAVOUR}"
 echo "   Debug level: ${enable_debug}"
 echo "   Documentation: ${enable_gtk_doc}"
-echo "   Compiler flags: $MAINTAINER_CFLAGS"
+echo "   Compiler flags: $CFLAGS $MAINTAINER_CFLAGS"
 echo "   Introspection data: ${enable_introspection}"
 echo ""