From 5fd2550d4c96318b2de4a4a44e15e3c50c268e79 Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Thu, 25 May 2006 12:33:24 +0000 Subject: Use coreutils' regexp libraries, so regexp always available now git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1403 f882894a-f735-0410-b71e-b25c423dba1c --- m4/.cvsignore | 1 + m4/np_coreutils.m4 | 1 + m4/regex.m4 | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++ m4/restrict.m4 | 38 +++++++++++ 4 files changed, 227 insertions(+) create mode 100644 m4/regex.m4 create mode 100644 m4/restrict.m4 (limited to 'm4') diff --git a/m4/.cvsignore b/m4/.cvsignore index 282522db..a324157c 100644 --- a/m4/.cvsignore +++ b/m4/.cvsignore @@ -1,2 +1,3 @@ Makefile Makefile.in +Makefile.am diff --git a/m4/np_coreutils.m4 b/m4/np_coreutils.m4 index e6627a2b..44aa3b80 100644 --- a/m4/np_coreutils.m4 +++ b/m4/np_coreutils.m4 @@ -18,4 +18,5 @@ AC_DEFUN([np_COREUTILS], AC_REQUIRE([gl_MOUNTLIST]) AC_REQUIRE([gl_FSUSAGE]) AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO]) + AC_REQUIRE([gl_REGEX]) ]) diff --git a/m4/regex.m4 b/m4/regex.m4 new file mode 100644 index 00000000..8ea4fe94 --- /dev/null +++ b/m4/regex.m4 @@ -0,0 +1,187 @@ +#serial 31 + +# 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_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]) + + 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; + 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); + + /* 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_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([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]) +]) diff --git a/m4/restrict.m4 b/m4/restrict.m4 new file mode 100644 index 00000000..1f3bbb92 --- /dev/null +++ b/m4/restrict.m4 @@ -0,0 +1,38 @@ +#serial 1003 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# This macro can be removed once we can rely on Autoconf 2.57a or later, +# since we can then use its AC_C_RESTRICT. + +# gl_C_RESTRICT +# -------------- +# Determine whether the C/C++ compiler supports the "restrict" keyword +# introduced in ANSI C99, or an equivalent. Do nothing if the compiler +# accepts it. Otherwise, if the compiler supports an equivalent, +# define "restrict" to be that. Here are some variants: +# - GCC supports both __restrict and __restrict__ +# - older DEC Alpha C compilers support only __restrict +# - _Restrict is the only spelling accepted by Sun WorkShop 6 update 2 C +# Otherwise, define "restrict" to be empty. +AC_DEFUN([gl_C_RESTRICT], +[AC_CACHE_CHECK([for C/C++ restrict keyword], gl_cv_c_restrict, + [gl_cv_c_restrict=no + # Try the official restrict keyword, then gcc's __restrict, and + # the less common variants. + for ac_kw in restrict __restrict __restrict__ _Restrict; do + AC_COMPILE_IFELSE([AC_LANG_SOURCE( + [float * $ac_kw x;])], + [gl_cv_c_restrict=$ac_kw; break]) + done + ]) + case $gl_cv_c_restrict in + restrict) ;; + no) AC_DEFINE(restrict,, + [Define to equivalent of C99 restrict keyword, or to nothing if this + is not supported. Do not define if restrict is supported directly.]) ;; + *) AC_DEFINE_UNQUOTED(restrict, $gl_cv_c_restrict) ;; + esac +]) -- cgit v1.2.3