2 files changed, 19 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 969cd5968..b45ebb49b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
      Silence bogus -Wuninitialized warnings; ok djm@
  - (dtucker) [configure.ac] Enable -Wuninitialized by default when compiling
    with gcc.  ok djm@
+ - (dtucker) [configure.ac] Add a --with-Werror option to configure for
+   adding -Werror to CFLAGS when all of the configure tests are done. ok djm@
 
 20050726
  - (dtucker) [configure.ac] Update zlib warning message too, pointed out by
@@ -2887,4 +2889,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3859 2005/08/02 07:21:29 dtucker Exp $
+$Id: ChangeLog,v 1.3860 2005/08/02 14:20:15 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 6e2f5c1f5..93297bbd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.281 2005/08/02 07:21:29 dtucker Exp $
+# $Id: configure.ac,v 1.282 2005/08/02 14:20:15 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -594,6 +594,17 @@ AC_ARG_WITH(libs,
                 fi
         ]
 )
+AC_ARG_WITH(Werror,
+        [  --with-Werror           Build main code with -Werror],
+        [
+                if test -n "$withval"  &&  test "x$withval" != "xno"; then
+                        werror_flags="-Werror"
+                        if "x${withval}" != "xyes"; then
+                                werror_flags="$withval"
+                        fi
+                fi
+        ]
+)
 
 AC_MSG_CHECKING(compiler and flags for sanity)
 AC_RUN_IFELSE(
@@ -3358,6 +3369,10 @@ if test "$ac_cv_lib_pam_pam_set_item" = yes ; then
         LIBS=`echo $LIBS | sed 's/-ldl //'`
 fi
 
+dnl Adding -Werror to CFLAGS early prevents configure tests from running.
+dnl Add now.
+CFLAGS="$CFLAGS $werror_flags"
+
 AC_EXEEXT
 AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openbsd-compat/Makefile \
         scard/Makefile ssh_prng_cmds survey.sh])