diff options
-rw-r--r-- | libguile/ChangeLog | 4 | ||||
-rw-r--r-- | libguile/regex-posix.c | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index c3f6d3e57..d9dba2387 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,5 +1,9 @@ Sun Aug 24 01:25:35 1997 Mikael Djurfeldt <mdj@kenneth> + * regex-posix.c: If <regex.h> can't be found, try <rxposix.h> or + <rx/rxposix.h>. (This is in order to accomodate for the GNU Rx + library.) + * ramap.c (scm_ra_matchp, scm_array_fill_int, racp, ramap_1, ramap_2o, scm_array_index_map_x, raeql_1, scm_array_equal_p), unif.c (scm_vector_set_length_x, scm_uniform_vector_length, diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c index 28afdd6b1..e941393d0 100644 --- a/libguile/regex-posix.c +++ b/libguile/regex-posix.c @@ -58,8 +58,18 @@ the file is CPP'able (for dependency scanning) even on systems that don't have a <regex.h> header. */ #ifdef HAVE_REGCOMP +#ifdef HAVE_REGEX_H #include <regex.h> -#endif +#else +#ifdef HAVE_RXPOSIX_H +#include <rxposix.h> /* GNU Rx library */ +#else +#ifdef HAVE_RX_RXPOSIX_H +#include <rx/rxposix.h> /* GNU Rx library on Linux */ +#endif +#endif +#endif +#endif #include "smob.h" #include "symbols.h" |