From 2c8a9dfa1d15d0588a7f45393aeae7305396a895 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 30 Nov 2001 14:25:16 +0000 Subject: [PATCH] * 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. --- ChangeLog | 10 ++++++++++ Makefile.am | 15 +++++++++++++++ configure.in | 4 +++- lib/Makefile.am | 19 ++++++++++++++++++- lib/xstrdup.c | 12 ++---------- src/Makefile.am | 23 +++++++++++++++++++++-- tests/atlocal.in | 2 +- 7 files changed, 70 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d3ac89f..8a8ecbd1 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-27 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.in b/configure.in index aedc1937..f59fe984 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 @@ -64,7 +66,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 51790f56..4fc4e488 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$(top_srcdir)/src -I../intl 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 9ad2cc50..922bd9df 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/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@' -- 2.45.2