diff options
| author | Jim Meyering <jim@meyering.net> | 2003-08-07 09:12:15 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-08-07 09:12:15 +0000 |
| commit | e38f0569b3119ebe9e06a7a8f07c1d3a4645c388 (patch) | |
| tree | 4421850bbfbbcf883ccd4de1a8a26e728e320a82 | |
| parent | 5340feef74f3c119966de8ec3ce921dc4724d9b0 (diff) | |
| download | coreutils-e38f0569b3119ebe9e06a7a8f07c1d3a4645c388.tar.xz | |
Merge with gnulib.
(gl_REGEX): New macro.
(jm_INCLUDED_REGEX): Don't assume Latin-1 encoding of source code.
| -rw-r--r-- | m4/regex.m4 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/m4/regex.m4 b/m4/regex.m4 index b01125da2..41c3c8705 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,8 +1,13 @@ -#serial 15 +#serial 17 dnl Initially derived from code in GNU grep. dnl Mostly written by Jim Meyering. +AC_DEFUN([gl_REGEX], +[ + jm_INCLUDED_REGEX([lib/regex.c]) +]) + dnl Usage: jm_INCLUDED_REGEX([lib/regex.c]) dnl AC_DEFUN([jm_INCLUDED_REGEX], @@ -47,7 +52,7 @@ AC_DEFUN([jm_INCLUDED_REGEX], /* The following example is derived from a problem report against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>. */ memset (®ex, 0, sizeof (regex)); - s = re_compile_pattern ("[[anù]]*n", 7, ®ex); + s = re_compile_pattern ("[[an\371]]*n", 7, ®ex); if (s) exit (1); @@ -105,7 +110,7 @@ AC_DEFUN([jm_PREREQ_REGEX], dnl Persuade glibc <string.h> to declare mempcpy(). AC_REQUIRE([AC_GNU_SOURCE]) - AC_REQUIRE([ACX_C_RESTRICT]) + AC_REQUIRE([gl_C_RESTRICT]) AC_REQUIRE([AC_FUNC_ALLOCA]) AC_REQUIRE([AC_HEADER_STDC]) AC_CHECK_HEADERS_ONCE(limits.h string.h wchar.h wctype.h) |