From: Akim Demaille Date: Fri, 30 Nov 2001 14:23:47 +0000 (+0000) Subject: * configure.in (WARNING_CFLAGS): Add -Werror when possible. X-Git-Tag: BISON-1_30f~42 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/a69f6fa569eb6da9f1ccfd810aa261a466ffa1d7?ds=sidebyside * 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 d3b5469c..d0bd5e2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-11-30 Akim Demaille + + * 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 * lib/quotearg.h (quotearg_n, quotearg_n_style): diff --git a/Makefile.am b/Makefile.am index 475308db..543607cd 100644 --- 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 diff --git a/configure b/configure index 9d27ffe5..830b1776 100755 --- 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" - 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. diff --git a/configure.in b/configure.in index 240bec32..31a4b2d0 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,7 @@ # 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 @@ -59,7 +61,7 @@ if test "${enableval}" = yes; then BISON_WARNING(-Wshadow) BISON_WARNING(-Wstrict-prototypes) BISON_WARNING(-Wwrite-strings) - CFLAGS="$CFLAGS $WARNING_CFLAGS" + BISON_WARNING(-Werror) fi # Checks for libraries. diff --git a/lib/Makefile.am b/lib/Makefile.am index cdd19613..5fb1954c 100644 --- 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 +CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) + noinst_LIBRARIES = libbison.a INCLUDES = -I.. -I$(srcdir) -I../intl diff --git a/lib/Makefile.in b/lib/Makefile.in index b2c64aa4..dbcb3c7c 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -103,6 +103,8 @@ install_sh = @install_sh@ AUTOMAKE_OPTIONS = ansi2knr +CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) + 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 $@ -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 \ diff --git a/lib/xstrdup.c b/lib/xstrdup.c index 38674cab..cb1efa8c 100644 --- a/lib/xstrdup.c +++ b/lib/xstrdup.c @@ -1,5 +1,5 @@ /* 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 @@ -19,14 +19,6 @@ # include #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 #else @@ -35,7 +27,7 @@ #include -char *xmalloc PARAMS ((size_t n)); +#include "xalloc.h" /* Return a newly allocated copy of STRING. */ diff --git a/src/Makefile.am b/src/Makefile.am index 54eea149..dc3b2a8a 100644 --- 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\" +CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) + # 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 afb5b530..82ae6047 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -101,13 +101,16 @@ am__include = @am__include@ 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\" +CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) + # 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 $@ -CFLAGS = @CFLAGS@ DIST_SOURCES = $(bison_SOURCES) $(EXTRA_bison_SOURCES) DATA = $(pkgdata_DATA) diff --git a/tests/atlocal.in b/tests/atlocal.in index 9b8b7a8a..f65c400b 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -4,7 +4,7 @@ # We need a C compiler. CC='@CC@' -CFLAGS='@CFLAGS@' +CFLAGS='@CFLAGS@ @WARNING_CFLAGS@' # We need to know if the compiler is GCC. GCC='@GCC@'