From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Thu, 30 Jun 2011 16:40:23 +0000 (+0100)
Subject: Put -Werror in separate ERROR_CFLAGS
X-Git-Tag: orc-0.4.15~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f8abc427ba80dcc5b3f4ec86fe84484ef1954ea;p=platform%2Fupstream%2Forc.git

Put -Werror in separate ERROR_CFLAGS

So it can more easily be overridden with make ERROR_CFLAGS=''.
---

diff --git a/configure.ac b/configure.ac
index f72720c..c016656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,7 +87,7 @@ AC_CHECK_HEADERS([valgrind/valgrind.h])
 AS_COMPILER_FLAG(-Wall, ORC_CFLAGS="$ORC_CFLAGS -Wall")
 if test "x$ORC_CVS" = "xyes"
 then
-  AS_COMPILER_FLAG(-Werror, ORC_CFLAGS="$ORC_CFLAGS -Werror")
+  AS_COMPILER_FLAG(-Werror, ERROR_CFLAGS="-Werror")
 fi
 
 case "${host_os}" in
@@ -167,7 +167,8 @@ AM_CONDITIONAL(ENABLE_BACKEND_C64X, test "x$ENABLE_BACKEND_C64X" = "xyes")
 
 AC_DEFINE(ORC_EXPORTS, 1, [Defined for compiling internal code])
 
-ORC_CFLAGS="$ORC_CFLAGS -I\$(top_srcdir)"
+ORC_CFLAGS="$ORC_CFLAGS \$(ERROR_CFLAGS) -I\$(top_srcdir)"
+AC_SUBST(ERROR_CFLAGS)
 AC_SUBST(ORC_CFLAGS)
 
 ORC_LIBS="\$(top_builddir)/orc/liborc-$ORC_MAJORMINOR.la $LIBM $LIBRT"