X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fregex.m4;h=29c610cc50f4b6346e58518f707d4e046a7c0693;hb=c0174c2f816fce8bf8a3d16c633e5d46f75cc4c2;hp=d80eafb2ce5ccdbdba7fa785d5920e7522ea3182;hpb=e059c2358aad79ce8dfd9581dd6f12ce8503dc63;p=gnulib.git diff --git a/m4/regex.m4 b/m4/regex.m4 index d80eafb2c..29c610cc5 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,104 +1,164 @@ -#serial 13 +#serial 32 + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006 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_PREREQ([2.50]) + AC_DEFUN([gl_REGEX], [ - jm_INCLUDED_REGEX([lib/regex.c]) -]) + AC_LIBSOURCES( + [regcomp.c, regex.c, regex.h, + regex_internal.c, regex_internal.h, regexec.c]) -dnl Usage: jm_INCLUDED_REGEX([lib/regex.c]) -dnl -AC_DEFUN([jm_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. + AC_ARG_WITH([included-regex], + [AC_HELP_STRING([--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)])]) - # 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. + case $with_included_regex in + yes|no) ac_use_included_regex=$with_included_regex + ;; + '') + # 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 -#include - int - main () - { - static struct re_pattern_buffer regex; + [gl_cv_func_re_compile_pattern_broken], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT + #include ], + [[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, ®ex);] + /* 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 doesn't for e.g. glibc-2.1.3. */ + /* 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 . */ - s = re_compile_pattern ("[[anù]]*n", 7, ®ex); + 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 doesn't for e.g. glibc-2.2.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); - 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) - jm_PREREQ_REGEX - fi - ], - ) - ] -) - -# Prerequisites of lib/regex.c. -AC_DEFUN([jm_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. + memset (®ex, 0, sizeof (regex)); + s = re_compile_pattern ("x", 1, ®ex); + if (s) + exit (1); - dnl Persuade glibc to declare mempcpy(). - AC_REQUIRE([AC_GNU_SOURCE]) + /* 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); - AC_REQUIRE([AC_FUNC_ALLOCA]) - AC_REQUIRE([AC_HEADER_STDC]) - AC_CHECK_HEADERS_ONCE(limits.h string.h wchar.h wctype.h) - AC_CHECK_FUNCS_ONCE(isascii mempcpy) - AC_CHECK_FUNCS(btowc) + 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); + + /* Reject hosts whose regoff_t values are too narrow. + These include glibc 2.3.5 on hosts with 64-bit ptrdiff_t + and 32-bit int. */ + if (sizeof (regoff_t) < sizeof (ptrdiff_t) + || sizeof (regoff_t) < sizeof (ssize_t)) + exit (1); + + exit (0);]])], + [gl_cv_func_re_compile_pattern_broken=no], + [gl_cv_func_re_compile_pattern_broken=yes], + dnl When crosscompiling, assume it is broken. + [gl_cv_func_re_compile_pattern_broken=yes])]) + ac_use_included_regex=$gl_cv_func_re_compile_pattern_broken + ;; + *) AC_MSG_ERROR([Invalid value for --with-included-regex: $with_included_regex]) + ;; + esac + + if test $ac_use_included_regex = yes; then + AC_DEFINE([_REGEX_WIDE_OFFSETS], 1, + [Define if you want regoff_t to be at least as wide POSIX requires.]) + AC_DEFINE([re_syntax_options], [rpl_re_syntax_options], + [Define to rpl_re_syntax_options if the replacement should be used.]) + AC_DEFINE([re_set_syntax], [rpl_re_set_syntax], + [Define to rpl_re_set_syntax if the replacement should be used.]) + AC_DEFINE([re_compile_pattern], [rpl_re_compile_pattern], + [Define to rpl_re_compile_pattern if the replacement should be used.]) + AC_DEFINE([re_compile_fastmap], [rpl_re_compile_fastmap], + [Define to rpl_re_compile_fastmap if the replacement should be used.]) + AC_DEFINE([re_search], [rpl_re_search], + [Define to rpl_re_search if the replacement should be used.]) + AC_DEFINE([re_search_2], [rpl_re_search_2], + [Define to rpl_re_search_2 if the replacement should be used.]) + AC_DEFINE([re_match], [rpl_re_match], + [Define to rpl_re_match if the replacement should be used.]) + AC_DEFINE([re_match_2], [rpl_re_match_2], + [Define to rpl_re_match_2 if the replacement should be used.]) + AC_DEFINE([re_set_registers], [rpl_re_set_registers], + [Define to rpl_re_set_registers if the replacement should be used.]) + AC_DEFINE([re_comp], [rpl_re_comp], + [Define to rpl_re_comp if the replacement should be used.]) + AC_DEFINE([re_exec], [rpl_re_exec], + [Define to rpl_re_exec if the replacement should be used.]) + AC_DEFINE([regcomp], [rpl_regcomp], + [Define to rpl_regcomp if the replacement should be used.]) + AC_DEFINE([regexec], [rpl_regexec], + [Define to rpl_regexec if the replacement should be used.]) + AC_DEFINE([regerror], [rpl_regerror], + [Define to rpl_regerror if the replacement should be used.]) + AC_DEFINE([regfree], [rpl_regfree], + [Define to rpl_regfree if the replacement should be used.]) + 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]) ])