Imported Upstream version 1.21

[tar] / m4 / regex.m4

diff --git a/m4/regex.m4 b/m4/regex.m4
index 4879bd875dd795ff3696bb8b518a78ddf945858d..38fb7ba39940aa3fa0bcef71d55868a3d0ed85b6 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 49
+#serial 52
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
 # 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -17,7 +17,7 @@ AC_DEFUN([gl_REGEX],
   AC_CHECK_HEADERS_ONCE([locale.h])
 
   AC_ARG_WITH([included-regex],
-    [AC_HELP_STRING([--without-included-regex],
+    [AS_HELP_STRING([--without-included-regex],
                    [don't compile regex; this is the default on 32-bit
                     systems with recent-enough versions of the GNU C
                     Library (use with caution on other systems).
@@ -37,13 +37,13 @@ AC_DEFUN([gl_REGEX],
                   [gl_cv_func_re_compile_pattern_working],
       [AC_RUN_IFELSE(
        [AC_LANG_PROGRAM(
-         [AC_INCLUDES_DEFAULT
+         [AC_INCLUDES_DEFAULT[
           #if HAVE_LOCALE_H
            #include <locale.h>
           #endif
           #include <limits.h>
           #include <regex.h>
-          ],
+          ]],
          [[static struct re_pattern_buffer regex;
            unsigned char folded_chars[UCHAR_MAX + 1];
            int i;
@@ -218,6 +218,7 @@ AC_DEFUN([gl_PREREQ_REGEX],
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  AC_CHECK_HEADERS([libintl.h])
   AC_CHECK_FUNCS_ONCE([isblank iswctype mbrtowc wcrtomb wcscoll])
   AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
 ])