X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmemrchr.m4;h=5dbe4d1e8a20b30743fd6d731498f0a5aa8d67d6;hb=refs%2Fheads%2Fmaster;hp=dfb0583acc2073e5edc34a1d98b1c6078ab9b13d;hpb=1a170a10473b1b72223fae27879fa19a31785ed1;p=gnulib.git

diff --git a/m4/memrchr.m4 b/m4/memrchr.m4
index dfb0583ac..5dbe4d1e8 100644
--- a/m4/memrchr.m4
+++ b/m4/memrchr.m4
@@ -1,20 +1,22 @@
-# memrchr.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.
+# memrchr.m4 serial 10
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 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],
 [
   dnl Persuade glibc <string.h> to declare memrchr().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  AC_REPLACE_FUNCS(memrchr)
-  if test $ac_cv_func_memrchr = no; then
-    gl_PREREQ_MEMRCHR
+  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_CHECK_FUNCS([memrchr])
 ])
 
 # Prerequisites of lib/memrchr.c.