[project @ 2000-07-05 17:01:59 by simonmar]

[ghc-hetmet.git] / configure.in

diff --git a/configure.in b/configure.in
index c3d0e13..6b91132 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -322,7 +322,13 @@ dnl AC_SUBST(TargetVendor_CPP)
 
 AC_SUBST(exeext)
 
-AC_PATH_PROG(GHC,ghc)
+if test "$GHC" = ""; then
+  AC_PATH_PROG(GHC,ghc)
+fi
+if test "$GHC" != ""; then
+  FPTOOLS_GHC_VERSION
+fi
+
 AC_PATH_PROGS(NHC,nhc nhc98)
 AC_PATH_PROG(HBC,hbc)
 
@@ -631,7 +637,8 @@ FPTOOLS_CHECK_HTYPE(double)
 FPTOOLS_CHECK_HTYPE(ptrdiff_t)
 FPTOOLS_CHECK_HTYPE(size_t)
 FPTOOLS_CHECK_HTYPE(wchar_t)
-FPTOOLS_CHECK_HTYPE(sig_atomic_t)
+dnl Int32 is a HACK for non-ISO C compilers
+FPTOOLS_CHECK_HTYPE(sig_atomic_t, Int32)
 FPTOOLS_CHECK_HTYPE(clock_t)
 FPTOOLS_CHECK_HTYPE(time_t)
 
@@ -720,6 +727,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)