.

[gnulib.git] / m4 / regex.m4

diff --git a/m4/regex.m4 b/m4/regex.m4
index c8194b2..0017507 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,11 +1,11 @@
-#serial 7
+#serial 12
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
 
 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.
@@ -28,10 +28,9 @@ AC_DEFUN(jm_INCLUDED_REGEX,
          {
            static struct re_pattern_buffer regex;
            const char *s;
+           struct re_registers regs;
            re_set_syntax (RE_SYNTAX_POSIX_EGREP);
-           /* Add this third left square bracket, [, to balance the
-              three right ones below.  Otherwise autoconf-2.14 chokes.  */
-           s = re_compile_pattern ("a[[:]:]]b\n", 9, &regex);
+           [s = re_compile_pattern ("a[[:@:>@:]]b\n", 9, &regex);]
            /* This should fail with _Invalid character class name_ error.  */
            if (!s)
              exit (1);
@@ -39,7 +38,20 @@ AC_DEFUN(jm_INCLUDED_REGEX,
            /* This should succeed, but doesn't for e.g. glibc-2.1.3.  */
            s = re_compile_pattern ("{1", 2, &regex);
 
-           exit (s ? 1 : 0);
+           if (s)
+             exit (1);
+
+           /* 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);
+           if (s)
+             exit (1);
+
+           /* This should match, but doesn't for e.g. glibc-2.2.1.  */
+           if (re_match (&regex, "an", 2, 0, &regs) != 2)
+             exit (1);
+
+           exit (0);
          }
        ],
               jm_cv_func_working_re_compile_pattern=yes,
@@ -51,10 +63,9 @@ AC_DEFUN(jm_INCLUDED_REGEX,
     fi
 
     test -n "$1" || AC_MSG_ERROR([missing argument])
-    syscmd([test -f $1])
-    ifelse(sysval, 0,
+    m4_syscmd([test -f $1])
+    ifelse(m4_sysval, 0,
       [
-
        AC_ARG_WITH(included-regex,
        [  --without-included-regex don't compile regex; this is the default on
                           systems with version 2 of the GNU C library
@@ -62,8 +73,7 @@ AC_DEFUN(jm_INCLUDED_REGEX,
                    jm_with_regex=$withval,
                    jm_with_regex=$ac_use_included_regex)
        if test "$jm_with_regex" = yes; then
-         AC_SUBST(LIBOBJS)
-         LIBOBJS="$LIBOBJS regex.$ac_objext"
+         AC_LIBOBJ(regex)
        fi
       ],
     )