X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fregex.m4;h=0017507edf03ecd43cbbae382ba785f0078b2dd7;hb=124beb935218646436aeb43403386a609bf1a024;hp=bf4d194893df3602c3e58cf94b2c1a7ce83b9b2d;hpb=314e039c9ae5fc59c90e1158bd1a12e2ad7bc2ce;p=gnulib.git

diff --git a/m4/regex.m4 b/m4/regex.m4
index bf4d19489..0017507ed 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,31 +1,81 @@
-#serial 1
+#serial 12
 
-dnl From grep.
+dnl Initially derived from code in GNU grep.
+dnl Mostly written by Jim Meyering.
 
-AC_DEFUN(jm_WITH_REGEX,
+dnl Usage: jm_INCLUDED_REGEX([lib/regex.c])
+dnl
+AC_DEFUN([jm_INCLUDED_REGEX],
   [
-    AC_ARG_WITH(included-regex,
-		[  --without-included-regex don't compile regex],
-		USE_REGEX=$withval,
-		USE_REGEX=yes)
-
-    if test "$USE_REGEX" = yes; then
-
-      LIBOBJS="$LIBOBJS regex.o"
-
-    else
-      if test x = y; then
-	# This code is deliberately never run via ./configure.
-	# FIXME: this is a hack to make autoheader put the corresponding
-	# HAVE_* undef for this symbol in config.h.in.  This saves me the
-	# trouble of having to maintain the #undef in acconfig.h manually.
-	AC_CHECK_FUNCS(LIBC_REGEX)
-      fi
-      # Defining it this way (rather than via AC_DEFINE) short-circuits the
-      # autoheader check -- autoheader doesn't know it's already been taken
-      # care of by the hack above.
-      ac_kludge=HAVE_LIBC_REGEX
-      AC_DEFINE_UNQUOTED($ac_kludge)
+    dnl Even packages that don't use regex.c can use this macro.
+    dnl Of course, for them it doesn't do anything.
+
+    # Assume we'll default to using the included regex.c.
+    ac_use_included_regex=yes
+
+    # 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 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(
+[#include <stdio.h>
+#include <regex.h>
+	  int
+	  main ()
+	  {
+	    static struct re_pattern_buffer regex;
+	    const char *s;
+	    struct re_registers regs;
+	    re_set_syntax (RE_SYNTAX_POSIX_EGREP);
+	    [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.  */
+	    s = re_compile_pattern ("{1", 2, &regex);
+
+	    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,
+	       jm_cv_func_working_re_compile_pattern=no,
+	       dnl When crosscompiling, assume it's broken.
+	       jm_cv_func_working_re_compile_pattern=no))
+    if test $jm_cv_func_working_re_compile_pattern = yes; then
+      ac_use_included_regex=no
     fi
+
+    test -n "$1" || AC_MSG_ERROR([missing argument])
+    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
+                          (use with caution on other system)],
+		    jm_with_regex=$withval,
+		    jm_with_regex=$ac_use_included_regex)
+	if test "$jm_with_regex" = yes; then
+	  AC_LIBOBJ(regex)
+	fi
+      ],
+    )
   ]
 )