X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frpmatch.m4;h=9a8d29b04d480ffb4dafe70460cc8e3900a01008;hb=791cc509ac459a2555f8d633ad67455cf8d3fe4d;hp=e0f36a3d40f39d741c3f830c2730fac306748935;hpb=cdf60d1ad704f2d17ca677af9dc093e7a81bd28e;p=gnulib.git

diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4
index e0f36a3d4..9a8d29b04 100644
--- a/m4/rpmatch.m4
+++ b/m4/rpmatch.m4
@@ -1,27 +1,32 @@
-# rpmatch.m4 serial 6
-dnl Copyright (C) 2002-2003, 2007-2008 Free Software Foundation, Inc.
+# rpmatch.m4 serial 9
+dnl Copyright (C) 2002-2003, 2007-2009 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_CACHE_CHECK([for nl_langinfo and YESEXPR], gl_cv_langinfo_yesexpr,
-    [AC_TRY_LINK([#include <langinfo.h>],
-       [char* cs = nl_langinfo(YESEXPR); return !cs;],
+  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,
+    AC_DEFINE([HAVE_LANGINFO_YESEXPR], [1],
       [Define if you have <langinfo.h> and nl_langinfo(YESEXPR).])
   fi
 ])