From: Bruno Haible <bruno@clisp.org>
Date: Mon, 5 Feb 2007 02:27:35 +0000 (+0000)
Subject: Addendum to last patch.
X-Git-Tag: cvs-readonly~1121
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=4e7aba80b453ea7449aea9bc19010c32f5d0f304;p=gnulib.git

Addendum to last patch.
---

diff --git a/ChangeLog b/ChangeLog
index 6f50e0e1c..d66536bcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,9 @@
 	Simplify handling of strncasecmp.
 	* lib/string_.h (strncasecmp): Remove test for GNULIB_STRCASE. Change
 	the conditional link warning.
-	* m4/string_h.m4 (gl_STRING_MODULE_INDICATOR_DEFAULTS): Don't
-	initialize GNULIB_STRCASE.
+	* m4/string_h.m4 (gl_HEADER_STRING_H_DEFAULTS): Initialize
+	HAVE_STRCASECMP, not REPLACE_STRCASECMP.
+	(gl_STRING_MODULE_INDICATOR_DEFAULTS): Don't initialize GNULIB_STRCASE.
 	* modules/strcase (configure.ac): Don't invoke
 	gl_STRING_MODULE_INDICATOR.
 	* modules/string (string.h): Don't substitute GNULIB_STRCASE.
diff --git a/m4/string_h.m4 b/m4/string_h.m4
index b68afc9a4..31f702b55 100644
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -32,6 +32,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
   HAVE_DECL_MEMRCHR=1;		AC_SUBST([HAVE_DECL_MEMRCHR])
   HAVE_STPCPY=1;		AC_SUBST([HAVE_STPCPY])
   HAVE_STPNCPY=1;		AC_SUBST([HAVE_STPNCPY])
+  HAVE_STRCASECMP=1;		AC_SUBST([HAVE_STRCASECMP])
   HAVE_DECL_STRNCASECMP=1;	AC_SUBST([HAVE_DECL_STRNCASECMP])
   HAVE_STRCHRNUL=1;		AC_SUBST([HAVE_STRCHRNUL])
   HAVE_DECL_STRDUP=1;		AC_SUBST([HAVE_DECL_STRDUP])
@@ -41,7 +42,6 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
   HAVE_STRPBRK=1;		AC_SUBST([HAVE_STRPBRK])
   HAVE_STRSEP=1;		AC_SUBST([HAVE_STRSEP])
   HAVE_DECL_STRTOK_R=1;		AC_SUBST([HAVE_DECL_STRTOK_R])
-  REPLACE_STRCASECMP=0;		AC_SUBST([REPLACE_STRCASECMP])
   REPLACE_STRCASESTR=0;		AC_SUBST([REPLACE_STRCASESTR])
 ])