From: Jim Meyering <jim@meyering.net>
Date: Thu, 7 Aug 2003 09:12:15 +0000 (+0000)
Subject: Merge with gnulib.
X-Git-Tag: CPPI-1_11~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e38f0569b3119ebe9e06a7a8f07c1d3a4645c388;p=thirdparty%2Fcoreutils.git

Merge with gnulib.
(gl_REGEX): New macro.
(jm_INCLUDED_REGEX): Don't assume Latin-1 encoding of source code.
---

diff --git a/m4/regex.m4 b/m4/regex.m4
index b01125da2c..41c3c8705e 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,8 +1,13 @@
-#serial 15
+#serial 17
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
 
+AC_DEFUN([gl_REGEX],
+[
+  jm_INCLUDED_REGEX([lib/regex.c])
+])
+
 dnl Usage: jm_INCLUDED_REGEX([lib/regex.c])
 dnl
 AC_DEFUN([jm_INCLUDED_REGEX],
@@ -47,7 +52,7 @@ AC_DEFUN([jm_INCLUDED_REGEX],
 	    /* The following example is derived from a problem report
                against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>.  */
 	    memset (&regex, 0, sizeof (regex));
-	    s = re_compile_pattern ("[[anù]]*n", 7, &regex);
+	    s = re_compile_pattern ("[[an\371]]*n", 7, &regex);
 	    if (s)
 	      exit (1);
 
@@ -105,7 +110,7 @@ AC_DEFUN([jm_PREREQ_REGEX],
   dnl Persuade glibc <string.h> to declare mempcpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
-  AC_REQUIRE([ACX_C_RESTRICT])
+  AC_REQUIRE([gl_C_RESTRICT])
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS_ONCE(limits.h string.h wchar.h wctype.h)