X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=m4%2Frpmatch.m4;h=c6222ae5d6f66256e9345405235469dbdf9a435e;hb=HEAD;hp=e4c986d8ecc6bb2df88cb0bc9b5d4dfce3a98ec9;hpb=c286dbf484dc985fb63d5c677fc8cd91b5b1d0f6;p=tar diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4 index e4c986d..c6222ae 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 9 +dnl Copyright (C) 2002-2003, 2007-2010 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,7 +10,7 @@ AC_DEFUN([gl_FUNC_RPMATCH], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REPLACE_FUNCS(rpmatch) + AC_REPLACE_FUNCS([rpmatch]) if test $ac_cv_func_rpmatch = no; then HAVE_RPMATCH=0 gl_PREREQ_RPMATCH @@ -19,14 +19,14 @@ AC_DEFUN([gl_FUNC_RPMATCH], # 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 ], - [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 ]], + [[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 and nl_langinfo(YESEXPR).]) fi ])