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

for compatibility with gcc.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index edd7edae4dc5d85a1c6d2ddac3b8839edb5d9c19..9aa67e96496e15e32bcd741cdfd1d21f0d69e86e 100644 (file)
--- 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 61afe156356648aea68e0b78f4189bebe78adbab..2918460fd57ef0cf356fe2b7496f1de3bbb75ca2 100755 (executable)
--- 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 afcae656b1e1df4ba0226480d790435f93a4c5fc..9eafb2c10929c28e69a6200a7f2ee55462a8fb6d 100644 (file)
--- 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

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index f45d24c6bdb86014d167fd3b2e55af2f992f586c..306c6221ca973dba7491f936f6e53b0817b49298 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/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-15  Daniel Marques  <marques@cs.cornell.edu>

diff --git a/binutils/configure b/binutils/configure
index f02c92c3b93d892751c20e862e3eed83b393d183..518ac843f2842fd1a6162942b88460d3795c6757 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -28,7 +28,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-commonbfdlib   build shared BFD/opcodes/libiberty library"
 ac_help="$ac_help
-  --enable-error-on-warning    treat compile warnings as errors"
+  --enable-werror    treat compile warnings as errors"
 ac_help="$ac_help
   --enable-build-warnings Enable build-time compiler warnings if gcc is used"
 ac_help="$ac_help
@@ -2209,24 +2209,24 @@ 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 "configure: error: bad value ${enableval} for --enable-error-on-warning" 1>&2; exit 1; } ;;
+     *) { echo "configure: error: bad value ${enableval} for --enable-werror" 1>&2; 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
   build_warnings="$build_warnings -Werror"
 fi
-                  
+
 # Check whether --enable-build-warnings or --disable-build-warnings was given.
 if test "${enable_build_warnings+set}" = set; then
   enableval="$enable_build_warnings"

diff --git a/binutils/configure.in b/binutils/configure.in
index 7f615f7533a5f41ace10b441de72e79491d7ddff..767d237f9ba52f4fae604b6ed94fd865db4996c4 100644 (file)
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -31,21 +31,21 @@ esac])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

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f2b3a470e31c1c9209d5ee48a19edbc479b747c7..fb1206957ec783c3a6881852c4dc5ef1ff497c89 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/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/gas/configure b/gas/configure
index e389280aa33b7f64711b92e58fe942893a0929bf..60ebac926dc879700bcb1da6be05306b1cd95575 100755 (executable)
--- a/gas/configure
+++ b/gas/configure
@@ -859,7 +859,7 @@ Optional Features:
   --enable-bfd-assembler  use BFD back end for writing object files
     targets            alternative target configurations besides the primary
   --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
   --disable-nls           do not use Native Language Support
   --enable-maintainer-mode  enable make rules and dependencies not useful
@@ -4090,19 +4090,19 @@ using_cgen=no
 
 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/gas/configure.in b/gas/configure.in
index 580e7d0ef2d4f27c5c4983f05e1213628cdcbe81..b3db9b17d6b1ac37ddfad3638109e36bc735ac2a 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -50,15 +50,15 @@ using_cgen=no
 
 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

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 9a07866f333776a3b43f0f3f4b7eda1c89674e84..b13c796909ebfd05f0a5fa3ef4d7e5d8083746ec 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/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-15  Nick Clifton  <nickc@redhat.com>

diff --git a/gprof/configure b/gprof/configure
index d8df9412e3675d12b6bfa42818a434793a46dd98..e637b930fa90ff8f45c965a7684b97eab1f8df29 100755 (executable)
--- a/gprof/configure
+++ b/gprof/configure
@@ -859,7 +859,7 @@ Optional Features:
   --disable-nls           do not use Native Language Support
   --enable-maintainer-mode  enable make rules and dependencies not useful
                          (and sometimes confusing) to the casual installer
-  --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
 
 Optional Packages:
@@ -8289,19 +8289,19 @@ done
 
 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/gprof/configure.in b/gprof/configure.in
index de9d79128e232075539018bb713b9926ffdb591b..01dd81fefaa801936c8931e2fd86d517bec2e1f9 100644 (file)
--- a/gprof/configure.in
+++ b/gprof/configure.in
@@ -34,21 +34,21 @@ AC_CHECK_HEADERS(sys/gmon_out.h)
 
 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

diff --git a/ld/ChangeLog b/ld/ChangeLog
index c0dfec0859792ece279f6f463d1e63278b51d45c..e47e8ca135f8586b678457eef62763714cee79e9 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/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  Alan Modra  <amodra@bigpond.net.au>

diff --git a/ld/configure b/ld/configure
index d2dd368da4114da95e061a6598fa018f183aa05d..bc7db6faebae7e2d0fbaf2de4ad36507f54506d1 100755 (executable)
--- a/ld/configure
+++ b/ld/configure
@@ -32,7 +32,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-sysroot[=DIR] Search for usr/lib et al within DIR."
 ac_help="$ac_help
-  --enable-error-on-warning    treat compile warnings as errors"
+  --enable-werror    treat compile warnings as errors"
 ac_help="$ac_help
   --enable-build-warnings enable build-time compiler warnings if gcc is used"
 ac_help="$ac_help
@@ -2262,24 +2262,24 @@ 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 "configure: error: bad value ${enableval} for --enable-error-on-warning" 1>&2; exit 1; } ;;
+     *) { echo "configure: error: bad value ${enableval} for --enable-werror" 1>&2; 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
   build_warnings="$build_warnings -Werror"
 fi
-                  
+
 # Check whether --enable-build-warnings or --disable-build-warnings was given.
 if test "${enable_build_warnings+set}" = set; then
   enableval="$enable_build_warnings"

diff --git a/ld/configure.in b/ld/configure.in
index d84a2ae5574aea5099d3285250bd1291a794e3af..39d4d1277a6210b113c98fcf9becd2bc917f8d5c 100644 (file)
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -68,21 +68,21 @@ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
 
 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

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 0bf8a20aa014c0dec1ea8c94461a80936ce97e00..9c47346df04742934ff1c7cd340f046098062552 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/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  Alan Modra  <amodra@bigpond.net.au>

diff --git a/opcodes/configure b/opcodes/configure
index 6f57f4a812861b5bc56b79a441d0bfaebf72280c..31578476cfb76e5d4e9472671b820bf1838d6b2a 100755 (executable)
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -858,7 +858,7 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --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
@@ -4244,19 +4244,19 @@ esac
 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/opcodes/configure.in b/opcodes/configure.in
index cdf5c51613e425b74f77150f5c6a51de389562b8..8cca0b567d6bee19ade67cf33477f225649e32a2 100644 (file)
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -46,21 +46,21 @@ esac])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