From f43eaaa5fa1bd105b3981d627c124a6756788e35 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Mon, 24 Oct 2011 13:00:49 +0200
Subject: [PATCH] Make configure understand -W* arguments

These will be passed on as extra C*FLAGS to the Qt build. Useful for
adding -Werror or -Wno-something-or-other.

Change-Id: Ifbbf63261573edd024de951082d99658eb443a3f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 configure | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/configure b/configure
index c2349ada78..738e157748 100755
--- a/configure
+++ b/configure
@@ -815,6 +815,7 @@ I_FLAGS=
 L_FLAGS=
 RPATH_FLAGS=
 l_FLAGS=
+W_FLAGS=
 QCONFIG_FLAGS=
 XPLATFORM=              # This seems to be the QMAKESPEC, like "linux-g++" or "symbian-gcce"
 XPLATFORM_MINGW=no      # Whether target platform is MinGW (win32-g++*)
@@ -1230,6 +1231,10 @@ while [ "$#" -gt 0 ]; do
             VAL=`echo $1 | sed 's,-fw,,'`
         fi
         ;;
+    -W*)
+        VAR="add_warn"
+        VAL="$1"
+        ;;
     -*)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
         VAL="unknown"
@@ -2383,6 +2388,9 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
+    add_warn)
+        W_FLAGS="$W_FLAGS \"${VAL}\""
+        ;;
     silent)
         CFG_SILENT="$VAL"
         ;;
@@ -7400,6 +7408,13 @@ if [ '!' -z "$I_FLAGS" ]; then
     QMakeVar add QMAKE_CXXFLAGS "$I_FLAGS"
 fi
 
+if [ '!' -z "$W_FLAGS" ]; then
+    # add the user defined warning flags
+    QMakeVar add QMAKE_CFLAGS "$W_FLAGS"
+    QMakeVar add QMAKE_CXXFLAGS "$W_FLAGS"
+    QMakeVar add QMAKE_OBJECTIVE_CFLAGS "$W_FLAGS"
+fi
+
 # turn off exceptions for the compilers that support it
 if [ "$PLATFORM_QWS" = "yes" ]; then
     COMPILER=`echo $XPLATFORM | cut -f 3- -d-`