X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=44e30895f7c8edc51e46b99d8f1aded917ab33af;hb=3cdceb2d3ec67d8f96528f4cbc0a16a06b2f7fe4;hp=4b5713ff2ddd7b63675dcce1f060df832900fa07;hpb=81464dc67475d11713f418fb3891be6ff9b265e6;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 4b5713f..44e3089 100644
--- a/configure.in
+++ b/configure.in
@@ -281,6 +281,19 @@ dnl AC_SUBST(TargetVendor_CPP)
 
 AC_SUBST(exeext)
 
+dnl * Booting from .hc files?
+#--------------------------------------------------------------
+AC_ARG_ENABLE(hc-boot,
+   [
+Boot the Glasgow Haskell Compiler from intermediate .hc files.
+(This option is mostly of interest for porters.)
+   ],
+
+   BootingFromHc=YES,
+   BootingFromHc=NO
+)
+AC_SUBST(BootingFromHc)
+
 # -------------------------------------------------------------------------
 dnl
 dnl * _GENERAL_ CONFIGURATION CHECKS
@@ -399,19 +412,12 @@ fi
 AC_SUBST(CompressCmd)
 AC_SUBST(CompressSuffix)
 
-#
+dnl
 dnl ** check for installed happy binary + version
-#
+dnl    (don't do it if we're booting from .hc files though.)
+if (test "$BootingFromHc" = "NO"); then
 AC_HAPPY
-
-if test x"$HappyCmd" != x; then
-   if expr $HappyVersion \< "1.3" >/dev/null; then
-	echo "   Happy Version 1.3 or later is required to compile GHC."
-	echo "   Using the Happy sources in the tree.";
-	HappyCmd=""
-   fi
-fi
-
+fi;
 #
 #
 dnl ** check for installed lx binary
@@ -431,7 +437,7 @@ AC_HEADER_STDC
 #
 dnl ** check for specific header (.h) files that we are interested in
 #
-AC_CHECK_HEADERS(dirent.h fcntl.h grp.h malloc.h memory.h nlist.h pwd.h siginfo.h signal.h stdlib.h string.h sys/fault.h sys/file.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/vadvise.h sys/wait.h termios.h time.h types.h unistd.h utime.h vfork.h readline/readline.h )
+AC_CHECK_HEADERS(dirent.h fcntl.h grp.h malloc.h memory.h nlist.h pwd.h siginfo.h signal.h stdlib.h string.h sys/fault.h sys/file.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/vadvise.h sys/wait.h termios.h time.h types.h unistd.h utime.h vfork.h readline/readline.h bfd.h)
 
 #
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
@@ -476,6 +482,13 @@ AC_CHECK_LIB(gmp, mpz_fdiv_qr, HaveLibGmp=YES, HaveLibGmp=NO)
 AC_SUBST(HaveLibGmp)
 
 #
+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)
+AC_CHECK_LIB(bfd,    bfd_init)
+
+#
 # Misc
 #
 dnl ** can we get alloca?