string: Remove unused substitution.

diff --git a/ChangeLog b/ChangeLog
index 1a3b202f16041a4e5112997e5ac21a82f16842d1..f88dbc786d439aa006a8baf342d37b484a567528 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-04  Bruno Haible  <bruno@clisp.org>
+
+       string: Remove unused substitution.
+       * m4/string_h.m4 (gl_HEADER_STRING_H_DEFAULTS): Don't initialize
+       HAVE_DECL_STRERROR.
+       * modules/string (Makefile.am): Don't substitute HAVE_DECL_STRERROR.
+
 2010-04-04  Bruno Haible  <bruno@clisp.org>
 
        strtod: Avoid a possible C++ test error.

diff --git a/m4/string_h.m4 b/m4/string_h.m4
index e3c4a346917028d86fd8c4700ea144aae7a21682..4c2a27ce06307b4801a6d869dc6060d972e9ca60 100644 (file)
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -5,7 +5,7 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 14
+# serial 15
 
 # Written by Paul Eggert.
 
@@ -90,7 +90,6 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
   HAVE_STRSEP=1;                AC_SUBST([HAVE_STRSEP])
   HAVE_STRCASESTR=1;            AC_SUBST([HAVE_STRCASESTR])
   HAVE_DECL_STRTOK_R=1;         AC_SUBST([HAVE_DECL_STRTOK_R])
-  HAVE_DECL_STRERROR=1;         AC_SUBST([HAVE_DECL_STRERROR])
   HAVE_DECL_STRSIGNAL=1;        AC_SUBST([HAVE_DECL_STRSIGNAL])
   HAVE_STRVERSCMP=1;            AC_SUBST([HAVE_STRVERSCMP])
   REPLACE_MEMCHR=0;             AC_SUBST([REPLACE_MEMCHR])

diff --git a/modules/string b/modules/string
index b26ad15b4b58f0fd041cfd422d2303cfea4c7d08..8f4068da5940b7354fc4e347bb90eda69c297f7c 100644 (file)
--- a/modules/string
+++ b/modules/string
@@ -76,7 +76,6 @@ string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
              -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
              -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
-             -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \
              -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
              -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
              -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \