diff options
| author | simonmar <unknown> | 2000-06-29 13:40:17 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2000-06-29 13:40:17 +0000 |
| commit | 637e79ff229838f7f2dc087fe5025e2e3cdda673 (patch) | |
| tree | 4f0443ef4b4b6e54b1f8ce329ca751968867e53f | |
| parent | 168e69c3281912031727d2fb83604c5db9cd94b0 (diff) | |
| download | haskell-637e79ff229838f7f2dc087fe5025e2e3cdda673.tar.gz | |
[project @ 2000-06-29 13:40:17 by simonmar]
Add test for GNU regex in libc, which we'll use to decide whether to
compile our own copy of the library in package text.
| -rw-r--r-- | aclocal.m4 | 21 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | mk/config.mk.in | 6 |
3 files changed, 29 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 51da0dfff1..8cec317732 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.50 2000/06/15 20:22:53 panne Exp $ +dnl $Id: aclocal.m4,v 1.51 2000/06/29 13:40:17 simonmar Exp $ dnl dnl Extra autoconf macros for the Glasgow fptools dnl @@ -73,6 +73,25 @@ fi ]) +dnl *** Does libc contain GNU regex? *** +dnl +AC_DEFUN(FPTOOLS_REGEX_IN_LIBC, +[AC_CACHE_CHECK([for GNU regex in libc], fptools_cv_have_regex, +[AC_TRY_LINK([#if HAVE_UNISTD_H +#include <unistd.h> +#endif +#include <regex.h> +],[ struct re_pattern_buffer patbuf; re_compile_pattern("",0,&patbuf); ], +fptools_cv_have_regex=yes, fptools_cv_have_regex=no)]) +if test "$fptools_cv_have_regex" = yes; then + HaveRegex=YES +else + HaveRegex=NO +fi +AC_SUBST(HaveRegex) +]) + + dnl ** check for leading underscores in symbol names dnl dnl Test for determining whether symbol names have a leading diff --git a/configure.in b/configure.in index 6f07d07724..a33ec32b5a 100644 --- a/configure.in +++ b/configure.in @@ -721,6 +721,9 @@ AC_CHECK_LIB(gmp, mpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp, AC_SUBST(HaveLibGmp) AC_SUBST(LibGmp) +dnl ** check whether this machine has GNU regex in libc. +FPTOOLS_REGEX_IN_LIBC + dnl ** check whether this machine has BFD and liberty installed (used for debugging) dnl the order of these tests matters: bfd needs liberty AC_CHECK_LIB(iberty, xmalloc) diff --git a/mk/config.mk.in b/mk/config.mk.in index 66fe093602..7647f2654d 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -543,6 +543,12 @@ HaveLibGmp = @HaveLibGmp@ LibGmp = @LibGmp@ #----------------------------------------------------------------------------- +# Regex library +# (if present in libc use that one, otherwise use the one in the tree) +# +HaveRegex = @HaveRegex@ + +#----------------------------------------------------------------------------- # Flex FLEX = @LEX@ |