--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-09  Bruno Haible  <bruno@clisp.org>
+
+	* doc/functions/memmem.texi: Use the same structure as snprintf.texi
+	and other files.
+	* m4/memmem.m4 (gl_FUNC_MEMMEM): Say "guessing no" instead of "no"
+	if it's only a guess.
+	* modules/memmem: Simplify by depending on memmem-simple.
+
 2008-01-09  Bruno Haible  <bruno@clisp.org>
 
 	Work around OpenBSD 4.0 tdelete() bug.

--- a/doc/functions/memmem.texi
+++ b/doc/functions/memmem.texi
@@ -4,27 +4,31 @@
 
 Unspecified by POSIX, but comparable to @code{strstr}.
 
-Gnulib module: memmem, memmem-simple
+Gnulib module: memmem or memmem-simple
 
-Portability problems fixed by Gnulib:
+Portability problems fixed by either Gnulib module @code{memmem-simple}
+or @code{memmem}:
 @itemize
 @item
+This function is missing on some platforms:
+Mingw, OpenBSD 4.0
+
+@item
 This function has reversed arguments on some older platforms:
 Linux libc 5.0.9
+@end itemize
 
+Portability problems fixed by Gnulib module @code{memmem}:
+@itemize
 @item
 This function returns incorrect values in some cases, such as when
-given an empty needle (not fixed in memmem-simple):
+given an empty needle:
 glibc <= 2.0, cygwin 1.5.x
 
 @item
 This function has quadratic instead of linear complexity on some
-platforms (not fixed in memmem-simple):
+platforms:
 glibc <= 2.6.1, cygwin 1.5.x
-
-@item
-This function is missing on some platforms:
-Mingw, OpenBSD 4.0
 @end itemize
 
 Portability problems not fixed by Gnulib:

--- a/m4/memmem.m4
+++ b/m4/memmem.m4
@@ -1,4 +1,4 @@
-# memmem.m4 serial 8
+# memmem.m4 serial 9
 dnl Copyright (C) 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -51,8 +51,8 @@
 	[gl_cv_func_memmem_works=yes], [gl_cv_func_memmem_works=no],
 	[dnl pessimistically assume the worst, since even glibc 2.6.1
 	 dnl has quadratic complexity in its memmem
-	 gl_cv_func_memmem_works=no])])
-    if test $gl_cv_func_memmem_works = no; then
+	 gl_cv_func_memmem_works="guessing no"])])
+    if test "$gl_cv_func_memmem_works" != yes; then
       REPLACE_MEMMEM=1
       AC_LIBOBJ([memmem])
     fi

--- a/modules/memmem
+++ b/modules/memmem
@@ -2,19 +2,12 @@
 memmem() function: efficiently locate first substring in a buffer.
 
 Files:
-lib/memmem.c
-m4/memmem.m4
 
 Depends-on:
-extensions
-string
-stdint
-memchr
-memcmp
+memmem-simple
 
 configure.ac:
 gl_FUNC_MEMMEM
-gl_STRING_MODULE_INDICATOR([memmem])
 
 Makefile.am: