X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=m4%2Fregex.m4;h=8ea4fe94bb8f5f66b63d99ed66b1ccacf217040a;hb=eecc352a2246ff8edcc7600d506da3a2d73aa4e8;hp=5cf81fa3411ace277c018ab8cd0795e1a01119c9;hpb=e6d7b6dadff0939558555a87efe46c9c1e60cdb1;p=gnulib.git diff --git a/m4/regex.m4 b/m4/regex.m4 index 5cf81fa34..8ea4fe94b 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -#serial 27 +#serial 31 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free # Software Foundation, Inc. @@ -10,27 +10,58 @@ dnl Initially derived from code in GNU grep. dnl Mostly written by Jim Meyering. +AC_PREREQ([2.50]) + AC_DEFUN([gl_REGEX], [ + AC_REQUIRE([AC_SYS_LARGEFILE]) dnl for a sufficently-wide off_t + + AC_CACHE_CHECK([whether off_t can be used in a switch statement], + [gl_cv_type_off_t_switch], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT], + [[off_t o = -1; + switch (o) + { + case -2: + return 1; + case -1: + return 2; + default: + return 0; + } + ]])], + [gl_cv_type_off_t_switch=yes], + [gl_cv_type_off_t_switch=no])]) + if test $gl_cv_type_off_t_switch = yes; then + AC_DEFINE([_REGEX_LARGE_OFFSETS], 1, + [Define if you want regoff_t to be at least as wide POSIX requires.]) + fi + 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_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)])]) + + 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], + [gl_cv_func_re_compile_pattern_broken], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( [AC_INCLUDES_DEFAULT #include ], [[static struct re_pattern_buffer regex; @@ -91,22 +122,55 @@ AC_DEFUN([gl_REGEX], 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 off_t + and 32-bit int, and Solaris 10 on hosts with 32-bit int + and _FILE_OFFSET_BITS=64. */ + if (sizeof (regoff_t) < sizeof (off_t)) + exit (1); + exit (0);]])], - [gl_cv_func_working_re_compile_pattern=yes], - [gl_cv_func_working_re_compile_pattern=no], + [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_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 + [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([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