* configure.in (WERROR_CFLAGS): Compute it.

* src/Makefile.am (CFLAGS): Pass it.
* tests/atlocal.in (CFLAGS): Idem.

diff --git a/ChangeLog b/ChangeLog
index a34a6aea747c6d2952d588b5ae86dd68dab67475..4db7c7e66f9f1193bfe35dd671ff21b563747ea9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-09  Akim Demaille  <akim@epita.fr>
+
+       * configure.in (WERROR_CFLAGS): Compute it.
+       * src/Makefile.am (CFLAGS): Pass it.
+       * tests/atlocal.in (CFLAGS): Idem.
+
 2002-01-08  Akim Demaille  <akim@epita.fr>
 
        * lib/Makefile.am (libbison_a_SOURCES): Add xstrndup.c.

diff --git a/Makefile.in b/Makefile.in
index 948fcddbb579f78396ec3b1fdcdae16b7fb12d6e..a6827e2dc9558ff81a4da97a614ac5f7ee0032e8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -97,6 +97,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WERROR_CFLAGS = @WERROR_CFLAGS@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@

diff --git a/config/Makefile.in b/config/Makefile.in
index 7c36eb6b8a03fa8867abc646c21aac8bd700b9ba..48e4a6211ab06323b6611ee1490689576cb97c1d 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -97,6 +97,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WERROR_CFLAGS = @WERROR_CFLAGS@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@

diff --git a/configure b/configure
index d714936b7db9ae335fd0d81ed13f5519d10886d0..537f22a7761421afdc032bfde41a4db5efea9bde 100755 (executable)
--- a/configure
+++ b/configure
@@ -3209,6 +3209,55 @@ else
   enableval=no
 fi;
 if test "${enableval}" = yes; then
+  echo "$as_me:$LINENO: checking whether compiler accepts -Werror" >&5
+echo $ECHO_N "checking whether compiler accepts -Werror... $ECHO_C" >&6
+
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+int x;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  WARNING_CFLAGS="$WARNING_CFLAGS -Werror"
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$ac_save_CFLAGS"
+  WERROR_CFLAGS=$WARNING_CFLAGS
+
+  WARNING_CFLAGS=
   echo "$as_me:$LINENO: checking whether compiler accepts -Wall" >&5
 echo $ECHO_N "checking whether compiler accepts -Wall... $ECHO_C" >&6
 
@@ -3760,52 +3809,6 @@ echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-CFLAGS="$ac_save_CFLAGS"
-  echo "$as_me:$LINENO: checking whether compiler accepts -Werror" >&5
-echo $ECHO_N "checking whether compiler accepts -Werror... $ECHO_C" >&6
-
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Werror"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-int x;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  WARNING_CFLAGS="$WARNING_CFLAGS -Werror"
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 fi
 
@@ -9597,6 +9600,7 @@ s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 s,@AUTOM4TE@,$AUTOM4TE,;t t
 s,@WARNING_CFLAGS@,$WARNING_CFLAGS,;t t
+s,@WERROR_CFLAGS@,$WERROR_CFLAGS,;t t
 s,@U@,$U,;t t
 s,@ANSI2KNR@,$ANSI2KNR,;t t
 s,@ALLOCA@,$ALLOCA,;t t

diff --git a/configure.in b/configure.in
index 509d935c6d9a26714a821957e83ffbfb435b2ab0..6e407d413d0f1a613dbb16742c74adad019601df 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -49,6 +49,9 @@ AC_ARG_ENABLE(gcc-warnings,
  esac],
               [enableval=no])
 if test "${enableval}" = yes; then
+  BISON_WARNING(-Werror)
+  AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS])
+  WARNING_CFLAGS=
   BISON_WARNING(-Wall)
   BISON_WARNING(-W)
   BISON_WARNING(-Wbad-function-cast)
@@ -61,7 +64,6 @@ if test "${enableval}" = yes; then
   BISON_WARNING(-Wshadow)
   BISON_WARNING(-Wstrict-prototypes)
   BISON_WARNING(-Wwrite-strings)
-  BISON_WARNING(-Werror)
 fi
 
 # Checks for libraries.

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 5a7d5fd0a9e9af503f0f023acffbcf46160d7a51..61180ffa1679a6458d6611d7980cd3419b6572cf 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -97,6 +97,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WERROR_CFLAGS = @WERROR_CFLAGS@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@

diff --git a/m4/Makefile.in b/m4/Makefile.in
index c60adfd37230cffe56115d498d534e3248bbece1..dec187df3f3fb9d40cbbc7a9ad82bd862d93f201 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -97,6 +97,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WERROR_CFLAGS = @WERROR_CFLAGS@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@

diff --git a/src/Makefile.am b/src/Makefile.am
index e9bf9ae2335719ad01fb39cea3db093f13b9b0be..6d0b6c94bc9cad34b70b3821fd14346ab6f2e04c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright 2001 Free Software Foundation, Inc.
+## Copyright 2001, 2002 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ DEFS = @DEFS@ \
   -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
-CFLAGS = @CFLAGS@ $(WARNING_CFLAGS)
+CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) $(WERROR_CFLAGS)
 
 # libintl.h in is build/intl, intl/libgettext.h in src/,
 # config.h in build/.

diff --git a/src/Makefile.in b/src/Makefile.in
index f6f5b17ccf4843380313cfb2a453471810b7d663..eaa44126ca9fe9a963df1ff6b8beb357594b8af3 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -97,6 +97,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WERROR_CFLAGS = @WERROR_CFLAGS@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
@@ -109,7 +110,7 @@ DEFS = @DEFS@ \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
 
-CFLAGS = @CFLAGS@ $(WARNING_CFLAGS)
+CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) $(WERROR_CFLAGS)
 
 # libintl.h in is build/intl, intl/libgettext.h in src/,
 # config.h in build/.

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7b06bdee91dda03bb853be862d972067424d76f7..86a79f3eb6e8328cc88a000980a8beba17be2f1b 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -97,6 +97,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WERROR_CFLAGS = @WERROR_CFLAGS@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 19c09262c223ad9c90b74d474875bfb472a9307b..a189b2d631ec5295287a32f2accdecf53636ab07 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,10 +1,10 @@
 # @configure_input@                                    -*- shell-script -*-
 # Configurable variable values for Bison test suite.
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
 
 # We need a C compiler.
 CC='@CC@'
-CFLAGS='@CFLAGS@ @WARNING_CFLAGS@'
+CFLAGS='@CFLAGS@ @WARNING_CFLAGS@ @WERROR_CFLAGS@'
 
 # We need `config.h'.
 CPPFLAGS="-I$abs_top_builddir @CPPFLAGS@"