From ec041b558711c7a80d4bdf145469fd0eb52973a4 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 13 Apr 2012 22:04:54 -0700
Subject: [PATCH] configure: new option --enable-gcc-warnings (Bug#11207)

* sed1v2.inp, sed3v2.inp, sedlibmk.inp: GNULIB_WARN_CFLAGS,
WARN_CFLAGS, and WERROR_CFLAGS replace C_WARNINGS_SWITCH.
---
 msdos/ChangeLog    | 6 ++++++
 msdos/sed1v2.inp   | 3 ++-
 msdos/sed3v2.inp   | 4 ++--
 msdos/sedlibmk.inp | 6 ++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 320d2f5e6c1..fa7dc234717 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	configure: new option --enable-gcc-warnings (Bug#11207)
+	* sed1v2.inp, sed3v2.inp, sedlibmk.inp: GNULIB_WARN_CFLAGS,
+	WARN_CFLAGS, and WERROR_CFLAGS replace C_WARNINGS_SWITCH.
+
 2012-04-11  Glenn Morris  <rgm@gnu.org>
 
 	* sedlibmk.inp, sed1v2.inp: GNUSTEP_CFLAGS replaces C_SWITCH_X_SYSTEM.
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index cdaf9430b25..ce245b08824 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -41,7 +41,8 @@ s/\.h\.in/.h-in/
 /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
 /^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@//
 /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@//
-/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
+/^WARN_CFLAGS *=/s/@WARN_CFLAGS@//
+/^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@//
 /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
 #/^LD_SWITCH_X_SITE *=/s/@LD_SWITCH_X_SITE@//
 /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@//
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index c147ad64cf9..faa57996a25 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -38,7 +38,8 @@ s/-DVERSION[^ ]* //
 /^CFLAGS *=/s!=.*$!=-O2 -g!
 /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS!
 /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
-/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
+/^WARN_CFLAGS *=/s/@WARN_CFLAGS@//
+/^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@//
 /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
 /^ALLOCA *=/s!@ALLOCA@!!
 /^EXEEXT *=/s!@EXEEXT@!!
@@ -51,4 +52,3 @@ s!^	\./!	!
 }
 /^insrcdir=/s/^.*$/\#&/
 /^	 *\$(insrcdir) ||/s,\$(insrcdir) ||,command.com /c if not exist $(<F),
-
diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index 1bb622b29e8..4b4b5f24d4c 100644
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -27,7 +27,7 @@
 #    otherwise edit them to zero:
 #
 #     /^REPLACE_CALLOC *=/s/@REPLACE_CALLOC@/0/
-# 
+#
 #  . If the module is a header or adds headers, edit the corresponding
 #    variable to either an empty value or to the name of the header.
 #    Examples:
@@ -126,7 +126,9 @@ am__cd = cd
 /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
 /^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@//
 /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@//
-/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
+/^GNULIB_WARN_CFLAGS *=/s/@GNULIB_WARN_CFLAGS@//
+/^WARN_CFLAGS *=/s/@WARN_CFLAGS@//
+/^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@//
 /^DEFS *=/s/@[^@\n]*@/-DHAVE_CONFIG_H/
 /^DEPDIR *=/s/@[^@\n]*@/deps/
 /^DEPFLAGS *=/s/@[^@\n]*@/-MMD -MF ${DEPDIR}\/$*.d/
-- 
2.39.2