X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frpmatch.m4;h=a8d0f10f251a425bea1a59a2d3c9341fbeb97eaa;hb=a3a87d2cbbd9c22ccc9d722b6d950f8bc62f3185;hp=21c28274c55916e9b5fbf82707b787e2952db73a;hpb=552a680fa612218b68d4ef2f49bc276b95f6677b;p=gnulib.git

diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4
index 21c28274c..a8d0f10f2 100644
--- a/m4/rpmatch.m4
+++ b/m4/rpmatch.m4
@@ -1,21 +1,32 @@
-# rpmatch.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.
+# rpmatch.m4 serial 9
+dnl Copyright (C) 2002-2003, 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.
 
 AC_DEFUN([gl_FUNC_RPMATCH],
 [
-  AC_REPLACE_FUNCS(rpmatch)
+  dnl Persuade glibc <stdlib.h> to declare rpmatch().
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REPLACE_FUNCS([rpmatch])
   if test $ac_cv_func_rpmatch = no; then
+    HAVE_RPMATCH=0
     gl_PREREQ_RPMATCH
   fi
 ])
 
 # Prerequisites of lib/rpmatch.c.
 AC_DEFUN([gl_PREREQ_RPMATCH], [
-  AC_REQUIRE([AC_HEADER_STDC])
+  AC_CACHE_CHECK([for nl_langinfo and YESEXPR], [gl_cv_langinfo_yesexpr],
+    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
+       [[char* cs = nl_langinfo(YESEXPR); return !cs;]])],
+       [gl_cv_langinfo_yesexpr=yes],
+       [gl_cv_langinfo_yesexpr=no])
+    ])
+  if test $gl_cv_langinfo_yesexpr = yes; then
+    AC_DEFINE([HAVE_LANGINFO_YESEXPR], [1],
+      [Define if you have <langinfo.h> and nl_langinfo(YESEXPR).])
+  fi
 ])
-