Update after gnulib changed.

diff --git a/ChangeLog b/ChangeLog
index 53fab538e86243fbb3bc9f560ecb904eeff01d9b..1acd2de85609c8dd9f81503aefff68f9c192832f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-12  Bruno Haible  <bruno@clisp.org>
+
+       Update after gnulib changed.
+       * autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES): Update
+       module names.
+
 2011-06-08  Bruno Haible  <bruno@clisp.org>
 
        Fix a link error due to rpl_wcrtomb on Solaris 9.

diff --git a/autogen.sh b/autogen.sh
index 92aa4996709966ae9be148004d76b44c3fdd7b12..bf8c49e24aff873c1a592dc9c83a95f5cf17b63e 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -214,8 +214,6 @@ if ! $skip_gnulib; then
     # Common dependencies of GNULIB_MODULES_TOOLS_FOR_SRC and GNULIB_MODULES_TOOLS_FOR_LIBGREP.
     GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES='
       alloca-opt
-      arg-nonnull
-      c++defs
       extensions
       gettext-h
       include_next
@@ -224,6 +222,9 @@ if ! $skip_gnulib; then
       mbrtowc
       mbsinit
       multiarch
+      snippet/arg-nonnull
+      snippet/c++defs
+      snippet/warn-on-use
       ssize_t
       stdbool
       stddef
@@ -232,7 +233,6 @@ if ! $skip_gnulib; then
       streq
       unistd
       verify
-      warn-on-use
       wchar
       wctype-h
     '

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 1e0499bcb87ff6cec0d5f82a4a19f58120dee440..fef9430481a5c7fcd9d5902c200370211f210a74 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-12  Bruno Haible  <bruno@clisp.org>
+
+       Update after gnulib changed.
+       * modules/fnmatch.diff: Update.
+
 2011-06-16  Bruno Haible  <bruno@clisp.org>
 
        Update after gnulib changed.

diff --git a/gnulib-local/modules/fnmatch.diff b/gnulib-local/modules/fnmatch.diff
index d2e2cbc690c24fcdb555c11104282b8ceeb170f0..74ac97a2af33161feeec480c677811086cf8fccf 100644 (file)
--- a/gnulib-local/modules/fnmatch.diff
+++ b/gnulib-local/modules/fnmatch.diff
@@ -3,16 +3,16 @@
 ***************
 *** 11,17 ****
   Depends-on:
-  arg-nonnull
   extensions
+  snippet/arg-nonnull
 ! alloca          [test -n "$FNMATCH_H"]
   stdbool         [test -n "$FNMATCH_H"]
   wchar           [test -n "$FNMATCH_H"]
   wctype-h        [test -n "$FNMATCH_H"]
 --- 11,17 ----
   Depends-on:
-  arg-nonnull
   extensions
+  snippet/arg-nonnull
 ! alloca-opt      [test -n "$FNMATCH_H"]
   stdbool         [test -n "$FNMATCH_H"]
   wchar           [test -n "$FNMATCH_H"]