diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-02-03 10:51:46 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-02-03 10:51:46 +0100 |
commit | eb4a14ed47a34e03566261b02c77bfcc02b20134 (patch) | |
tree | 23d7e5a0df3aa502b1b5802a0e6c75cfbef87519 /libguile/init.c | |
parent | 1ba05158ebe033d7d0bdfcfef686eae2c9ea0103 (diff) | |
download | guile-eb4a14ed47a34e03566261b02c77bfcc02b20134.tar.gz |
Use Gnulib's `regex' module.
This should help with regex portability, as reported in
<http://bugs.gnu.org/10684> for Darwin 8.11.
* m4/gnulib-cache.m4 (gl_MODULES): Add `regex'.
* configure.ac: Remove header checks for regex.h, rxposix.h, and
rx/rxposix.h. Remove check for the `regcomp' function. Remove
definition of `HAVE_REGCOMP'. Define `ENABLE_REGEX'.
* libguile/init.c: Check for `ENABLE_REGEX' instead of `HAVE_REGCOMP'.
* libguile/regex-posix.c: Always include <regex.h>. Remove #ifdefs for
rxposix.h and co.
Diffstat (limited to 'libguile/init.c')
-rw-r--r-- | libguile/init.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libguile/init.c b/libguile/init.c index 633f8c681..f171950fa 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -1,5 +1,6 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. - * +/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, + * 2004, 2006, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 3 of @@ -91,7 +92,7 @@ #include "libguile/poll.h" #include "libguile/ports.h" #include "libguile/posix.h" -#ifdef HAVE_REGCOMP +#ifdef ENABLE_REGEX #include "libguile/regex-posix.h" #endif #include "libguile/print.h" @@ -453,7 +454,7 @@ scm_i_init_guile (void *base) #ifdef HAVE_POSIX scm_init_posix (); #endif -#ifdef HAVE_REGCOMP +#ifdef ENABLE_REGEX scm_init_regex_posix (); /* Requires smob_prehistory */ #endif scm_init_procs (); |