* configure.in (WARNING_CFLAGS): Add -Werror when possible.

(CFLAGS): Do not include the WARNING_CFLAGS here, since GNU
Gettext doesn't compile cleanly, and dies with -Werror.
* src/Makefile.am, lib/Makefile.am, tests/atlocal.in (CFLAGS):
Include WARNING_CFLAGS here.
* lib/xstrdup.c: Include xalloc.h, so that xstrdup be declared
before being defined.

diff --git a/ChangeLog b/ChangeLog
index d3b5469c22d7fd0503bd81e04675dadd4cafeec2..d0bd5e2d9d48312179cd6edf8a08a064d45b3a9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-11-30  Akim Demaille  <akim@epita.fr>
+
+       * configure.in (WARNING_CFLAGS): Add -Werror when possible.
+       (CFLAGS): Do not include the WARNING_CFLAGS here, since GNU
+       Gettext doesn't compile cleanly, and dies with -Werror.
+       * src/Makefile.am, lib/Makefile.am, tests/atlocal.in (CFLAGS):
+       Include WARNING_CFLAGS here.
+       * lib/xstrdup.c: Include xalloc.h, so that xstrdup be declared
+       before being defined.
+

 2001-11-30  Paul Eggert  <eggert@twinsun.com>
 
        * lib/quotearg.h (quotearg_n, quotearg_n_style):
 2001-11-30  Paul Eggert  <eggert@twinsun.com>
 
        * lib/quotearg.h (quotearg_n, quotearg_n_style):

diff --git a/Makefile.am b/Makefile.am
index 475308db671711a93785a47ad279ea58a5f3fd20..543607cdfca7b70d1806d3a1335b8ac2db1a9483 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,18 @@
+## 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
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+## 02111-1307  USA
+

 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha dist-bzip2
 
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha dist-bzip2
 

diff --git a/configure b/configure
index 9d27ffe58e99c934c77c6c27de7b22463fca8630..830b1776a3146369a466070106b1c0e2e2945f69 100755 (executable)
--- a/configure
+++ b/configure
@@ -3734,7 +3734,52 @@ echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ac_save_CFLAGS"

-  CFLAGS="$CFLAGS $WARNING_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
 
 # Checks for libraries.
 fi
 
 # Checks for libraries.

diff --git a/configure.in b/configure.in
index 240bec32633a5e7ffa3399343bbdef57cf24e6b4..31a4b2d0b6d923ae31b4d021db41298ad0eb0280 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,7 @@
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #
 # Configure template for GNU Bison.                   -*-Autoconf-*-
 #

+# Copyright 2001  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
 # the Free Software Foundation; either version 2 of the License, or
 # 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
 # the Free Software Foundation; either version 2 of the License, or


@@ -59,7 +61,7 @@ if test "${enableval}" = yes; then
   BISON_WARNING(-Wshadow)
   BISON_WARNING(-Wstrict-prototypes)
   BISON_WARNING(-Wwrite-strings)
   BISON_WARNING(-Wshadow)
   BISON_WARNING(-Wstrict-prototypes)
   BISON_WARNING(-Wwrite-strings)

-  CFLAGS="$CFLAGS $WARNING_CFLAGS"
+  BISON_WARNING(-Werror)

 fi
 
 # Checks for libraries.
 fi
 
 # Checks for libraries.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index cdd1961307cb88c756999cf8f779e5addb47794f..5fb1954c63c41b73e7cae82008fc812c658d05d2 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,24 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
+## Copyright 2001 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
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+## 02111-1307  USA

 
 AUTOMAKE_OPTIONS = ansi2knr
 
 
 AUTOMAKE_OPTIONS = ansi2knr
 

+CFLAGS = @CFLAGS@ $(WARNING_CFLAGS)
+

 noinst_LIBRARIES = libbison.a
 
 INCLUDES = -I.. -I$(srcdir) -I../intl
 noinst_LIBRARIES = libbison.a
 
 INCLUDES = -I.. -I$(srcdir) -I../intl

diff --git a/lib/Makefile.in b/lib/Makefile.in
index b2c64aa4d25e37ebd3b41c29148d912efa6913e5..dbcb3c7c1a231503e975b2281d544af955d151f7 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -103,6 +103,8 @@ install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = ansi2knr
 
 
 AUTOMAKE_OPTIONS = ansi2knr
 

+CFLAGS = @CFLAGS@ $(WARNING_CFLAGS)
+

 noinst_LIBRARIES = libbison.a
 
 INCLUDES = -I.. -I$(srcdir) -I../intl
 noinst_LIBRARIES = libbison.a
 
 INCLUDES = -I.. -I$(srcdir) -I../intl


@@ -150,7 +152,6 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

-CFLAGS = @CFLAGS@

 DIST_SOURCES = $(libbison_a_SOURCES)
 DIST_COMMON = Makefile.am Makefile.in alloca.c ansi2knr.1 ansi2knr.c \
        error.c error.h malloc.c memchr.c obstack.c obstack.h realloc.c \
 DIST_SOURCES = $(libbison_a_SOURCES)
 DIST_COMMON = Makefile.am Makefile.in alloca.c ansi2knr.1 ansi2knr.c \
        error.c error.h malloc.c memchr.c obstack.c obstack.h realloc.c \

diff --git a/lib/xstrdup.c b/lib/xstrdup.c
index 38674cab18bbf23ee08742fff3010219ad0f2130..cb1efa8c20ce986c1a3f13763c5ee7915c71244b 100644 (file)
--- a/lib/xstrdup.c
+++ b/lib/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
 /* xstrdup.c -- copy a string with out of memory checking

-   Copyright (C) 1990, 1996, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1996, 1998, 2001 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
 
    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


@@ -19,14 +19,6 @@
 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 

-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-

 #if STDC_HEADERS || HAVE_STRING_H
 # include <string.h>
 #else
 #if STDC_HEADERS || HAVE_STRING_H
 # include <string.h>
 #else


@@ -35,7 +27,7 @@
 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 

-char *xmalloc PARAMS ((size_t n));
+#include "xalloc.h"

 
 /* Return a newly allocated copy of STRING.  */
 
 
 /* Return a newly allocated copy of STRING.  */
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 54eea1497c2f2aff600101916f5bbd1d70c57abf..dc3b2a8a963e3328feeca9073cbd96597da634f3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,29 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr
+## Copyright 2001 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
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+## 02111-1307  USA
+
+AUTOMAKE_OPTIONS = ../lib/ansi2knr
+

 DEFS = @DEFS@ \
   -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\" \
   -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
 DEFS = @DEFS@ \
   -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\" \
   -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
   -DLOCALEDIR=\"$(datadir)/locale\"
 

+CFLAGS = @CFLAGS@ $(WARNING_CFLAGS)
+

 # libintl.h in is build/intl, intl/libgettext.h in src/,
 # config.h in build/.
 INCLUDES = -I$(top_builddir)/intl \
 # libintl.h in is build/intl, intl/libgettext.h in src/,
 # config.h in build/.
 INCLUDES = -I$(top_builddir)/intl \

diff --git a/src/Makefile.in b/src/Makefile.in
index afb5b5303f5945708a2961a2f6df68b31e68079a..82ae60470a0820a24e6b448f178db1c47f86f285 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -101,13 +101,16 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
 
 am__quote = @am__quote@
 install_sh = @install_sh@
 

-AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr
+AUTOMAKE_OPTIONS = ../lib/ansi2knr
+

 DEFS = @DEFS@ \
   -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\" \
   -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
 
 DEFS = @DEFS@ \
   -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\" \
   -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
 

+CFLAGS = @CFLAGS@ $(WARNING_CFLAGS)
+

 # libintl.h in is build/intl, intl/libgettext.h in src/,
 # config.h in build/.
 INCLUDES = -I$(top_builddir)/intl \
 # libintl.h in is build/intl, intl/libgettext.h in src/,
 # config.h in build/.
 INCLUDES = -I$(top_builddir)/intl \


@@ -178,7 +181,6 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

-CFLAGS = @CFLAGS@

 DIST_SOURCES = $(bison_SOURCES) $(EXTRA_bison_SOURCES)
 DATA = $(pkgdata_DATA)
 
 DIST_SOURCES = $(bison_SOURCES) $(EXTRA_bison_SOURCES)
 DATA = $(pkgdata_DATA)
 

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 9b8b7a8a0db43e1e5bff1e46b272bf7f3ce41037..f65c400b2fe1f2fbcdce3a4fcce78325953114c9 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -4,7 +4,7 @@
 
 # We need a C compiler.
 CC='@CC@'
 
 # We need a C compiler.
 CC='@CC@'

-CFLAGS='@CFLAGS@'
+CFLAGS='@CFLAGS@ @WARNING_CFLAGS@'

 
 # We need to know if the compiler is GCC.
 GCC='@GCC@'
 
 # We need to know if the compiler is GCC.
 GCC='@GCC@'