X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frpmatch.m4;h=4edc46651452508342177b7e5bac342d5a74d4fa;hb=6b24f60dad0f97704ae07d9688de7f31c1923bf7;hp=e4c986d8ecc6bb2df88cb0bc9b5d4dfce3a98ec9;hpb=b52ae09f3a74d02e4f203c4b7703416d3b3b5461;p=gnulib.git

diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4
index e4c986d8e..4edc46651 100644
--- a/m4/rpmatch.m4
+++ b/m4/rpmatch.m4
@@ -1,5 +1,5 @@
-# rpmatch.m4 serial 7
-dnl Copyright (C) 2002-2003, 2007-2008 Free Software Foundation, Inc.
+# rpmatch.m4 serial 10
+dnl Copyright (C) 2002-2003, 2007-2013 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.
@@ -10,23 +10,22 @@ AC_DEFUN([gl_FUNC_RPMATCH],
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REPLACE_FUNCS(rpmatch)
+  AC_CHECK_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
 ])