X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmemmem.m4;h=e912205cd033acd3cfb99d56a81f783313086095;hb=b398592c340a33c50703310c3df0d50ed777fe0d;hp=0ad18e1619797c25c773b0fbf397099049473ecd;hpb=c96bccbbaa28b6888e487ff86c8b43bd594d2de4;p=gnulib.git

diff --git a/m4/memmem.m4 b/m4/memmem.m4
index 0ad18e161..e912205cd 100644
--- a/m4/memmem.m4
+++ b/m4/memmem.m4
@@ -1,6 +1,5 @@
-# memmem.m4 serial 21
-dnl Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009, 2010 Free Software
-dnl Foundation, Inc.
+# memmem.m4 serial 23
+dnl Copyright (C) 2002-2004, 2007-2011 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.
@@ -12,7 +11,12 @@ AC_DEFUN([gl_FUNC_MEMMEM_SIMPLE],
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-  AC_REPLACE_FUNCS([memmem])
+  AC_CHECK_FUNCS([memmem])
+  if test $ac_cv_func_memmem = yes; then
+    HAVE_MEMMEM=1
+  else
+    HAVE_MEMMEM=0
+  fi
   AC_CHECK_DECLS_ONCE([memmem])
   if test $ac_cv_have_decl_memmem = no; then
     HAVE_DECL_MEMMEM=0
@@ -32,16 +36,16 @@ AC_DEFUN([gl_FUNC_MEMMEM_SIMPLE],
       result |= 1;
     /* Check for empty needle behavior.  */
     {
-      char* haystack="AAA";
-      if (memmem (haystack, 3, 0, 0) != haystack)
+      const char *haystack = "AAA";
+      if (memmem (haystack, 3, NULL, 0) != haystack)
         result |= 2;
     }
     return result;
     ]])],
         [gl_cv_func_memmem_works_always=yes],
         [gl_cv_func_memmem_works_always=no],
-        [dnl glibc 2.12 and cygwin 1.7.7 have issue #12092 above.
-         dnl Also empty needles work on glibc >= 2.1 and cygwin >= 1.7.0
+        [dnl glibc 2.9..2.12 and cygwin 1.7.7 have issue #12092 above.
+         dnl Also empty needles work on glibc >= 2.1 and cygwin >= 1.7.0.
          dnl uClibc is not affected, since it uses different source code.
          dnl Assume that it works on all other platforms (even if not linear).
          AC_EGREP_CPP([Lucky user],
@@ -50,7 +54,8 @@ AC_DEFUN([gl_FUNC_MEMMEM_SIMPLE],
  #include <features.h>
  #if ((__GLIBC__ == 2 && ((__GLIBC_MINOR > 0 && __GLIBC_MINOR__ < 9) \
                           || __GLIBC_MINOR__ > 12)) \
-     || (__GLIBC__ > 2)) || defined __UCLIBC__
+      || (__GLIBC__ > 2)) \
+     || defined __UCLIBC__
   Lucky user
  #endif
 #elif defined __CYGWIN__
@@ -68,7 +73,6 @@ AC_DEFUN([gl_FUNC_MEMMEM_SIMPLE],
       ])
     if test "$gl_cv_func_memmem_works_always" != yes; then
       REPLACE_MEMMEM=1
-      AC_LIBOBJ([memmem])
     fi
   fi
   gl_PREREQ_MEMMEM
@@ -133,7 +137,6 @@ static void quit (int sig) { exit (sig + 128); }
       ])
     if test "$gl_cv_func_memmem_works_fast" != yes; then
       REPLACE_MEMMEM=1
-      AC_LIBOBJ([memmem])
     fi
   fi
 ]) # gl_FUNC_MEMMEM