[Cvs-cvs] Changes to ccvs/m4/strstr.m4

[Derek Robert Price]

Index: ccvs/m4/strstr.m4
diff -u ccvs/m4/strstr.m4:1.1 ccvs/m4/strstr.m4:1.2
--- ccvs/m4/strstr.m4:1.1       Tue Mar  1 18:15:07 2005
+++ ccvs/m4/strstr.m4   Sun Sep  4 05:58:36 2005
@@ -1,16 +1,19 @@
-# strstr.m4 serial 2
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+# strstr.m4 serial 3
+dnl Copyright (C) 2002-2003, 2005 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.
 
 AC_DEFUN([gl_FUNC_STRSTR],
 [
-  AC_REPLACE_FUNCS(strstr)
-  if test $ac_cv_func_strstr = no; then
-    gl_PREREQ_STRSTR
-  fi
+  dnl No known system has a strstr() function that works correctly in
+  dnl multibyte locales. Therefore we use our version always.
+  AC_LIBOBJ(strstr)
+  AC_DEFINE(strstr, rpl_strstr, [Define to rpl_strstr always.])
+  gl_PREREQ_STRSTR
 ])
 
 # Prerequisites of lib/strstr.c.
-AC_DEFUN([gl_PREREQ_STRSTR], [:])
+AC_DEFUN([gl_PREREQ_STRSTR], [
+  gl_FUNC_MBRTOWC
+])