summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2010-04-04 23:41:29 +0200
committerBruno Haible <bruno@clisp.org>2010-04-04 23:41:29 +0200
commit93679bd8c7f5e93f7f7f72909e1757eeaeab0c8d (patch)
tree56f880d1bcd874c81711da5a438442f546b04ef5
parente692396584de5b495575f50860b91d37ebd2ff51 (diff)
downloadgnulib-93679bd8c7f5e93f7f7f72909e1757eeaeab0c8d.tar.gz
string: Remove unused substitution.
-rw-r--r--ChangeLog7
-rw-r--r--m4/string_h.m43
-rw-r--r--modules/string1
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a3b202f16..f88dbc786d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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.
* m4/strtod.m4 (gl_FUNC_STRTOD): When setting HAVE_STRTOD to 0, don't
set REPLACE_STRTOD.
diff --git a/m4/string_h.m4 b/m4/string_h.m4
index e3c4a34691..4c2a27ce06 100644
--- 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 b26ad15b4b..8f4068da59 100644
--- 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' \