* doc/gnulib-tool.texi (Initial import): Update to match current

[pspp] / m4 / strcase.m4

diff --git a/m4/strcase.m4 b/m4/strcase.m4
index 8a8ff3a451cf8afff9506be1d6691a90097e790e..bcb969e9961b5abcb83aba61dd23bf40ba0b0fd2 100644 (file)
--- a/m4/strcase.m4
+++ b/m4/strcase.m4
@@ -1,5 +1,5 @@
-# strcase.m4 serial 2
-dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+# strcase.m4 serial 5
+dnl Copyright (C) 2002, 2005-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,8 +15,8 @@ AC_DEFUN([gl_FUNC_STRCASECMP],
   dnl No known system has a strcasecmp() function that works correctly in
   dnl multibyte locales. Therefore we use our version always.
   AC_LIBOBJ(strcasecmp)
-  AC_DEFINE(strcasecmp, rpl_strcasecmp, [Define to rpl_strcasecmp always.])
   gl_PREREQ_STRCASECMP
+  REPLACE_STRCASECMP=1
 ])
 
 AC_DEFUN([gl_FUNC_STRNCASECMP],
@@ -25,11 +25,16 @@ AC_DEFUN([gl_FUNC_STRNCASECMP],
   if test $ac_cv_func_strncasecmp = no; then
     gl_PREREQ_STRNCASECMP
   fi
+  AC_CHECK_DECLS(strncasecmp)
+  if test $ac_cv_have_decl_strncasecmp = no; then
+    HAVE_DECL_STRNCASECMP=0
+  fi
 ])
 
 # Prerequisites of lib/strcasecmp.c.
 AC_DEFUN([gl_PREREQ_STRCASECMP], [
-  gl_FUNC_MBRTOWC
+  AC_REQUIRE([gl_FUNC_MBRTOWC])
+  :
 ])
 
 # Prerequisites of lib/strncasecmp.c.