X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fregex.m4;h=696fce1ee4eb67f6537f14ef3d0c0cf8266145ff;hb=31d4ee218ba9dabe654a9fbf53a72e5bf203b0dc;hp=24355ac6904d59f2b514845e6375c8b51f438390;hpb=9e354723fe5d79e233806db16a12d957d9e9d06f;p=gnulib.git

diff --git a/m4/regex.m4 b/m4/regex.m4
index 24355ac69..696fce1ee 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,16 +1,16 @@
-#serial 17
+#serial 21
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
 
 AC_DEFUN([gl_REGEX],
 [
-  jm_INCLUDED_REGEX([lib/regex.c])
+  gl_INCLUDED_REGEX([lib/regex.c])
 ])
 
-dnl Usage: jm_INCLUDED_REGEX([lib/regex.c])
+dnl Usage: gl_INCLUDED_REGEX([lib/regex.c])
 dnl
-AC_DEFUN([jm_INCLUDED_REGEX],
+AC_DEFUN([gl_INCLUDED_REGEX],
   [
     dnl Even packages that don't use regex.c can use this macro.
     dnl Of course, for them it doesn't do anything.
@@ -52,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\201]]*n", 7, &regex);
+	    s = re_compile_pattern ("[[an\371]]*n", 7, &regex);
 	    if (s)
 	      exit (1);
 
@@ -93,7 +93,7 @@ AC_DEFUN([jm_INCLUDED_REGEX],
 		    jm_with_regex=$ac_use_included_regex)
 	if test "$jm_with_regex" = yes; then
 	  AC_LIBOBJ(regex)
-	  jm_PREREQ_REGEX
+	  gl_PREREQ_REGEX
 	fi
       ],
     )
@@ -101,7 +101,7 @@ AC_DEFUN([jm_INCLUDED_REGEX],
 )
 
 # Prerequisites of lib/regex.c.
-AC_DEFUN([jm_PREREQ_REGEX],
+AC_DEFUN([gl_PREREQ_REGEX],
 [
   dnl FIXME: Maybe provide a btowc replacement someday: Solaris 2.5.1 lacks it.
   dnl FIXME: Check for wctype and iswctype, and and add -lw if necessary
@@ -110,9 +110,10 @@ AC_DEFUN([jm_PREREQ_REGEX],
   dnl Persuade glibc <string.h> to declare mempcpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  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)
+  AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
   AC_CHECK_FUNCS_ONCE(isascii mempcpy)
   AC_CHECK_FUNCS(btowc)
 ])