X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fregex.m4;h=e04dd4a4fd779c69cabb3fbad9f8c5be9f463824;hb=30ffdfca0db8e3dede862ce911a200ecc1894fd5;hp=a79f03bcd73e2cad20a4deecd738efc518ab2a7b;hpb=f2aaef059b81506453205d7efc4b7e66b4876254;p=gnulib.git

diff --git a/m4/regex.m4 b/m4/regex.m4
index a79f03bcd..e04dd4a4f 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,11 +1,16 @@
-#serial 10
+#serial 20
 
 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,
+AC_DEFUN([jm_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.
@@ -22,6 +27,7 @@ AC_DEFUN(jm_INCLUDED_REGEX,
 		   jm_cv_func_working_re_compile_pattern,
       AC_TRY_RUN(
 [#include <stdio.h>
+#include <string.h>
 #include <regex.h>
 	  int
 	  main ()
@@ -30,15 +36,14 @@ AC_DEFUN(jm_INCLUDED_REGEX,
 	    const char *s;
 	    struct re_registers regs;
 	    re_set_syntax (RE_SYNTAX_POSIX_EGREP);
-	    /* These two brackets, '[[' and the one in the comment below serve
-	       to quote the brackets (unbalanced) in the following line.  */
-	    s = re_compile_pattern ("a[[:]:]]b\n", 9, &regex);
-	    /* This bracket ']' helps quote the unbalanced expression above.  */
+	    memset (&regex, 0, sizeof (regex));
+	    [s = re_compile_pattern ("a[[:@:>@:]]b\n", 9, &regex);]
 	    /* This should fail with _Invalid character class name_ error.  */
 	    if (!s)
 	      exit (1);
 
 	    /* This should succeed, but doesn't for e.g. glibc-2.1.3.  */
+	    memset (&regex, 0, sizeof (regex));
 	    s = re_compile_pattern ("{1", 2, &regex);
 
 	    if (s)
@@ -46,7 +51,8 @@ AC_DEFUN(jm_INCLUDED_REGEX,
 
 	    /* The following example is derived from a problem report
                against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>.  */
-	    s = re_compile_pattern ("[[anù]]*n", 7, &regex);
+	    memset (&regex, 0, sizeof (regex));
+	    s = re_compile_pattern ("[[an\371]]*n", 7, &regex);
 	    if (s)
 	      exit (1);
 
@@ -54,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);
 	  }
 	],
@@ -77,8 +93,27 @@ 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
 	fi
       ],
     )
   ]
 )
+
+# 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: 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(wchar.h wctype.h)
+  AC_CHECK_FUNCS_ONCE(isascii mempcpy)
+  AC_CHECK_FUNCS(btowc)
+])