X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrstr.m4;h=a785d42866b1960b99e7d95bc7418d8719abb2e2;hb=cc3145bc3a0324d93fc8a9b7b7dcf5ea9f901b1e;hp=20c2c0a46543549988ebe8692afa67db392f35bf;hpb=57a1c06115f3e74f70b18301b66b15ad34ecafcf;p=gnulib.git

diff --git a/m4/strstr.m4 b/m4/strstr.m4
index 20c2c0a46..a785d4286 100644
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -1,18 +1,19 @@
-# strstr.m4 serial 2
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# strstr.m4 serial 5
+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)
+  gl_PREREQ_STRSTR
 ])
 
 # Prerequisites of lib/strstr.c.
-AC_DEFUN([gl_PREREQ_STRSTR], [:])
+AC_DEFUN([gl_PREREQ_STRSTR], [
+  AC_REQUIRE([gl_FUNC_MBRTOWC])
+  :
+])