X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fregex.m4;h=5cf81fa3411ace277c018ab8cd0795e1a01119c9;hb=e6d7b6dadff0939558555a87efe46c9c1e60cdb1;hp=b7a0389420305b0793cd6ed5965cbca587f04f65;hpb=be6d03ac56f54af2f1cb3cb9ba395d64033bd085;p=gnulib.git diff --git a/m4/regex.m4 b/m4/regex.m4 index b7a038942..5cf81fa34 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,71 +1,123 @@ -#serial 4 +#serial 27 + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 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(jm_WITH_REGEX, - [ - AC_REQUIRE([AM_GLIBC]) - - dnl Even packages that don't use regex.c can use this macro. - dnl Of course, for them it doesn't do anything. - - # By default, don't use the included regex.c on systems with a version - # of glibc 2 that's new enough to pass the following run test. - # 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.2f. - ac_use_included_regex=yes - - if test "$ac_cv_glibc" = yes; then - # Without this run-test, on older glibc2 systems we'd end up - # using the buggy system regex. - AC_CACHE_CHECK([for working re_compile_pattern], - jm_cv_func_working_re_compile_pattern, - AC_TRY_RUN( - changequote(<<, >>)dnl - << -#include -#include - int - main () - { - static struct re_pattern_buffer regex; - const char *s; - re_set_syntax (RE_SYNTAX_POSIX_EGREP); - /* Add this third left square bracket, [, to balance the - three right ones below. Otherwise autoconf-2.14 chokes. */ - s = re_compile_pattern ("a[[:]:]]b\n", 9, ®ex); - /* This should fail with _Invalid character class name_ error. */ - exit (s ? 0 : 1); - } - >>, - changequote([, ])dnl - - 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 - fi - - test -n "$1" || AC_MSG_ERROR([missing argument]) - syscmd([test -f $1]) - ifelse(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 - LIBOBJS="$LIBOBJS regex.o" - fi - ], - ) - ] -) +AC_DEFUN([gl_REGEX], +[ + AC_LIBSOURCES( + [regcomp.c, regex.c, regex.h, + regex_internal.c, regex_internal.h, regexec.c]) + + 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], + [gl_cv_func_working_re_compile_pattern], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT + #include ], + [[static struct re_pattern_buffer regex; + const char *s; + struct re_registers regs; + /* Use the POSIX-compliant spelling with leading REG_, + rather than the traditional GNU spelling with leading RE_, + so that we reject older libc implementations. */ + re_set_syntax (REG_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 does not for e.g. glibc-2.1.3. */ + memset (®ex, 0, sizeof (regex)); + s = re_compile_pattern ("{1", 2, ®ex); + + if (s) + exit (1); + + /* The following example is derived from a problem report + against gawk from Jorge Stolfi . */ + memset (®ex, 0, sizeof (regex)); + s = re_compile_pattern ("[an\371]*n", 7, ®ex); + if (s) + exit (1); + + /* This should match, but does not for e.g. glibc-2.2.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 did not + work with a negative RANGE argument. */ + if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) + exit (1); + + /* The version of regex.c in older versions of gnulib + ignored REG_IGNORE_CASE (which was then called RE_ICASE). + Detect that problem too. */ + memset (®ex, 0, sizeof (regex)); + re_set_syntax (REG_SYNTAX_EMACS | REG_IGNORE_CASE); + s = re_compile_pattern ("x", 1, ®ex); + if (s) + exit (1); + + if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) + exit (1); + + /* REG_STARTEND was added to glibc on 2004-01-15. + Reject older versions. */ + if (! REG_STARTEND) + exit (1); + + exit (0);]])], + [gl_cv_func_working_re_compile_pattern=yes], + [gl_cv_func_working_re_compile_pattern=no], + dnl When crosscompiling, assume it is broken. + [gl_cv_func_working_re_compile_pattern=no])]) + if test $gl_cv_func_working_re_compile_pattern = yes; then + ac_use_included_regex=no + fi + + AC_ARG_WITH([included-regex], + [ --without-included-regex don't compile regex; this is the default on + systems with recent-enough versions of the GNU C + Library (use with caution on other systems)], + [gl_with_regex=$withval], + [gl_with_regex=$ac_use_included_regex]) + if test "X$gl_with_regex" = Xyes; then + AC_LIBOBJ([regex]) + gl_PREREQ_REGEX + fi +]) + +# Prerequisites of lib/regex.c and lib/regex_internal.c. +AC_DEFUN([gl_PREREQ_REGEX], +[ + AC_REQUIRE([AC_GNU_SOURCE]) + AC_REQUIRE([gl_C_RESTRICT]) + AC_REQUIRE([AM_LANGINFO_CODESET]) + AC_CHECK_HEADERS_ONCE([locale.h wchar.h wctype.h]) + AC_CHECK_FUNCS_ONCE([isblank mbrtowc mempcpy wcrtomb wcscoll]) +])