X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fmemrchr.m4;h=57ed978a29f22744c175d2187f3b7aa9c6feaed6;hb=a731808a4ac512228e870d5f443b91557f418559;hp=e2406ec8990d0d2bc8a837c5b4cd21e2973e0946;hpb=7674ff50b75693ecf089e874652f50ea95ed8d51;p=gnulib.git

diff --git a/m4/memrchr.m4 b/m4/memrchr.m4
index e2406ec89..57ed978a2 100644
--- a/m4/memrchr.m4
+++ b/m4/memrchr.m4
@@ -1,19 +1,22 @@
-# memrchr.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# memrchr.m4 serial 9
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software Foundation,
+dnl 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_MEMRCHR],
 [
-  AC_LIBSOURCES([memrchr.c, memrchr.h])
-
   dnl Persuade glibc <string.h> to declare memrchr().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_CHECK_DECLS_ONCE([memrchr])
+  if test $ac_cv_have_decl_memrchr = no; then
+    HAVE_DECL_MEMRCHR=0
+  fi
 
-  AC_REPLACE_FUNCS(memrchr)
+  AC_REPLACE_FUNCS([memrchr])
   if test $ac_cv_func_memrchr = no; then
     gl_PREREQ_MEMRCHR
   fi