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

[pspp] / m4 / strstr.m4

diff --git a/m4/strstr.m4 b/m4/strstr.m4
index aea809ebd15b1512e792daaf09d04cb2dc66cacb..3639131c71618f1821b86d6933c2177c7b696e96 100644 (file)
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -1,4 +1,4 @@
-# strstr.m4 serial 4
+# 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,
@@ -10,9 +10,11 @@ AC_DEFUN([gl_FUNC_STRSTR],
   dnl multibyte locales. Therefore we use our version always.
   AC_LIBOBJ(strstr)
   gl_PREREQ_STRSTR
+  REPLACE_STRSTR=1
 ])
 
 # Prerequisites of lib/strstr.c.
 AC_DEFUN([gl_PREREQ_STRSTR], [
-  gl_FUNC_MBRTOWC
+  AC_REQUIRE([gl_FUNC_MBRTOWC])
+  :
 ])