Rename switch to enable/disable -Werror to --enable-werror/--disable-werror

for compatibility with gcc.

3 files changed, 14 insertions, 14 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index edd7eda..9aa67e9 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,9 +1,9 @@
 2005-03-16  Nick Clifton  <nickc@redhat.com>
 	    Ben Elliston  <bje@au.ibm.com>
 
-	* configure.in (error-on-warning): New switch: Add -Werror to the
+	* configure.in (werror): New switch: Add -Werror to the
 	compiler command line.  Enabled by default.  Disable via
-	--disable-error-on-warning.
+	--disable-werror.
 	* configure: Regenerate.
 
 2005-03-16  Nick Clifton  <nickc@redhat.com>
diff --git a/bfd/configure b/bfd/configure
index 61afe15..2918460 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -859,7 +859,7 @@ Optional Features:
   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
   --enable-targets        alternative target configurations
   --enable-commonbfdlib   build shared BFD/opcodes/libiberty library
-  --enable-error-on-warning    treat compile warnings as errors
+  --enable-werror    treat compile warnings as errors
   --enable-build-warnings Enable build-time compiler warnings if gcc is used
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
@@ -4265,19 +4265,19 @@ else
 fi;
 build_warnings="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 
-# Check whether --enable-error-on-warning or --disable-error-on-warning was given.
-if test "${enable_error_on_warning+set}" = set; then
-  enableval="$enable_error_on_warning"
+# Check whether --enable-werror or --disable-werror was given.
+if test "${enable_werror+set}" = set; then
+  enableval="$enable_werror"
   case "${enableval}" in
      yes | y) ERROR_ON_WARNING="yes" ;;
      no | n)  ERROR_ON_WARNING="no" ;;
-     *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-error-on-warning" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-error-on-warning" >&2;}
+     *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-werror" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-werror" >&2;}
    { (exit 1); exit 1; }; } ;;
    esac
 fi;
 
-# Enable -Werror by default, suppressing it only for --disable-error-on-warning
+# Enable -Werror by default, suppressing it only for --disable-werror
 # or --disable-build-warnings.
 if test "${ERROR_ON_WARNING}" != no
 then
diff --git a/bfd/configure.in b/bfd/configure.in
index afcae65..9eafb2c 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -53,21 +53,21 @@ esac],[want_mmap=false])dnl
 
 build_warnings="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 
-AC_ARG_ENABLE(error-on-warning,
-  [  --enable-error-on-warning    treat compile warnings as errors],
+AC_ARG_ENABLE(werror,
+  [  --enable-werror    treat compile warnings as errors],
   [case "${enableval}" in
      yes | y) ERROR_ON_WARNING="yes" ;;
      no | n)  ERROR_ON_WARNING="no" ;;
-     *) AC_MSG_ERROR(bad value ${enableval} for --enable-error-on-warning) ;;
+     *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;;
    esac])
 
-# Enable -Werror by default, suppressing it only for --disable-error-on-warning
+# Enable -Werror by default, suppressing it only for --disable-werror
 # or --disable-build-warnings.
 if test "${ERROR_ON_WARNING}" != no
 then
   build_warnings="$build_warnings -Werror"
 fi
-		   
+
 AC_ARG_ENABLE(build-warnings,
 [  --enable-build-warnings Enable build-time compiler warnings if gcc is used],
 [case "${enableval}" in