* m4/string_h.m4 (gl_STRING_MODULE_INDICATOR): Correct m4 usage

bug.
* modules/string (Makefile.am): Remove redundant replacement.
* modules/regex (Depends-on): Add mempcpy.

diff --git a/ChangeLog b/ChangeLog
index 27decb8969fc866b436e35b95c8cab0529543e86..4c53742b4317f643c4b6a2c48f52437735a142be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-31  Eric Blake  <ebb9@byu.net>
+
+       * m4/string_h.m4 (gl_STRING_MODULE_INDICATOR): Correct m4 usage
+       bug.
+       * modules/string (Makefile.am): Remove redundant replacement.
+       * modules/regex (Depends-on): Add mempcpy.
+
 2007-01-31  Bruno Haible  <bruno@clisp.org>
 
        New module description field 'Link'.

diff --git a/m4/string_h.m4 b/m4/string_h.m4
index 42adcc5ed4694adc7242cd23fb85c50e6e8a85aa..8e0be44f8586c753704fef68ed83ac0f97129290 100644 (file)
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -50,7 +50,7 @@ AC_DEFUN([gl_STRING_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
   AC_REQUIRE([gl_STRING_MODULE_INDICATOR_DEFAULTS])
-  GNULIB_]translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])[=1
+  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
 ])
 
 AC_DEFUN([gl_STRING_MODULE_INDICATOR_DEFAULTS],

diff --git a/modules/regex b/modules/regex
index 5d7d263d924e5ba64592cfd8af6ac9e332ac4e6e..81e9fd7d1f10aef2f419ebf0aecc6d1f288dcdba 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -16,6 +16,7 @@ alloca
 extensions
 gettext-h
 malloc
+mempcpy
 stdint
 strcase
 ssize_t

diff --git a/modules/string b/modules/string
index 526fdebd7fa5626c05040e05efabed3a8eeb12d7..d0df67317269a04d815f2d34a3cd9e9a7cf29ae2 100644 (file)
--- a/modules/string
+++ b/modules/string
@@ -27,7 +27,6 @@ string.h: string_.h
              -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
              -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
              -e 's|@''GNULIB_STRCASE''@|$(GNULIB_STRCASE)|g' \
-             -e 's|@''GNULIB_STRCASE''@|$(GNULIB_STRCASE)|g' \
              -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
              -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
              -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \