summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--configure.in2
-rw-r--r--lib/gnulib.mk2
-rw-r--r--m4/gl-comp.m45
4 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ab3ecfd692..ca3bcff5a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-21 Paul Eggert <eggert@cs.ucla.edu>
+
+ Sync from gnulib version 4f11d6bebc3098c64ffde27079ab0d0cecfd0cdc
+ dated 2011-10-07. Regenerating from current gnulib would be a
+ pervasive change, and currently the trunk isn't open to such changes.
+ * configure.in (WARN_CFLAGS): Remove; no longer needed now
+ that gnulib does it.
+ * lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
+
2012-04-21 Andreas Schwab <schwab@linux-m68k.org>
* m4/gl-comp.m4: Update. (Bug#11285)
diff --git a/configure.in b/configure.in
index 1554e10145..c9592921e7 100644
--- a/configure.in
+++ b/configure.in
@@ -787,8 +787,6 @@ else
gl_WARN_ADD([-fdiagnostics-show-option])
gl_WARN_ADD([-funit-at-a-time])
- AC_SUBST([WARN_CFLAGS])
-
AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.])
AC_DEFINE([_FORTIFY_SOURCE], [2],
[enable compile-time and run-time bounds-checking, and some warnings])
diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index 154ae9882d..153ea11efe 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -21,7 +21,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat manywarnings mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat warnings
MOSTLYCLEANFILES += core *.stackdump
diff --git a/m4/gl-comp.m4 b/m4/gl-comp.m4
index 42a0ed9723..73a26c4132 100644
--- a/m4/gl-comp.m4
+++ b/m4/gl-comp.m4
@@ -1,5 +1,5 @@
# DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -62,6 +62,7 @@ AC_DEFUN([gl_EARLY],
# Code from module largefile:
AC_REQUIRE([AC_SYS_LARGEFILE])
# Code from module lstat:
+ # Code from module manywarnings:
# Code from module mktime:
# Code from module multiarch:
# Code from module nocrash:
@@ -100,6 +101,7 @@ AC_DEFUN([gl_EARLY],
# Code from module u64:
# Code from module unistd:
# Code from module verify:
+ # Code from module warnings:
])
# This macro should be invoked from ./configure.in, in the section
@@ -216,6 +218,7 @@ fi
gl_TIME_MODULE_INDICATOR([time_r])
AC_REQUIRE([AC_C_INLINE])
gl_UNISTD_H
+AC_SUBST([WARN_CFLAGS])
gl_gnulib_enabled_dosname=false
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false
gl_gnulib_enabled_pathmax=false