From d75cc5aad539b720a46632b883b57fda56b1fa18 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 25 Aug 2006 12:07:34 +0200
Subject: [PATCH] configure: Enable the -Wwrite-strings flag.

---
 configure    | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |  8 ++++++
 2 files changed, 83 insertions(+)

diff --git a/configure b/configure
index 7356552bcf5..38320e1d3ef 100755
--- a/configure
+++ b/configure
@@ -14690,6 +14690,81 @@ echo "${ECHO_T}$ac_cv_c_gcc_decl_after_statement" >&6; }
     EXTRACFLAGS="$EXTRACFLAGS -Wdeclaration-after-statement"
   fi
 
+    { echo "$as_me:$LINENO: checking for gcc -Wwrite-strings support" >&5
+echo $ECHO_N "checking for gcc -Wwrite-strings support... $ECHO_C" >&6; }
+if test "${ac_cv_c_gcc_write_strings+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_wine_try_cflags_saved=$CFLAGS
+CFLAGS="$CFLAGS -Wwrite-strings"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_gcc_write_strings="yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_gcc_write_strings="no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+CFLAGS=$ac_wine_try_cflags_saved
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_gcc_write_strings" >&5
+echo "${ECHO_T}$ac_cv_c_gcc_write_strings" >&6; }
+  if test "$ac_cv_c_gcc_write_strings" = "yes"
+  then
+    EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings"
+  fi
+
     saved_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wpointer-arith -Werror"
   { echo "$as_me:$LINENO: checking for broken string.h that generates warnings" >&5
diff --git a/configure.ac b/configure.ac
index b327e0b6829..5d9dba7b7c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -949,6 +949,14 @@ int main(void) {
     EXTRACFLAGS="$EXTRACFLAGS -Wdeclaration-after-statement"
   fi
 
+  dnl Check for -Wwrite-strings
+  AC_CACHE_CHECK([for gcc -Wwrite-strings support], ac_cv_c_gcc_write_strings,
+      [WINE_TRY_CFLAGS([-Wwrite-strings],ac_cv_c_gcc_write_strings="yes", ac_cv_c_gcc_write_strings="no")])
+  if test "$ac_cv_c_gcc_write_strings" = "yes"
+  then
+    EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings"
+  fi
+
   dnl Check for noisy string.h
   saved_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wpointer-arith -Werror"