From: Eric Blake <ebb9@byu.net>
Date: Thu, 1 Feb 2007 05:01:17 +0000 (+0000)
Subject: * m4/string_h.m4 (gl_STRING_MODULE_INDICATOR): Correct m4 usage
X-Git-Tag: cvs-readonly~1161
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=eb84fa936d140769a5aa9641a7923fad8bea753b;p=gnulib.git

* 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 27decb896..4c53742b4 100644
--- 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 42adcc5ed..8e0be44f8 100644
--- 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 5d7d263d9..81e9fd7d1 100644
--- 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 526fdebd7..d0df67317 100644
--- 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' \