* regex.m4 (gl_REGEX): Don't insist on REG_SYNTAX_POSIX_EGREP,

REG_SYNTAX_EMACS, and REG_IGNORE_CASE.  Settle for the traditional
glibc names.  Even if glibc is changed to conform to POSIX, the
traditional names will be available anyway, since regex depends on
the extensions module.  Problem reported by Emanuele Giaquinta.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index e83446ea048a4f3ddd98b30e00ab7dccb9ef2dea..47eae8461c9eb07e2f91cba19ace9bc491b6ee70 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * regex.m4 (gl_REGEX): Don't insist on REG_SYNTAX_POSIX_EGREP,
+       REG_SYNTAX_EMACS, and REG_IGNORE_CASE.  Settle for the traditional
+       glibc names.  Even if glibc is changed to conform to POSIX, the
+       traditional names will be available anyway, since regex depends on
+       the extensions module.  Problem reported by Emanuele Giaquinta.
+
 2006-03-17  Jim Meyering  <jim@meyering.net>
 
        * regex.m4 (gl_REGEX): Fix typo in last change:

diff --git a/m4/regex.m4 b/m4/regex.m4
index f8d5339f5e8c24a1f5e1b39360d6240aa3cb346a..d59df38dd8cfad11df1cac473fc71007e341c7a1 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 33
+#serial 34
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
 # 2006 Free Software Foundation, Inc.
@@ -42,10 +42,7 @@ AC_DEFUN([gl_REGEX],
          [[static struct re_pattern_buffer regex;
            const char *s;
            struct re_registers regs;
-           /* Use the POSIX-compliant spelling with leading REG_,
-              rather than the traditional GNU spelling with leading RE_,
-              so that we reject older libc implementations.  */
-           re_set_syntax (REG_SYNTAX_POSIX_EGREP);
+           re_set_syntax (RE_SYNTAX_POSIX_EGREP);
            memset (&regex, 0, sizeof (regex));
            s = re_compile_pattern ("a[:@:>@:]b\n", 9, &regex);
            /* This should fail with _Invalid character class name_ error.  */
@@ -81,10 +78,9 @@ AC_DEFUN([gl_REGEX],
              exit (1);
 
            /* The version of regex.c in older versions of gnulib
-              ignored REG_IGNORE_CASE (which was then called RE_ICASE).
-              Detect that problem too.  */
+              ignored RE_ICASE.  Detect that problem too.  */
            memset (&regex, 0, sizeof (regex));
-           re_set_syntax (REG_SYNTAX_EMACS | REG_IGNORE_CASE);
+           re_set_syntax (RE_SYNTAX_EMACS | RE_ICASE);
            s = re_compile_pattern ("x", 1, &regex);
            if (s)
              exit (1);