[Telepathy-commits] [telepathy-qt4/master] Try to make the compiler flag usage more portable

[Olli Salli]

---
 configure.ac |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 03b87b0..6f7605e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,13 +75,7 @@ AC_ARG_ENABLE(Werror,
   AC_HELP_STRING([--disable-Werror],[compile without -Werror (normally enabled in development builds)]),
     werror=$enableval, :)
 
-TP_CXX_COMPILER_FLAG(-Wextra, wextra=yes, wextra=no)
-TP_CXX_COMPILER_FLAG(-Wno-missing-field-initializers,
-        wno_missing_field_initializers=yes,
-        wno_missing_field_initializers=no)
-TP_CXX_COMPILER_FLAG(-Wno-unused-parameter,
-        wno_unused_parameter=yes,
-        wno_unused_parameter=no)
+TP_CXX_COMPILER_FLAG([$ERROR_CXXFLAGS -Wextra -Wno-missing-field-initializers -Wno-unused-parameter], wextra=yes, wextra=no)
 
 ifelse(tp_qt4_nano_version, 0,
     [ official_release=yes ],
@@ -90,14 +84,9 @@ ifelse(tp_qt4_nano_version, 0,
         if test x$werror = xyes; then
             ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror"
         fi
-        if test x$wextra = xyes -a \
-            x$wno_missing_field_initializers = xyes -a \
-            x$wno_unused_parameter = xyes; then
-            ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Wextra -Wno-missing-field-initializers -Wno-unused-parameter"
-        fi
     ])
 
-TP_CXX_COMPILER_FLAG(-Wmissing-declarations, ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Wmissing-declarations")
+TP_CXX_COMPILER_FLAG([$ERROR_CXXFLAGS -Wmissing-declarations], ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Wmissing-declarations")
 
 AC_SUBST(ERROR_CXXFLAGS)
 AM_CONDITIONAL([OFFICIAL_RELEASE], [test "x$official_release" = xyes])
-- 
1.5.6.5