Mercurial > hg > octave-lyh > gnulib-hg
changeset 6003:d2b8c6783b35
* regex.m4 (gl_INCLUDED_REGEX): Use AC_RUN_ELSE instead of the
obsolescent AC_TRY_RUN. Include the default includes files, for 'exit'.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Mon, 25 Jul 2005 19:28:26 +0000 |
parents | 29720e2b877f |
children | 656febcdcd84 |
files | m4/ChangeLog m4/regex.m4 |
diffstat | 2 files changed, 55 insertions(+), 56 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2005-07-25 Paul Eggert <eggert@cs.ucla.edu> + + * regex.m4 (gl_INCLUDED_REGEX): Use AC_RUN_ELSE instead of the + obsolescent AC_TRY_RUN. Include the default includes files, for 'exit'. + 2005-07-24 Bruno Haible <bruno@clisp.org> * visibility.m4: New file.
--- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -#serial 23 +#serial 24 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free # Software Foundation, Inc. @@ -36,71 +36,65 @@ # test #75' in grep-2.3. AC_CACHE_CHECK([for working re_compile_pattern], [gl_cv_func_working_re_compile_pattern], - [AC_TRY_RUN( - [[ -#include <stdio.h> -#include <string.h> -#include <regex.h> - int - main () - { - static struct re_pattern_buffer regex; - 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); + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT + #include <regex.h>], + [[static struct re_pattern_buffer regex; + 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 does not for e.g. glibc-2.1.3. */ - memset (®ex, 0, sizeof (regex)); - s = re_compile_pattern ("{1", 2, ®ex); + /* 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); + if (s) + exit (1); - /* The following example is derived from a problem report - against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>. */ - memset (®ex, 0, sizeof (regex)); - s = re_compile_pattern ("[an\371]*n", 7, ®ex); - if (s) - exit (1); + /* The following example is derived from a problem report + against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>. */ + 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); + /* 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); + 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 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 RE_ICASE. Detect that problem too. */ - memset (®ex, 0, sizeof (regex)); - re_set_syntax(RE_SYNTAX_EMACS|RE_ICASE); - s = re_compile_pattern ("x", 1, ®ex); - if (s) - exit (1); + /* The version of regex.c in older versions of gnulib + * ignored RE_ICASE. Detect that problem too. */ + memset (®ex, 0, sizeof (regex)); + re_set_syntax(RE_SYNTAX_EMACS|RE_ICASE); + s = re_compile_pattern ("x", 1, ®ex); + if (s) + exit (1); - if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) - 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); + /* REG_STARTEND was added to glibc on 2004-01-15. + Reject older versions. */ + if (! REG_STARTEND) + exit (1); - exit (0); - } - ]], + 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.