X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fregex.m4;h=c8194b2147c5dfa3d3cafa8a43fce40edf5f9826;hb=d5cb2b575ebfd62dd3a52ab3398fe4b1eae03aed;hp=3047d4d4970aad1bbfb49f8d875a4ba821800b78;hpb=a24cd80cd36f4de9693248ffa746638f1a15bb4c;p=gnulib.git

diff --git a/m4/regex.m4 b/m4/regex.m4
index 3047d4d49..c8194b214 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 5
+#serial 7
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
@@ -16,14 +16,12 @@ AC_DEFUN(jm_INCLUDED_REGEX,
     # However, if the system regex support is good enough that it passes the
     # the following run test, then default to *not* using the included regex.c.
     # If cross compiling, assume the test would fail and use the included
-    # regex.c.  The failing regular expression is from `Spencer ere test #75'
-    # in grep-2.3.
+    # regex.c.  The first failing regular expression is from `Spencer ere
+    # test #75' in grep-2.3.
     AC_CACHE_CHECK([for working re_compile_pattern],
 		   jm_cv_func_working_re_compile_pattern,
       AC_TRY_RUN(
-	changequote(<<, >>)dnl
-	<<
-#include <stdio.h>
+[#include <stdio.h>
 #include <regex.h>
 	  int
 	  main ()
@@ -35,11 +33,15 @@ AC_DEFUN(jm_INCLUDED_REGEX,
 	       three right ones below.  Otherwise autoconf-2.14 chokes.  */
 	    s = re_compile_pattern ("a[[:]:]]b\n", 9, &regex);
 	    /* This should fail with _Invalid character class name_ error.  */
-	    exit (s ? 0 : 1);
-	  }
-	>>,
-	changequote([, ])dnl
+	    if (!s)
+	      exit (1);
+
+	    /* This should succeed, but doesn't for e.g. glibc-2.1.3.  */
+	    s = re_compile_pattern ("{1", 2, &regex);
 
+	    exit (s ? 1 : 0);
+	  }
+	],
 	       jm_cv_func_working_re_compile_pattern=yes,
 	       jm_cv_func_working_re_compile_pattern=no,
 	       dnl When crosscompiling, assume it's broken.