Use the newest regex module from gnulib.

4 files changed, 7 insertions, 160 deletions

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 4d764f3..b331d0e 100644
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-24  Bruno Haible  <bruno@clisp.org>
+
+	Use the newest regex module from gnulib.
+	* libgrep.m4: Remove file.
+	* regex.m4: Remove file.
+	* Makefile.am (EXTRA_DIST): Remove them.
+
 2010-05-23  Bruno Haible  <bruno@clisp.org>
 
 	Do regex matching purely with regex, not regex + dfa + kwset.
diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index a7cb7e2..b994ae5 100644
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -48,7 +48,5 @@ examplesbuildaux_DATA = \
 EXTRA_DIST = README csharpexec-test.exe \
 exported.m4 \
 hostname.m4 \
-libgrep.m4 \
-regex.m4 \
 setlocale.m4 \
 siginfo.m4
diff --git a/gettext-tools/m4/libgrep.m4 b/gettext-tools/m4/libgrep.m4
deleted file mode 100644
index 27ea405..0000000
--- a/gettext-tools/m4/libgrep.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-# libgrep.m4 serial 5 (gettext-0.18.1)
-dnl Copyright (C) 2005-2006, 2008-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gt_LIBGREP],
-[
-  AC_REQUIRE([AM_STDBOOL_H])
-  AC_REQUIRE([AC_FUNC_MBRTOWC])
-  AC_CHECK_FUNC([wcscoll], ,
-    [AC_DEFINE([wcscoll], [wcscmp],
-       [Define to wcscmp if the function wcscoll does not exist.])])
-  m4_pushdef([AC_LIBOBJ], m4_defn([gt_LIBGREP_OBJ]))
-  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gt_LIBGREP_REPLACE_FUNCS]))
-  gl_FUNC_MEMCHR
-  gl_INCLUDED_REGEX([libgrep/regex.c])
-  m4_popdef([AC_REPLACE_FUNCS])
-  m4_popdef([AC_LIBOBJ])
-  AC_SUBST([LIBGREPOBJS])
-])
-
-# Like AC_LIBOBJ, except that the module name goes into LIBGREPOBJS
-# instead of into LIBOBJS.
-AC_DEFUN([gt_LIBGREP_OBJ],
-  [LIBGREPOBJS="$LIBGREPOBJS $1.$ac_objext"])
-
-# Like AC_REPLACE_FUNCS, except that the module name goes into LIBGREPOBJS
-# instead of into LIBOBJS.
-AC_DEFUN([gt_LIBGREP_REPLACE_FUNCS],
-  [AC_CHECK_FUNCS([$1], , [gt_LIBGREP_OBJ($ac_func)])])
diff --git a/gettext-tools/m4/regex.m4 b/gettext-tools/m4/regex.m4
deleted file mode 100644
index 7c2a68a..0000000
--- a/gettext-tools/m4/regex.m4
+++ /dev/null
@@ -1,127 +0,0 @@
-#serial 24
-
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006 Free
-dnl Software Foundation, Inc.
-dnl
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Initially derived from code in GNU grep.
-dnl Mostly written by Jim Meyering.
-
-AC_DEFUN([gl_REGEX],
-[
-  gl_INCLUDED_REGEX([lib/regex.c])
-])
-
-dnl Usage: gl_INCLUDED_REGEX([lib/regex.c])
-dnl
-AC_DEFUN([gl_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.
-
-    # 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 <stdlib.h>
-#include <string.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);
-            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)
-              exit (1);
-
-            /* The following example is derived from a problem report
-               against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>.  */
-            memset (&regex, 0, sizeof (regex));
-            s = re_compile_pattern ("[[an\371]]*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);
-
-            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);
-          }
-        ],
-               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)
-          gl_PREREQ_REGEX
-        fi
-      ],
-    )
-  ]
-)
-
-# Prerequisites of lib/regex.c.
-AC_DEFUN([gl_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([AC_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)
-])