Update after gnulib changed.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index b8299fb0baf42466e157e40c845ccd19b48ef12f..823135ce6b198e1cc09edac7fa519b7d46789b2a 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-02  Bruno Haible  <bruno@clisp.org>
+
+       Update after gnulib changed.
+       * modules/fnmatch.diff: Update.
+       * modules/regex.diff: Likewise.
+       * m4/alloca.m4 (gl_FUNC_ALLOCA): Likewise.
+
 2011-02-12  Bruno Haible  <bruno@clisp.org>
 
        Prefer gnulib's setlocale override over libintl's override.

diff --git a/gnulib-local/m4/alloca.m4 b/gnulib-local/m4/alloca.m4
index cd4a679913c2af56e408c2bdcaf2f2791c663fa5..e061b3c08c37d4e754c9d34a346eceb82e07984c 100644 (file)
--- a/gnulib-local/m4/alloca.m4
+++ b/gnulib-local/m4/alloca.m4
@@ -1,4 +1,4 @@
-# alloca.m4 serial 3 (gettext-0.16)
+# alloca.m4 serial 4 (gettext-0.18.2)
 dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -25,6 +25,7 @@ AC_DEFUN([gl_FUNC_ALLOCA],
     ALLOCA_H=alloca.h,
     ALLOCA_H=)
   AC_SUBST([ALLOCA_H])
+  AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
 ])
 
 # Prerequisites of lib/alloca.c.

diff --git a/gnulib-local/modules/fnmatch.diff b/gnulib-local/modules/fnmatch.diff
index f67ebbb0f9289538a47c799cbd70e81049433e9e..d2e2cbc690c24fcdb555c11104282b8ceeb170f0 100644 (file)
--- a/gnulib-local/modules/fnmatch.diff
+++ b/gnulib-local/modules/fnmatch.diff
@@ -1,19 +1,19 @@
-*** modules/fnmatch.orig       2007-09-30 05:30:42.000000000 +0200
---- modules/fnmatch    2007-09-30 05:30:52.000000000 +0200
+*** modules/fnmatch.orig       2011-06-02 22:42:23.000000000 +0200
+--- modules/fnmatch    2011-06-02 22:42:43.000000000 +0200
 ***************
-*** 10,16 ****
-  
+*** 11,17 ****
   Depends-on:
+  arg-nonnull
   extensions
-! alloca
-  stdbool
-  wchar
-  wctype-h
---- 10,16 ----
-  
+! 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
-! alloca-opt
-  stdbool
-  wchar
-  wctype-h
+! alloca-opt      [test -n "$FNMATCH_H"]
+  stdbool         [test -n "$FNMATCH_H"]
+  wchar           [test -n "$FNMATCH_H"]
+  wctype-h        [test -n "$FNMATCH_H"]

diff --git a/gnulib-local/modules/regex.diff b/gnulib-local/modules/regex.diff
index 0d9815222c50926b5860495a5d698973f5f4af5e..0decd2718ac84c37dec68c66aad69873978d09db 100644 (file)
--- a/gnulib-local/modules/regex.diff
+++ b/gnulib-local/modules/regex.diff
@@ -1,19 +1,19 @@
-*** modules/regex.orig Mon May 24 12:36:55 2010
---- modules/regex      Mon May 24 12:36:42 2010
+*** modules/regex.orig 2011-06-02 22:43:41.000000000 +0200
+--- modules/regex      2011-06-02 22:43:53.000000000 +0200
 ***************
-*** 17,23 ****
-  extensions
-  gettext-h
-  localcharset
-! malloc-gnu
-  memcmp
-  memmove
-  mbrtowc
---- 17,23 ----
-  extensions
-  gettext-h
-  localcharset
-! malloc-posix
-  memcmp
-  memmove
-  mbrtowc
+*** 18,24 ****
+  btowc           [test $ac_use_included_regex = yes]
+  gettext-h       [test $ac_use_included_regex = yes]
+  localcharset    [test $ac_use_included_regex = yes]
+! malloc-gnu      [test $ac_use_included_regex = yes]
+  memcmp          [test $ac_use_included_regex = yes]
+  memmove         [test $ac_use_included_regex = yes]
+  mbrtowc         [test $ac_use_included_regex = yes]
+--- 18,24 ----
+  btowc           [test $ac_use_included_regex = yes]
+  gettext-h       [test $ac_use_included_regex = yes]
+  localcharset    [test $ac_use_included_regex = yes]
+! malloc-posix    [test $ac_use_included_regex = yes]
+  memcmp          [test $ac_use_included_regex = yes]
+  memmove         [test $ac_use_included_regex = yes]
+  mbrtowc         [test $ac_use_included_regex = yes]