From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Fri, 24 Sep 2010 01:25:04 +0000 (-0700)
Subject: Re-use existing autoconf code for setting extra maintainer flags.
X-Git-Tag: FOLKS_0_3_0~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4225e3065e5d49bda7227e225cdc244543dd84e2;p=platform%2Fupstream%2Ffolks.git

Re-use existing autoconf code for setting extra maintainer flags.
---

diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 689e884..9412438 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -46,14 +46,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = \
+	$(ERROR_INTROSPECTION_SCANNER_ARGS) \
 	--add-include-path=$(srcdir) \
 	--warn-all \
 	$(NULL)
 
-if !FOLKS_RELEASED
-INTROSPECTION_SCANNER_ARGS += --warn-error
-endif
-
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 CLEANFILES =
 
diff --git a/configure.ac b/configure.ac
index f56a847..ce10df6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,8 +66,6 @@ AC_SUBST([LT_AGE])
 FOLKS_MAJOR_MINOR_VERSION=folks_major_minor_version
 AC_SUBST([FOLKS_MAJOR_MINOR_VERSION])
 
-AM_CONDITIONAL([FOLKS_RELEASED], [test folks_released = 1])
-
 # -----------------------------------------------------------
 # Dependencies
 # -----------------------------------------------------------
@@ -176,6 +174,8 @@ AS_COMPILER_FLAG([-Wno-unused-parameter],
 
 m4_if(folks_released, [1], [],
     [
+        ERROR_INTROSPECTION_SCANNER_ARGS="$ERROR_INTROSPECTION_SCANNER_ARGS \
+                --warn-error"
         if test x$werror = xyes; then
             ERROR_CFLAGS="$ERROR_CFLAGS -Werror"
         fi
@@ -197,6 +197,7 @@ AS_COMPILER_FLAG([-Wmissing-declarations], [ERROR_CFLAGS="$ERROR_CFLAGS \
 AS_COMPILER_FLAG([-Wstrict-prototypes], [ERROR_CFLAGS="$ERROR_CFLAGS \
                                          -Wstrict-prototypes"])
 
+AC_SUBST([ERROR_INTROSPECTION_SCANNER_ARGS])
 AC_SUBST([ERROR_CFLAGS])
 
 # -----------------------------------------------------------