-#serial 13
+#serial 22
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 Free
+# Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# 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],
[
- jm_INCLUDED_REGEX([lib/regex.c])
+ gl_INCLUDED_REGEX([lib/regex.c])
])
-dnl Usage: jm_INCLUDED_REGEX([lib/regex.c])
+dnl Usage: gl_INCLUDED_REGEX([lib/regex.c])
dnl
-AC_DEFUN([jm_INCLUDED_REGEX],
+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.
jm_cv_func_working_re_compile_pattern,
AC_TRY_RUN(
[#include <stdio.h>
+#include <string.h>
#include <regex.h>
int
main ()
const char *s;
struct re_registers regs;
re_set_syntax (RE_SYNTAX_POSIX_EGREP);
+ memset (®ex, 0, sizeof (regex));
[s = re_compile_pattern ("a[[:@:>@:]]b\n", 9, ®ex);]
/* 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 (®ex, 0, sizeof (regex));
s = re_compile_pattern ("{1", 2, ®ex);
if (s)
/* 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, ®ex);
+ memset (®ex, 0, sizeof (regex));
+ s = re_compile_pattern ("[[an\371]]*n", 7, ®ex);
if (s)
exit (1);
if (re_match (®ex, "an", 2, 0, ®s) != 2)
exit (1);
+ memset (®ex, 0, sizeof (regex));
+ s = re_compile_pattern ("x", 1, ®ex);
+ 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 (®ex, "wxy", 3, 2, -2, ®s) != 1)
+ exit (1);
+
exit (0);
}
],
jm_with_regex=$ac_use_included_regex)
if test "$jm_with_regex" = yes; then
AC_LIBOBJ(regex)
- jm_PREREQ_REGEX
+ gl_PREREQ_REGEX
fi
],
)
)
# Prerequisites of lib/regex.c.
-AC_DEFUN([jm_PREREQ_REGEX],
+AC_DEFUN([gl_PREREQ_REGEX],
[
- dnl FIXME: Maybe provide a btowc replacement someday: solaris-2.5.1 lacks it.
+ 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([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)
+ AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
AC_CHECK_FUNCS_ONCE(isascii mempcpy)
AC_CHECK_FUNCS(btowc)
])