(jm_INCLUDED_REGEX): Change "\201" to "\371"; apparently Emacs's

[gnulib.git] / m4 / regex.m4

diff --git a/m4/regex.m4 b/m4/regex.m4
index a31ef2c..93efa3a 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 14
+#serial 19
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
@@ -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ù]]*n", 7, &regex);
+           s = re_compile_pattern ("[[an\371]]*n", 7, &regex);
            if (s)
              exit (1);
 
@@ -60,6 +60,16 @@ AC_DEFUN([jm_INCLUDED_REGEX],
            if (re_match (&regex, "an", 2, 0, &regs) != 2)
              exit (1);
 
+           memset (&regex, 0, sizeof (regex));
+           s = re_compile_pattern ("x", 1, &regex);
+           if (s)
+             exit (1);
+
+           /* The version of regex.c in e.g. GNU libc-2.2.93 didn't
+              work with a negative RANGE argument.  */
+           if (re_search (&regex, "wxy", 3, 2, -2, &regs) != 1)
+             exit (1);
+
            exit (0);
          }
        ],
@@ -93,13 +103,14 @@ AC_DEFUN([jm_INCLUDED_REGEX],
 # Prerequisites of lib/regex.c.
 AC_DEFUN([jm_PREREQ_REGEX],
 [
-  dnl FIXME: Maybe provide a btowc replacement someday: solaris-2.5.1 lacks it.
+  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
   dnl to get them.
 
   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)