From b5775a81c150086df5ecc746628bc90849381f55 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 11 Nov 2008 13:37:36 +0100 Subject: [PATCH] Replace m4/warning.m4 with warnings module. * bootstrap.conf: Replace m4/warning.m4 with warnings module. * configure.ac: Adjust usage. * lib/Makefile.am: Replace $(WARNING_CFLAGS) with $(WARN_CFLAGS). * src/Makefile.am: Replace $(WARNING_CFLAGS) with $(WARN_CFLAGS). * tests/atlocal.in: Replace $(WARNING_*FLAGS) with $(WARN_*FLAGS). --- ChangeLog | 8 ++++++++ bootstrap.conf | 9 ++------- configure.ac | 32 ++++++++++++++++---------------- gnulib | 2 +- lib/Makefile.am | 2 +- m4/.cvsignore | 1 + m4/.gitignore | 1 + src/Makefile.am | 2 +- tests/atlocal.in | 4 ++-- 9 files changed, 33 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86aa3e5d..ecd403e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-11-11 Paolo Bonzini + + * bootstrap.conf: Replace m4/warning.m4 with warnings module. + * configure.ac: Adjust usage. + * lib/Makefile.am: Replace $(WARNING_CFLAGS) with $(WARN_CFLAGS). + * src/Makefile.am: Replace $(WARNING_CFLAGS) with $(WARN_CFLAGS). + * tests/atlocal.in: Replace $(WARNING_*FLAGS) with $(WARN_*FLAGS). + 2008-11-07 Joel E. Denny Don't add a semicolon to actions for %skeleton or %language. diff --git a/bootstrap.conf b/bootstrap.conf index 89d7db5d..bcab1b89 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -21,13 +21,8 @@ gnulib_modules=' dirname error extensions fopen-safer getopt gettext git-version-gen gnumakefile hash inttypes javacomp-script javaexec-script malloc mbswidth obstack quote quotearg stdbool stpcpy strerror strtoul - strverscmp unistd unistd-safer unlocked-io unsetenv verify xalloc - xalloc-die xstrndup -' - -# Any gnulib files needed that are not in modules. -gnulib_files=' - m4/warning.m4 + strverscmp unistd unistd-safer unlocked-io unsetenv verify + warnings xalloc xalloc-die xstrndup ' # Additional xgettext options to use. Use "\\\newline" to break lines. diff --git a/configure.ac b/configure.ac index adb52715..f1ebd8de 100644 --- a/configure.ac +++ b/configure.ac @@ -51,23 +51,23 @@ AC_ARG_ENABLE(gcc-warnings, esac], [enableval=no]) if test "${enableval}" = yes; then - gl_WARNING_CFLAGS([-Werror]) - AC_SUBST([WERROR_CFLAGS], [$WARNING_CFLAGS]) - WARNING_CFLAGS= - gl_WARNING_CFLAGS([-Wall]) - gl_WARNING_CFLAGS([-Wextra -Wno-sign-compare]) - gl_WARNING_CFLAGS([-Wcast-align]) - gl_WARNING_CFLAGS([-Wcast-qual]) - gl_WARNING_CFLAGS([-Wformat]) - gl_WARNING_CFLAGS([-Wpointer-arith]) - gl_WARNING_CFLAGS([-Wwrite-strings]) - AC_SUBST([WARNING_CXXFLAGS], [$WARNING_CFLAGS]) + gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) + AC_SUBST([WERROR_CFLAGS]) + gl_WARN_ADD([-Wall]) + gl_WARN_ADD([-Wextra -Wno-sign-compare]) + gl_WARN_ADD([-Wcast-align]) + gl_WARN_ADD([-Wcast-qual]) + gl_WARN_ADD([-Wformat]) + gl_WARN_ADD([-Wpointer-arith]) + gl_WARN_ADD([-Wwrite-strings]) + AC_SUBST([WARN_CXXFLAGS], [$WARN_CFLAGS]) # The following warnings are not suitable for C++. - gl_WARNING_CFLAGS([-Wbad-function-cast]) - gl_WARNING_CFLAGS([-Wmissing-declarations]) - gl_WARNING_CFLAGS([-Wmissing-prototypes]) - gl_WARNING_CFLAGS([-Wshadow]) - gl_WARNING_CFLAGS([-Wstrict-prototypes]) + gl_WARN_ADD([-Wbad-function-cast]) + gl_WARN_ADD([-Wmissing-declarations]) + gl_WARN_ADD([-Wmissing-prototypes]) + gl_WARN_ADD([-Wshadow]) + gl_WARN_ADD([-Wstrict-prototypes]) + AC_SUBST([WARN_CFLAGS]) AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.]) fi diff --git a/gnulib b/gnulib index 2ec9ae24..2c64312e 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 2ec9ae244196c963a03bbcd3d85233ee78adbd44 +Subproject commit 2c64312ecca19a60629cb929c1ae759109c772b5 diff --git a/lib/Makefile.am b/lib/Makefile.am index 8a957c39..4ec82d94 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -17,7 +17,7 @@ include gnulib.mk -AM_CFLAGS = $(WARNING_CFLAGS) +AM_CFLAGS = $(WARN_CFLAGS) # Implementation of bitsets. bitsets_sources = \ diff --git a/m4/.cvsignore b/m4/.cvsignore index 3dfb9213..462f3028 100644 --- a/m4/.cvsignore +++ b/m4/.cvsignore @@ -58,6 +58,7 @@ unistd-safer.m4 unistd_h.m4 unlocked-io.m4 warning.m4 +warnings.m4 wchar.m4 wchar_t.m4 wctype.m4 diff --git a/m4/.gitignore b/m4/.gitignore index 12a51b1c..6c4d5665 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -58,6 +58,7 @@ /unistd_h.m4 /unlocked-io.m4 /warning.m4 +/warnings.m4 /wchar.m4 /wchar_t.m4 /wctype.m4 diff --git a/src/Makefile.am b/src/Makefile.am index ef974457..afe6d088 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS) +AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/lib AM_YFLAGS = "-dv" diff --git a/tests/atlocal.in b/tests/atlocal.in index 9fd930e5..a67c4dc3 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -8,7 +8,7 @@ CC='@CC@' # We want no optimization. -CFLAGS='@O0CFLAGS@ @WARNING_CFLAGS@ @WERROR_CFLAGS@' +CFLAGS='@O0CFLAGS@ @WARN_CFLAGS@ @WERROR_CFLAGS@' # We need `config.h'. CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@" @@ -23,7 +23,7 @@ CXX='@CXX@' BISON_CXX_WORKS='@BISON_CXX_WORKS@' # We want no optimization with C++, too. -CXXFLAGS='@O0CXXFLAGS@ @WARNING_CXXFLAGS@ @WERROR_CFLAGS@' +CXXFLAGS='@O0CXXFLAGS@ @WARN_CXXFLAGS@ @WERROR_CFLAGS@' # Are special link options needed? LDFLAGS='@LDFLAGS@' -- 2.45.2