Add recently added lib dirs to the darcs boring file
[ghc-hetmet.git] / configure.ac
index 6f7ff38..d2cea57 100644 (file)
@@ -3,9 +3,9 @@ dnl (run "grep '^dnl \*' configure.ac | sed -e 's/dnl / /g; s/\*\*/   +/g;'"
 dnl  (or some such) to see the outline of this file)
 dnl
 #
-# (c) The AQUA Project, Glasgow University, 1994-2004
+# (c) The University of Glasgow 1994-2004
 #
-# Configure script template for the Glasgow functional programming tools
+# Configure script template for GHC
 #
 # Process with 'autoreconf' to get a working configure script.
 #
@@ -13,7 +13,30 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([fptools build system], [1.0], [cvs-fptools@haskell.org], [fptools])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.11], [glasgow-haskell-bugs@haskell.org], [ghc])
+
+# Set this to YES for a released version, otherwise NO
+: ${RELEASE=NO}
+
+# The primary version (e.g. 6.7, 6.6.1) is set in the AC_INIT line
+# above.  If this is not a released version, then we will append the
+# date to the version number (e.g. 6.7.20070204).  The date is
+# constructed by finding the date of the most recent patch in the
+# darcs repository.  If this is a source distribution (not a darcs
+# checkout), then we ship a file 'VERSION' containing the full version
+# when the source distribution was created.
+
+if test ! -f mk/config.h.in; then
+   echo "mk/config.h.in doesn't exist: perhaps you haven't run 'sh boot'?"
+   exit 1
+fi
+
+AC_SUBST([CONFIGURE_ARGS], [$ac_configure_args])
+
+FP_SETUP_PROJECT_VERSION
+
+# Hmmm, we fix the RPM release number to 1 here... Is this convenient?
+AC_SUBST([release], [1])
 
 # First off, a distrib sanity check..
 AC_CONFIG_SRCDIR([mk/config.mk.in])
@@ -23,13 +46,6 @@ dnl We need 2.50 due to the use of AC_SYS_LARGEFILE and AC_MSG_NOTICE.
 dnl We need 2.52 due to the use of AS_TR_CPP and AS_TR_SH.
 AC_PREREQ([2.52])
 
-dnl * Declare subdirectories that have a private configure script
-dnl
-dnl After the toplevel configuration is complete, the script will recurse into
-dnl these subdirectories if they exist. The use of a cache file makes repeated
-dnl checks cheap.
-AC_CONFIG_SUBDIRS([ghc libraries])
-
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
 #
@@ -43,487 +59,273 @@ if test x"$srcdir" != 'x.' ; then
 fi
 
 dnl--------------------------------------------------------------------
+dnl * Deal with arguments telling us gmp is somewhere odd
+dnl--------------------------------------------------------------------
+
+FP_ARG_GMP
+
+GMP_INCLUDE_DIRS=
+GMP_LIB_DIRS=
+if test "x$gmp_libraries" != "xNONE"; then
+  LDFLAGS="-L$gmp_libraries $LDFLAGS"
+  GMP_LIB_DIRS=$gmp_libraries
+fi
+if test "x$gmp_includes" != "xNONE"; then
+  CPPFLAGS="-I$gmp_includes $CPPFLAGS"
+  GMP_INCLUDE_DIRS=$gmp_includes
+fi
+AC_SUBST(GMP_INCLUDE_DIRS)
+AC_SUBST(GMP_LIB_DIRS)
+
+dnl --------------------------------------------------------------
+dnl * Project specific configuration options
+dnl --------------------------------------------------------------
+dnl What follows is a bunch of options that can either be configured
+dnl through command line options to the configure script or by
+dnl supplying defns in the build tree's mk/build.mk. Having the option to
+dnl use either is considered a Feature.
+
+dnl ** What command to use to compile compiler sources ?
+dnl --------------------------------------------------------------
+
+AC_ARG_WITH([ghc],
+[AC_HELP_STRING([--with-ghc=ARG],
+  [Use ARG as the path to GHC  [default=autodetect]])],
+  [WithGhc="$withval"],
+  [if test "$GHC" = ""; then
+    AC_PATH_PROG([GHC], [ghc])
+  fi
+  WithGhc="$GHC"])
+
+dnl ** Booting from unregisterised .hc files?
+dnl --------------------------------------------------------------
+AC_ARG_ENABLE(hc-boot-unregisterised,
+[AC_HELP_STRING([--enable-hc-boot-unregisterised],
+[ With --enable-hc-boot, treat the intermediate .hc files as
+ unregisterised rather than registerised code.
+ (This option is mostly of interest to porters.) [default=no]])],
+[ if test x"$enableval" = x"yes"; then
+        BootingFromUnregisterisedHc=YES
+  else
+        BootingFromUnregisterisedHc=NO
+  fi
+],
+[BootingFromUnregisterisedHc=NO]
+)
+AC_SUBST(BootingFromUnregisterisedHc)
+
+if test "$BootingFromHc" = "NO"; then
+if test "$BootingFromUnregisterisedHc" = "YES"; then
+AC_MSG_ERROR([--enable-hc-boot-unregisterised requires --enable-hc-boot.])
+fi;
+fi;
+
+dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on
+if test "$BootingFromHc" = "NO" -a -d "$srcdir/compiler"; then
+  if test "$WithGhc" = ""; then
+     AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
+  fi
+  FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.8],
+    [AC_MSG_ERROR([GHC version 6.8 or later is required to compile GHC.])])dnl
+
+  if test `expr $GhcMinVersion % 2` = "1"; then
+     echo $EnableBootstrapWithDevelSnaphost
+     if test "$EnableBootstrapWithDevelSnaphost" = "NO"; then
+        AC_MSG_ERROR([
+     $WithGhc is a development snapshot of GHC, version $GhcVersion.
+     Bootstrapping using this version of GHC is not supported, and may not
+     work.  Use --enable-bootstrap-with-devel-snapshot to try it anyway,
+     or --with-ghc to specify a different GHC to use.])
+     fi
+  fi
+fi;
+
+AC_ARG_ENABLE(bootstrap-with-devel-snapshot,
+[AC_HELP_STRING([--enable-bootstrap-with-devel-snapshot],
+                [Allow bootstrapping using a development snapshot of GHC.  This is not guaranteed to work.])],
+        EnableBootstrapWithDevelSnaphost=YES,
+        EnableBootstrapWithDevelSnaphost=NO
+)
+
+if test "$WithGhc" != ""; then
+  FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])dnl
+
+  if test "$GhcMajVersion" = "unknown" -o "$GhcMinVersion" = "unknown"; then
+     AC_MSG_ERROR([Cannot determine the version of $WithGhc.  Is it really GHC?])
+  fi
+
+  AC_SUBST(GhcVersion)dnl
+  AC_SUBST(GhcMajVersion)dnl
+  AC_SUBST(GhcMinVersion)dnl
+  AC_SUBST(GhcPatchLevel)dnl
+  GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
+  GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
+  if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi
+  AC_SUBST(ghc_ge_609)dnl
+fi
+
+# GHC is passed to Cabal, so we need a native path
+if test "${WithGhc}" != ""
+then
+    ghc_host=`${WithGhc} +RTS --info | grep 'Host platform' | sed -e 's/.*, "//' -e 's/")//'`
+
+    if test "$ghc_host" = "i386-unknown-mingw32"
+    then
+        if test "${OSTYPE}" = "msys"
+        then
+            WithGhc=`echo "${WithGhc}" | sed "s#^/\([a-zA-Z]\)/#\1:/#"`
+        else
+            # Canonicalise to <drive>:/path/to/ghc
+            WithGhc=`cygpath -m ${WithGhc}`
+        fi
+        echo "GHC path canonicalised to: ${WithGhc}"
+    fi
+fi
+AC_SUBST([WithGhc])
+
+dnl--------------------------------------------------------------------
 dnl * Choose host(/target/build) platform
 dnl--------------------------------------------------------------------
+dnl We don't use the standard autoconf macros for this, but instead
+dnl ask the bootstrapping compiler what platform it is for
 
 dnl Guess host/target/build platform(s) if necessary.
-AC_CANONICAL_TARGET
-
-# "$host" defaults to "$target"
-if test "x$host" = xNONE ; then
-    host=$target
+m4_divert_once([HELP_CANON],
+[[
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [guessed]
+  --target=TARGET   configure for building compilers for TARGET [guessed]]])dnl
+
+if test "$build" = ""
+then
+    if test "${WithGhc}" != ""
+    then
+        build=`${WithGhc} +RTS --info | grep '^ ,("Target platform"' | sed -e 's/.*, "//' -e 's/")//'`
+        echo "Build platform inferred as: $build"
+    else
+        echo "Can't work out build platform"
+        exit 1
+    fi
 fi
 
-dnl ** canonicalize platform names
-BuildPlatform=`/bin/sh $srcdir/config.sub $build` || exit 1
-HostPlatform=`/bin/sh $srcdir/config.sub $host` || exit 1
-TargetPlatform=`/bin/sh $srcdir/config.sub $target` || exit 1
+if test "$host" = ""
+then
+    if test "${WithGhc}" != ""
+    then
+        host=`${WithGhc} +RTS --info | grep '^ ,("Target platform"' | sed -e 's/.*, "//' -e 's/")//'`
+        echo "Host platform inferred as: $host"
+    else
+        echo "Can't work out host platform"
+        exit 1
+    fi
+fi
 
-if test x"$TargetPlatform" != x"$HostPlatform" ; then
-    echo "GHC configuration does not support differing host/target (i.e., cross-compiling)"
-    exit 1
+if test "$target" = ""
+then
+    if test "${WithGhc}" != ""
+    then
+        target=`${WithGhc} +RTS --info | grep '^ ,("Target platform"' | sed -e 's/.*, "//' -e 's/")//'`
+        echo "Target platform inferred as: $target"
+    else
+        echo "Can't work out target platform"
+        exit 1
+    fi
 fi
 
 exeext=''
-#
-# The following will be more difficult when we *are* cross-compiling.
-# Suitable names to slam in *_CPP are in platform.h.in.
-# We also record the architecture, vendor, and operating system (OS)
-# separately.
-case $HostPlatform in
-alpha*-dec-osf[[12]]*)
-       HostPlatform=alpha-dec-osf1   # canonicalise for our purposes
-       TargetPlatform=alpha-dec-osf1 # this will work for now... (hack)
-       BuildPlatform=alpha-dec-osf1  # hack
-        HostPlatform_CPP='alpha_dec_osf1'
-        HostArch_CPP='alpha'
-        HostVendor_CPP='dec'
-        HostOS_CPP='osf1'
-        ;;
-alpha*-dec-osf[[345]]*)
-       HostPlatform=alpha-dec-osf3   # canonicalise for our purposes
-       TargetPlatform=alpha-dec-osf3 # this will work for now... (hack)
-       BuildPlatform=alpha-dec-osf3  # hack
-        HostPlatform_CPP='alpha_dec_osf3'
-        HostArch_CPP='alpha'
-        HostVendor_CPP='dec'
-        HostOS_CPP='osf3'
-        ;;
-alpha*-unknown-linux*)
-       HostPlatform=alpha-unknown-linux
-       TargetPlatform=alpha-unknown-linux
-       BuildPlatform=alpha-unknown-linux
-        HostPlatform_CPP='alpha_unknown_linux'
-        HostArch_CPP='alpha'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='linux'
-        ;;
-alpha*-unknown-freebsd*)
-       HostPlatform=alpha-unknown-freebsd
-       TargetPlatform=alpha-unknown-freebsd
-       BuildPlatform=alpha-unknown-freebsd
-        HostPlatform_CPP='alpha_unknown_freebsd'
-        HostArch_CPP='alpha'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='freebsd'
-        ;;
-alpha*-unknown-openbsd*)
-       HostPlatform=alpha-unknown-openbsd
-       TargetPlatform=alpha-unknown-openbsd
-       BuildPlatform=alpha-unknown-openbsd
-        HostPlatform_CPP='alpha_unknown_openbsd'
-        HostArch_CPP='alpha'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='openbsd'
-        ;;
-amd64-*-openbsd*|x86_64-*-openbsd*)
-       HostPlatform=x86_64-unknown-openbsd
-       TargetPlatform=x86_64-unknown-openbsd
-       BuildPlatform=x86_64-unknown-openbsd
-        HostPlatform_CPP='x86_64_unknown_openbsd'
-        HostArch_CPP='x86_64'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='openbsd'
-        ;;
-arm*-linux*)
-        HostPlatform=arm-unknown-linux # hack again
-        TargetPlatform=arm-unknown-linux
-        BuildPlatform=arm-unknown-linux
-        HostPlatform_CPP='arm_unknown_linux'                 
-        HostArch_CPP='arm'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='linux'
-        ;;
-arm*-openbsd*)
-        HostPlatform=arm-unknown-openbsd
-        TargetPlatform=arm-unknown-openbsd
-        BuildPlatform=arm-unknown-openbsd
-        HostPlatform_CPP='arm_unknown_openbsd'                 
-        HostArch_CPP='arm'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='openbsd'
-        ;;
-hppa*-*-linux*)
-        HostPlatform=hppa-unknown-linux # hack again
-        TargetPlatform=hppa-unknown-linux
-        BuildPlatform=hppa-unknown-linux
-        HostPlatform_CPP='hppa_unknown_linux'                
-        HostArch_CPP='hppa'
-        HostVendor_CPP='unknown'                             
-        HostOS_CPP='linux'
-        ;;
-hppa*-*-openbsd*)
-        HostPlatform=hppa-unknown-openbsd # hack again
-        TargetPlatform=hppa-unknown-openbsd
-        BuildPlatform=hppa-unknown-openbsd
-        HostPlatform_CPP='hppa_unknown_openbsd'                
-        HostArch_CPP='hppa'
-        HostVendor_CPP='unknown'                             
-        HostOS_CPP='openbsd'
-        ;;
-hppa1.1-hp-hpux*)
-       HostPlatform=hppa1.1-hp-hpux  # canonicalise for our purposes (hack)
-       TargetPlatform=hppa1.1-hp-hpux
-       BuildPlatform=hppa1.1-hp-hpux
-        HostPlatform_CPP='hppa1_1_hp_hpux'
-        HostArch_CPP='hppa1_1'
-        HostVendor_CPP='hp'
-        HostOS_CPP='hpux'
-        ;;
-i[[3456]]86-*-linuxaout*)
-       HostPlatform=i386-unknown-linuxaout   # hack again
-       TargetPlatform=i386-unknown-linuxaout
-       BuildPlatform=i386-unknown-linuxaout
-        HostPlatform_CPP='i386_unknown_linuxaout'
-        HostArch_CPP='i386'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='linuxaout'
-        ;;
-i[[3456]]86-*-linux*)
-       HostPlatform=i386-unknown-linux # hack again
-       TargetPlatform=i386-unknown-linux
-       BuildPlatform=i386-unknown-linux
-        HostPlatform_CPP='i386_unknown_linux'
-        HostArch_CPP='i386'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='linux'
-        ;;
-i[[3456]]86-*-gnu*)
-        HostPlatform=i386-unknown-gnu
-        TargetPlatform=i386-unknown-gnu
-        BuildPlatform=i386-unknown-gnu
-        HostPlatform_CPP=i386_unknown_gnu
-        HostArch_CPP=i386
-        HostVendor_CPP=unknown
-        HostOS_CPP=gnu
-        ;;
-i[[3456]]86-*-kfreebsd*-gnu)
-        HostPlatform=i386-unknown-kfreebsdgnu # hack again
-        TargetPlatform=i386-unknown-kfreebsdgnu
-        BuildPlatform=i386-unknown-kfreebsdgnu
-        HostPlatform_CPP='i386_unknown_kfreebsdgnu'
-        HostArch_CPP='i386'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='kfreebsdgnu'
-        ;;
-i[[3456]]86-*-freebsd[[3-9]]*) # FreeBSD 3.0+ uses ELF
-       HostPlatform=i386-unknown-freebsd # hack again
-       TargetPlatform=i386-unknown-freebsd
-       BuildPlatform=i386-unknown-freebsd
-        HostPlatform_CPP='i386_unknown_freebsd'
-        HostArch_CPP='i386'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='freebsd'
-        ;;
-i[[3456]]86-*-freebsd2*) # Older FreeBSDs are a.out
-       HostPlatform=i386-unknown-freebsd2 # hack again
-       TargetPlatform=i386-unknown-freebsd2
-       BuildPlatform=i386-unknown-freebsd2
-        HostPlatform_CPP='i386_unknown_freebsd2'
-        HostArch_CPP='i386'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='freebsd2'
-        ;;
-i[[3456]]86-*-netbsd*)
-       HostPlatform=i386-unknown-netbsd # hack again
-       TargetPlatform=i386-unknown-netbsd
-       BuildPlatform=i386-unknown-netbsd
-        HostPlatform_CPP='i386_unknown_netbsd'
-        HostArch_CPP='i386'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='netbsd'
-        ;;
-i[[3456]]86-*-openbsd*)
-       HostPlatform=i386-unknown-openbsd # hack again
-       TargetPlatform=i386-unknown-openbsd
-       BuildPlatform=i386-unknown-openbsd
-        HostPlatform_CPP='i386_unknown_openbsd'
-        HostArch_CPP='i386'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='openbsd'
-        ;;
-i[[3456]]86-*-solaris2*)
-       HostPlatform=i386-unknown-solaris2 # hack again
-       TargetPlatform=i386-unknown-solaris2
-       BuildPlatform=i386-unknown-solaris2
-        HostPlatform_CPP='i386_unknown_solaris2'
-        HostArch_CPP='i386'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='solaris2'
-        ;;
-i[[3456]]86-*-cygwin*)
-       HostPlatform=i386-unknown-cygwin32 # hack again
-       TargetPlatform=i386-unknown-cygwin32
-       BuildPlatform=i386-unknown-cygwin32
-        HostPlatform_CPP='i386_unknown_cygwin32'
-        HostArch_CPP='i386'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='cygwin32'
-       exeext='.exe'
-        ;;
-i[[3456]]86-*-mingw32*)
-       HostPlatform=i386-unknown-mingw32 # hack again
-       TargetPlatform=i386-unknown-mingw32
-       BuildPlatform=i386-unknown-mingw32
-        HostPlatform_CPP='i386_unknown_mingw32'
-        HostArch_CPP='i386'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='mingw32'
-       exeext='.exe'
-        ;;
-i[[3456]]86-apple-darwin*)
-       HostPlatform=i386-apple-darwin
-       TargetPlatform=i386-apple-darwin #hack
-       BuildPlatform=i386-apple-darwin #hack
-       HostPlatform_CPP='i386_apple_darwin'
-       HostArch_CPP='i386'
-       HostVendor_CPP='apple'
-       HostOS_CPP='darwin'
-       ;;
-ia64-*-linux*)
-        HostPlatform=ia64-unknown-linux # hack again
-        TargetPlatform=ia64-unknown-linux
-        BuildPlatform=ia64-unknown-linux
-        HostPlatform_CPP='ia64_unknown_linux'
-        HostArch_CPP='ia64'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='linux'
-        ;;
-x86_64-*-linux*)
-        HostPlatform=x86_64-unknown-linux
-        TargetPlatform=x86_64-unknown-linux
-        BuildPlatform=x86_64-unknown-linux
-        HostPlatform_CPP='x86_64_unknown_linux'
-        HostArch_CPP='x86_64'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='linux'
-       ;;
-m68k-*-linux*)
-        HostPlatform=m68k-unknown-linux # hack again
-        TargetPlatform=m68k-unknown-linux                    
-        BuildPlatform=m68k-unknown-linux
-        HostPlatform_CPP='m68k_unknown_linux'
-        HostArch_CPP='m68k'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='linux'
-        ;;
-m68k-next-nextstep2)
-        HostPlatform_CPP='m68k_next_nextstep2'
-        HostArch_CPP='m68k'
-        HostVendor_CPP='next'
-        HostOS_CPP='nextstep2'
-        ;;
-m68k-next-nextstep3)
-        HostPlatform_CPP='m68k_next_nextstep3'
-        HostArch_CPP='m68k'
-        HostVendor_CPP='next'
-        HostOS_CPP='nextstep3'
-        ;;
-i[[3456]]86-next-nextstep3)
-       HostPlatform=i386-next-nextstep3 # hack again
-       TargetPlatform=i386-next-nextstep3
-       BuildPlatform=i386-next-nextstep3
-        HostPlatform_CPP='i386_next_nextstep3'
-        HostArch_CPP='i386'
-        HostVendor_CPP='next'
-        HostOS_CPP='nextstep3'
-        ;;
-m68k-*-openbsd*)
-       HostPlatform=m68k-unknown-openbsd
-       TargetPlatform=m68k-unknown-openbsd
-       BuildPlatform=m68k-unknown-openbsd
-        HostPlatform_CPP='m68k_unknown_openbsd'
-        HostArch_CPP='m68k'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='openbsd'
-        ;;
-m68k-*-netbsd*)
-       HostPlatform=m68k-unknown-netbsd
-       TargetPlatform=m68k-unknown-netbsd
-       BuildPlatform=m68k-unknown-netbsd
-        HostPlatform_CPP='m68k_unknown_netbsd'
-        HostArch_CPP='m68k'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='netbsd'
-        ;;
-m68k-sun-sunos4*)
-       HostPlatform=m68k-sun-sunos4
-       TargetPlatform=m68k-sun-sunos4 #hack
-       BuildPlatform=m68k-sun-sunos4 #hack
-        HostPlatform_CPP='m68k_sun_sunos4'
-        HostArch_CPP='m68k'
-        HostVendor_CPP='sun'
-        HostOS_CPP='sunos4'
-        ;;
-m88k-*-openbsd*)
-       HostPlatform=m88k-unknown-openbsd
-       TargetPlatform=m88k-unknown-openbsd
-       BuildPlatform=m88k-unknown-openbsd
-        HostPlatform_CPP='m88k_unknown_openbsd'
-        HostArch_CPP='m88k'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='openbsd'
-        ;;
-mips-*-linux*)
-        HostPlatform=mips-unknown-linux # hack again
-        TargetPlatform=mips-unknown-linux
-        BuildPlatform=mips-unknown-linux
-        HostPlatform_CPP='mips_unknown_linux'
-        HostArch_CPP='mips'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='linux'
-        ;;
-mips-dec-ultrix*)
-        HostPlatform_CPP='mips_dec_ultrix'
-        HostArch_CPP='mipsel'   # NB a little different
-        HostVendor_CPP='dec'
-        HostOS_CPP='ultrix'
-        ;;
-mips-sgi-irix*)
-       HostPlatform=mips-sgi-irix
-       TargetPlatform=mips-sgi-irix #hack
-       BuildPlatform=mips-sgi-irix #hack
-        HostPlatform_CPP='mips_sgi_irix'
-        HostArch_CPP='mipseb'   # NB a little different
-        HostVendor_CPP='sgi'
-        HostOS_CPP='irix'
-        ;;
-rs6000-ibm-aix*)
-       HostPlatform=rs6000-ibm-aix
-       TargetPlatform=rs6000-ibm-aix #hack
-       BuildPlatform=rs6000-ibm-aix #hack
-        HostPlatform_CPP='rs6000_ibm_aix'
-        HostArch_CPP='rs6000'
-        HostVendor_CPP='ibm'
-        HostOS_CPP='aix'
-        ;;
-powerpc-ibm-aix*)
-       HostPlatform=powerpc-ibm-aix
-       TargetPlatform=powerpc-ibm-aix #hack
-       BuildPlatform=powerpc-ibm-aix #hack
-        HostPlatform_CPP='powerpc_ibm_aix'
-        HostArch_CPP='powerpc'
-        HostVendor_CPP='ibm'
-        HostOS_CPP='aix'
-        ;;
-powerpc-apple-darwin*)
-       HostPlatform=powerpc-apple-darwin
-       TargetPlatform=powerpc-apple-darwin #hack
-       BuildPlatform=powerpc-apple-darwin #hack
-       HostPlatform_CPP='powerpc_apple_darwin'
-       HostArch_CPP='powerpc'
-       HostVendor_CPP='apple'
-       HostOS_CPP='darwin'
-       ;;
-powerpc-unknown-linux*)
-        HostPlatform=powerpc-unknown-linux
-        TargetPlatform=powerpc-unknown-linux
-        BuildPlatform=powerpc-unknown-linux
-        HostPlatform_CPP='powerpc_unknown_linux'
-        HostArch_CPP='powerpc'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='linux'
-        ;;
-powerpc-unknown-openbsd*)
-        HostPlatform=powerpc-unknown-openbsd
-        TargetPlatform=powerpc-unknown-openbsd
-        BuildPlatform=powerpc-unknown-openbsd
-        HostPlatform_CPP='powerpc_unknown_openbsd'
-        HostArch_CPP='powerpc'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='openbsd'
-        ;;
-powerpc64-unknown-linux*)
-       HostPlatform=powerpc64-unknown-linux
-       TargetPlatform=powerpc64-unknown-linux
-       BuildPlatform=powerpc64-unknown-linux
-       HostPlatform_CPP='powerpc64_unknown_linux'
-       HostArch_CPP='powerpc64'
-        HostVendor_CPP='unknown'
-       HostOS_CPP='linux'
-       ;;
-                                                               
-s390-ibm-linux*)
-       HostPlatform=s390-ibm-linux
-       TargetPlatform=s390-ibm-linux #hack
-       BuildPlatform=s390-ibm-linux #hack
-        HostPlatform_CPP='s390_ibm_linux'
-        HostArch_CPP='s390'
-        HostVendor_CPP='ibm'
-        HostOS_CPP='linux'
-        ;;
-sparc-sun-sunos4*)
-       HostPlatform=sparc-sun-sunos4
-       TargetPlatform=sparc-sun-sunos4 #hack
-       BuildPlatform=sparc-sun-sunos4 #hack
-        HostPlatform_CPP='sparc_sun_sunos4'
-        HostArch_CPP='sparc'
-        HostVendor_CPP='sun'
-        HostOS_CPP='sunos4'
-        ;;
-sparc-sun-solaris2*)
-       HostPlatform=sparc-sun-solaris2
-       TargetPlatform=sparc-sun-solaris2 #hack
-       BuildPlatform=sparc-sun-solaris2 #hack
-        HostPlatform_CPP='sparc_sun_solaris2'
-        HostArch_CPP='sparc'
-        HostVendor_CPP='sun'
-        HostOS_CPP='solaris2'
+soext='.so'
+case $host in
+*-unknown-cygwin32)
+    AC_MSG_WARN([GHC does not support the Cygwin target at the moment])
+    AC_MSG_WARN([I'm assuming you wanted to build for i386-unknown-mingw32])
+    exit 1
+    ;;
+*-unknown-mingw32)
+    exeext='.exe'
+    soext='.dll'
+    ;;
+i386-apple-darwin|powerpc-apple-darwin)
+    soext='.dylib'
+    ;;
+x86_64-apple-darwin)
+    soext='.dylib'
+    CFLAGS="$CFLAGS -m64"
+    LDFLAGS="$LDFLAGS -m64"
+    ;;
+esac
+
+checkArch() {
+    case $1 in
+    alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|sparc|sparc64|vax|x86_64)
         ;;
-sparc*-linux*)
-        HostPlatform=sparc-unknown-linux
-        TargetPlatform=sparc-unknown-linux
-        BuildPlatform=sparc-unknown-linux
-        HostPlatform_CPP='sparc_unknown_linux'
-        HostArch_CPP='sparc'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='linux'
+    *)
+        echo "Unknown arch $1"
+        exit 1
         ;;
-sparc-*-openbsd*)
-        HostPlatform=sparc-unknown-openbsd
-        TargetPlatform=sparc-unknown-openbsd
-        BuildPlatform=sparc-unknown-openbsd
-        HostPlatform_CPP='sparc_unknown_openbsd'
-        HostArch_CPP='sparc'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='openbsd'
+    esac
+}
+
+checkVendor() {
+    case $1 in
+    dec|unknown|hp|apple|next|sun|sgi|ibm)
         ;;
-sparc64-*-openbsd*)
-        HostPlatform=sparc64-unknown-openbsd
-        TargetPlatform=sparc64-unknown-openbsd
-        BuildPlatform=sparc64-unknown-openbsd
-        HostPlatform_CPP='sparc64_unknown_openbsd'
-        HostArch_CPP='sparc64'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='openbsd'
+    *)
+        echo "Unknown vendor $1"
+        exit 1
         ;;
-vax-*-openbsd*)
-        HostPlatform=vax-unknown-openbsd
-        TargetPlatform=vax-unknown-openbsd
-        BuildPlatform=vax-unknown-openbsd
-        HostPlatform_CPP='vax_unknown_openbsd'
-        HostArch_CPP='vax'
-        HostVendor_CPP='unknown'
-        HostOS_CPP='openbsd'
+    esac
+}
+
+checkOS() {
+    case $1 in
+    linux|freebsd|netbsd|openbsd|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
         ;;
-*)
-        echo "Unrecognised platform: $HostPlatform"
+    *)
+        echo "Unknown OS $1"
         exit 1
         ;;
-esac
-echo "Canonicalised to: $HostPlatform"
-test  x"$HostPlatform" != x"$TargetPlatform" && echo "Target platform set to $TargetPlatform"
-test  x"$BuildPlatform" != x"$HostPlatform"  && echo "Build platform set to $BuildPlatform"
-
-BuildPlatform_CPP=$HostPlatform_CPP
-TargetPlatform_CPP=$HostPlatform_CPP
-BuildArch_CPP=$HostArch_CPP
-TargetArch_CPP=$HostArch_CPP
-BuildOS_CPP=$HostOS_CPP
-HostOS_Full=$host_os
-TargetOS_CPP=$HostOS_CPP
-BuildVendor_CPP=$HostVendor_CPP
-TargetVendor_CPP=$HostVendor_CPP
+    esac
+}
+
+BuildPlatform=$build
+BuildArch=`echo "$build" | sed 's/-.*//'`
+BuildVendor=`echo "$build" | sed -e 's/.*-\(.*\)-.*/\1/'`
+BuildOS=`echo "$build" | sed 's/.*-//'`
+BuildPlatform_CPP=`echo "$BuildPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'`
+BuildArch_CPP=`    echo "$BuildArch"     | sed -e 's/\./_/g' -e 's/-/_/g'`
+BuildVendor_CPP=`  echo "$BuildVendor"   | sed -e 's/\./_/g' -e 's/-/_/g'`
+BuildOS_CPP=`      echo "$BuildOS"       | sed -e 's/\./_/g' -e 's/-/_/g'`
+
+checkArch "$BuildArch"
+checkVendor "$BuildVendor"
+checkOS "$BuildOS"
+
+HostPlatform=$host
+HostArch=`echo "$host" | sed 's/-.*//'`
+HostVendor=`echo "$host" | sed -e 's/.*-\(.*\)-.*/\1/'`
+HostOS=`echo "$host" | sed 's/.*-//'`
+HostPlatform_CPP=`echo "$HostPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'`
+HostArch_CPP=`    echo "$HostArch"     | sed -e 's/\./_/g' -e 's/-/_/g'`
+HostVendor_CPP=`  echo "$HostVendor"   | sed -e 's/\./_/g' -e 's/-/_/g'`
+HostOS_CPP=`      echo "$HostOS"       | sed -e 's/\./_/g' -e 's/-/_/g'`
+
+checkArch "$HostArch"
+checkVendor "$HostVendor"
+checkOS "$HostOS"
+
+TargetPlatform=$target
+TargetArch=`echo "$target" | sed 's/-.*//'`
+TargetVendor=`echo "$target" | sed -e 's/.*-\(.*\)-.*/\1/'`
+TargetOS=`echo "$target" | sed 's/.*-//'`
+TargetPlatform_CPP=`echo "$TargetPlatform" | sed -e 's/\./_/g' -e 's/-/_/g'`
+TargetArch_CPP=`    echo "$TargetArch"     | sed -e 's/\./_/g' -e 's/-/_/g'`
+TargetVendor_CPP=`  echo "$TargetVendor"   | sed -e 's/\./_/g' -e 's/-/_/g'`
+TargetOS_CPP=`      echo "$TargetOS"       | sed -e 's/\./_/g' -e 's/-/_/g'`
+
+checkArch "$TargetArch"
+checkVendor "$TargetVendor"
+checkOS "$TargetOS"
 
 AC_SUBST(BuildPlatform)
 AC_SUBST(HostPlatform)
@@ -537,7 +339,6 @@ AC_SUBST(BuildArch_CPP)
 AC_SUBST(TargetArch_CPP)
 
 AC_SUBST(HostOS_CPP)
-AC_SUBST(HostOS_Full)
 AC_SUBST(BuildOS_CPP)
 AC_SUBST(TargetOS_CPP)
 
@@ -546,100 +347,17 @@ AC_SUBST(BuildVendor_CPP)
 AC_SUBST(TargetVendor_CPP)
 
 AC_SUBST(exeext)
-
-dnl --------------------------------------------------------------
-dnl * Calculate absolute path to build tree
-dnl --------------------------------------------------------------
-
-AC_MSG_CHECKING(for path to top of build tree)
-
-hardtop=`pwd`
-
-dnl Remove common automounter nonsense
-dnl
-hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^//\(.\)/|\1:/|' `
-
-dnl Find 'hardtop_plat', the native format for 'hardtop' 
-dnl (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes being escaped).
-dnl
-dnl Note OSTYPE: On Cygwin we need to use 'cygpath' to convert /cygdrive/c/foo to c:/foo
-dnl             but we must not do that if we aren't building using Cygwin (notably msys), 
-dnl             because cygpath doesn't exist.  It seems that 'bash' sets OSTYPE to 'cygwin' 
-dnl             or 'msys' respectively, but cygwin's 'sh' does not.  So we hackily assume
-dnl             that if the shell hasn't set it to 'msys' then we must be in Cygwin.  Sigh.
-dnl
-dnl             The Right Thing is probably to test $BuildPlatform instead, but we are sloppy 
-dnl             about setting that correctly at the moment, so we just work around for now.
-dnl
-dnl             The quotes round "$(OSTYPE)" are essential, for the Cygwin-sh case where OSTYPE
-dnl             is not set.
-case $HostPlatform in
-  i386-unknown-mingw32 | i386-unknown-cygwin32)
-        if test "${OSTYPE}" != "msys" 
-          then
-            # convert $hardtop to a path that mingw will understand too
-            cyghardtop=${hardtop}
-            hardtop=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@/@g'`
-            hardtop_plat=`cygpath -w ${cyghardtop} | sed -e 's@\\\\@\\\\\\\\@g'`
-          else
-            hardtop_plat=${hardtop}
-        fi
-        ;;
-  *)
-       hardtop_plat=${hardtop}
-       ;;
-esac
-AC_SUBST(hardtop)
-AC_SUBST(hardtop_plat)
-
-AC_MSG_RESULT(${hardtop})
-
-# We don't support building in directories with spaces.
-case "$hardtop" in
-  *' '*) AC_MSG_ERROR([
-   The build system does not support building in a directory containing
-   space characters.  Suggestion: move the build tree somewhere else.])
- ;;
-esac
-
-dnl --------------------------------------------------------------
-dnl * Project specific configuration options
-dnl --------------------------------------------------------------
-dnl What follows is a bunch of options that can either be configured
-dnl through command line options to the configure script or by
-dnl supplying defns in the build tree's mk/build.mk. Having the option to
-dnl use either is considered a Feature.
-
-dnl ** What command to use to compile compiler sources ?
-dnl --------------------------------------------------------------
-
-AC_ARG_WITH([ghc],
-[AC_HELP_STRING([--with-ghc=ARG],
-  [Use ARG as the path to GHC  [default=autodetect]])],
-  [WithGhc="$withval"],
-  [if test "$GHC" = ""; then
-    AC_PATH_PROG([GHC], [ghc])
-  fi
-  WithGhc="$GHC"])
-AC_SUBST([WithGhc])
+AC_SUBST(soext)
 
 AC_ARG_WITH(hc,
 [AC_HELP_STRING([--with-hc=ARG],
         [Use ARG as the path to the compiler for compiling ordinary
-        Haskell code  (default= value of --with-ghc)])],
+         Haskell code  (default= value of --with-ghc)])],
 [WithHc="$withval"],
 [WithHc=$WithGhc]
 )
 AC_SUBST(WithHc)
 
-if test "$WithGhc" != ""; then
-  FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])dnl
-  AC_SUBST(GhcVersion)dnl
-  AC_SUBST(GhcMajVersion)dnl
-  AC_SUBST(GhcMinVersion)dnl
-  AC_SUBST(GhcPatchLevel)dnl
-fi
-
 AC_PATH_PROGS(NHC,nhc nhc98)
 AC_PATH_PROG(HBC,hbc)
 
@@ -649,13 +367,12 @@ AC_ARG_WITH(gcc,
 [AC_HELP_STRING([--with-gcc=ARG],
         [Use ARG as the path to GCC  [default=autodetect]])],
 [WhatGccIsCalled="$withval"
- if test "x$HostPlatform" = "xi386-unknown-mingw32"
-    then
-       if test "${OSTYPE}" != "msys"
-         then
-         # Canonicalise to <drive>:/path/to/gcc
-         withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' `
-       fi
+ if test "x$HostPlatform"  = "xi386-unknown-mingw32" && \
+    test "${OSTYPE}"      != "msys"                  && \
+    test "${withval}"     != ""
+ then
+     # Canonicalise to <drive>:/path/to/gcc
+     withval=`cygpath -m ${withval}`
  fi;
  CC="$withval"
  export CC
@@ -664,80 +381,88 @@ AC_ARG_WITH(gcc,
 )
 AC_SUBST(WhatGccIsCalled)
 
-dnl ** Booting from .hc files?
+dnl ** Which ld to use?
 dnl --------------------------------------------------------------
-AC_ARG_ENABLE(hc-boot,
-[AC_HELP_STRING([--enable-hc-boot],
-[Boot the Glasgow Haskell Compiler from intermediate .hc files.
- (This option is mostly of interest to porters.) [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-       BootingFromHc=YES
-  else
-       BootingFromHc=NO
-  fi
-],
-[BootingFromHc=NO]
+AC_ARG_WITH(ld,
+[AC_HELP_STRING([--with-ld=ARG],
+        [Use ARG as the path to LD  [default=autodetect]])],
+[if test "x$HostPlatform"  = "xi386-unknown-mingw32" && \
+    test "${OSTYPE}"      != "msys"                  && \
+    test "${withval}"     != ""
+ then
+     # Canonicalise to <drive>:/path/to/ld
+     withval=`cygpath -m ${withval}`
+ fi;
+ LD=$withval
+ FP_PROG_LD([$LD])
+ ],
+ [FP_PROG_LD()]
 )
-AC_SUBST(BootingFromHc)
 
-dnl ** Booting from unregisterised .hc files?
+dnl ** Build shared and/or static libs?
 dnl --------------------------------------------------------------
-AC_ARG_ENABLE(hc-boot-unregisterised,
-[AC_HELP_STRING([--enable-hc-boot-unregisterised],
-[ With --enable-hc-boot, treat the intermediate .hc files as
- unregisterised rather than registerised code.
- (This option is mostly of interest to porters.) [default=no]])],
+AC_ARG_ENABLE(shared,
+[AC_HELP_STRING([--enable-shared],
+[Build shared libraries, if available (EXPERIMENTAL, non-working). [default=no]])],
 [ if test x"$enableval" = x"yes"; then
-       BootingFromUnregisterisedHc=YES
+        AC_MSG_WARN([--enable-shared is experimental and not fully supported at this time])
+        BuildSharedLibs=YES
   else
-       BootingFromUnregisterisedHc=NO
+        BuildSharedLibs=NO
   fi
 ],
-[BootingFromUnregisterisedHc=NO]
+[BuildSharedLibs=NO]
 )
-AC_SUBST(BootingFromUnregisterisedHc)
+AC_SUBST(BuildSharedLibs)
+
+# ToDo later:
+# AC_ARG_ENABLE(static,
+# [AC_HELP_STRING([--enable-static],
+# [Build static libraries. [default=yes]])],
+# [ if test x"$enableval" = x"yes"; then
+#         BuildStaticLibs=YES
+#   else
+#         BuildStaticLibs=NO
+#   fi
+# ],
+# [BuildStaticLibs=YES]
+# )
+# AC_SUBST(BuildStaticLibs)
 
-if test "$BootingFromHc" = "NO"; then
-if test "$BootingFromUnregisterisedHc" = "YES"; then
-AC_MSG_ERROR([--enable-hc-boot-unregisterised requires --enable-hc-boot.])
-fi;
-fi;
-
-dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on
-if test "$BootingFromHc" = "NO" -a "$WithGhc" = "" -a -d "$srcdir/ghc"; then
-AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
-fi;
-
-dnl ** --enable-threaded-rts (not used any more)
+dnl ** Booting from .hc files?
 dnl --------------------------------------------------------------
-AC_ARG_ENABLE(threaded-rts,
-[AC_HELP_STRING([--enable-threaded-rts],
-[DEPRECATED (backwards compatibility only). [default=no]])],
+AC_ARG_ENABLE(hc-boot,
+[AC_HELP_STRING([--enable-hc-boot],
+[Boot the Glasgow Haskell Compiler from intermediate .hc files.
+ (This option is mostly of interest to porters.) [default=no]])],
 [ if test x"$enableval" = x"yes"; then
-       ThreadedRts=YES
+        BootingFromHc=YES
   else
-       ThreadedRts=NO
+        BootingFromHc=NO
   fi
 ],
-[ThreadedRts=NO]
+[BootingFromHc=NO]
 )
-AC_SUBST(ThreadedRts)
+AC_SUBST(BootingFromHc)
+
+# This uses GHC, so put it after the "GHC is required" check above:
+FP_FIND_ROOT
 
 dnl ** Enable the construction of Win32 DLLs?
 dnl --------------------------------------------------------------
 dnl
 dnl [ The ability to build the RTS and libraries as separate DLLs used
-dnl   to be supported, but isn't currently (updates to the RTS, compiler 
+dnl   to be supported, but isn't currently (updates to the RTS, compiler
 dnl   and build system would be required to bring it back again.)
 dnl   Hence, exposing it as an option is false advertisement, so better
 dnl   disable it to avoid confusion (but leave it commented-out rather
-dnl   than removed in order to remind ourselves to bring back the 
+dnl   than removed in order to remind ourselves to bring back the
 dnl   feature at some stage.) ]
 dnl
 dnl AC_ARG_ENABLE(win32-dlls,
 dnl [  --enable-win32-dlls
 dnl         If on a Win32 platform running mingw32/cygwin, enable the
-dnl    construction of DLLs containing ghc-compiled code.
+dnl         construction of DLLs containing ghc-compiled code.
 dnl ],
 dnl [
 dnl case $HostOS_CPP in
@@ -756,34 +481,22 @@ dnl if test x"$EnableWin32DLLs" = "xYES" ; then
 dnl  AC_DEFINE(HAVE_WIN32_DLL_SUPPORT)
 dnl fi
 
-dnl ** Enable the building of the ObjectIO?
+dnl ** Mac OS X: explicit deployment target
 dnl --------------------------------------------------------------
-AC_ARG_ENABLE(objectio,
-[AC_HELP_STRING([--enable-objectio],
-[Build ObjectIO, a portable GUI library for Haskell. [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-       GhcLibsWithObjectIO=YES
-  else
-       GhcLibsWithObjectIO=NO
-  fi
-],
-[GhcLibsWithObjectIO=NO]
+AC_ARG_WITH([macosx-deployment-target],
+[AC_HELP_STRING([--with-macosx-deployment-target=VERSION],
+        [Build for Mac OS VERSION and higher  (default= version of build host)])],
+[FP_MACOSX_DEPLOYMENT_TARGET="$withval"
+ if test "x$TargetOS_CPP-$TargetVendor_CPP" != "xdarwin-apple"; then
+   # ignore everywhere, but on Mac OS
+   AC_MSG_WARN([--macosx-deployment-target is only available on Mac OS X])
+   FP_MACOSX_DEPLOYMENT_TARGET=none
+ fi],
+[FP_MACOSX_DEPLOYMENT_TARGET=none]
 )
-AC_SUBST(GhcLibsWithObjectIO)
-
-dnl ** .NET interop support?
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(dotnet,
-[AC_HELP_STRING([--enable-dotnet],
-[Build .NET interop layer. [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-       DotnetSupport=YES; AC_DEFINE([WANT_DOTNET_SUPPORT], [1], [Define to 1 if you want to include .NET interop support.])
-  else 
-       DotnetSupport=NO
-  fi],
-[DotnetSupport=NO]
-)
-AC_SUBST(DotnetSupport)
+FP_CHECK_MACOSX_DEPLOYMENT_TARGET
+AC_SUBST(MACOSX_DEPLOYMENT_VERSION)
+AC_SUBST(MACOSX_DEPLOYMENT_SDK)
 
 dnl --------------------------------------------------------------
 dnl End of configure script option section
@@ -841,6 +554,7 @@ dnl     If gcc, make sure it's at least 2.1
 dnl
 FP_HAVE_GCC
 FP_MINGW_GCC
+FP_GCC_EXTRA_FLAGS
 
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
@@ -848,11 +562,11 @@ AC_PROG_CPP
 dnl ** Without optimization some INLINE trickery fails for GHCi
 SRC_CC_OPTS="-O"
 
-dnl ** Try to add -mno-cygwin to the C compiler options
-FP_CHECK_FLAG([-mno-cygwin], [
-SRC_CC_OPTS="-mno-cygwin $SRC_CC_OPTS"
-CPPFLAGS="-mno-cygwin $CPPFLAGS"])
+SRC_CC_OPTS="$SRC_CC_OPTS $CFLAGS"
+SRC_LD_OPTS="$SRC_LD_OPTS $LDFLAGS"
+
 AC_SUBST(SRC_CC_OPTS)
+AC_SUBST(SRC_LD_OPTS)
 
 dnl ** figure out how to do context diffs
 FP_PROG_CONTEXT_DIFF
@@ -863,6 +577,9 @@ FP_PROG_FIND
 dnl ** Find sort command (for the benefit of Win32 environs)
 FP_PROG_SORT
 
+dnl Let's make sure install-sh is executable here.  If we got it from
+dnl a darcs repo, it might not be (see bug #978).
+chmod +x install-sh
 dnl ** figure out how to do a BSD-ish install
 AC_PROG_INSTALL
 
@@ -888,74 +605,45 @@ dnl ** check for tar
 dnl   if GNU tar is named gtar, look for it first.
 AC_PATH_PROGS(TarCmd,gtar tar,tar)
 
+dnl ** check for patch
+dnl if GNU patch is named gpatch, look for it first
+AC_PATH_PROGS(PatchCmd,gpatch patch, patch)
+
+AC_PATH_PROG(HSCOLOUR,HsColour)
+# HsColour is passed to Cabal, so we need a native path
+if test "x$HostPlatform"  = "xi386-unknown-mingw32" && \
+   test "${OSTYPE}"      != "msys"                  && \
+   test "${HSCOLOUR}"    != ""
+then
+    # Canonicalise to <drive>:/path/to/gcc
+    HSCOLOUR=`cygpath -m ${HSCOLOUR}`
+fi
+
 dnl ** check for DocBook toolchain
 FP_CHECK_DOCBOOK_DTD
-FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl])
-FP_PROG_FO_PROCESSOR
+FP_DOCBOOK_XSL
+FP_PROG_DBLATEX
+
+FP_PROG_HSTAGS
 
 dnl ** check for ghc-pkg command
 FP_PROG_GHC_PKG
 
-AC_ARG_WITH(greencard,
-[AC_HELP_STRING([--with-greencard=ARG],
-        [Use ARG as the path to greencard  [default=autodetct]])],
-[
-GreenCardCmd=$withval;
-FPTOOLS_GREENCARD(3.00)
-]
-)
-
-AC_ARG_ENABLE(src-tree-happy,
-[AC_HELP_STRING([--enable-src-tree-happy],
-       [Build and use source tree (fptools/happy) version of Happy. 
-        [default=autodetect]])],
-[ if test x"$enableval" = x"yes"; then
-       UseSrcTreeHappy=YES
-  else
-       UseSrcTreeHappy=NO
-  fi
-],
-[UseSrcTreeHappy=NO]
-)
 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
 FPTOOLS_HAPPY
 fi;
 
-AC_ARG_ENABLE(src-tree-haddock,
-[AC_HELP_STRING([--enable-src-tree-haddock],
-        [Build and use source tree (fptools/haddock) version of Haddock.
-        [default=autodetect]])],
-[ if test x"$enableval" = x"yes"; then
-       UseSrcTreeHaddock=YES
-  else
-       UseSrcTreeHaddock=NO
-  fi
-],
-[UseSrcTreeHaddock=NO]
-)
-dnl ** check for installed haddock
-FPTOOLS_HADDOCK
-
-AC_ARG_ENABLE(src-tree-alex,
-[AC_HELP_STRING([--enable-src-tree-alex],
-        [Build and use source tree (fptools/alex) version of Alex.
-        [default=autodetect]])],
-[ if test x"$enableval" = x"yes"; then
-       UseSrcTreeAlex=YES
-  else
-       UseSrcTreeAlex=NO
-  fi
-],
-[UseSrcTreeAlex=NO]
-)
 dnl ** check for installed alex binary + version
 dnl    (don't do it if we're booting from .hc files though.)
 if test "$BootingFromHc" = "NO"; then
 FPTOOLS_ALEX
 fi;
 
+dnl Check we have an acceptable version of windres
+FPTOOLS_WINDRES
+
 dnl --------------------------------------------------
 dnl ### program checking section ends here ###
 dnl --------------------------------------------------
@@ -972,29 +660,11 @@ dnl    off_t, because it will affect the result of that test.
 AC_SYS_LARGEFILE
 
 dnl ** check for specific header (.h) files that we are interested in
-AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h])
-
-AC_CHECK_HEADER([readline/readline.h], [HaveReadlineReadlineH=YES], [HaveReadlineReadlineH=NO])
-AC_CHECK_HEADER([readline/history.h], [HaveReadlineHistoryH=YES], [HaveReadlineHistoryH=NO])
-
-if test $HaveReadlineReadlineH = YES && test $HaveReadlineHistoryH = YES ; then
-  GhcLibsWithReadline=YES
-  AC_DEFINE([HAVE_READLINE_HEADERS], [1], [Define to 1 if readline/readline.h and readline/history.h exist.])
-else
-  GhcLibsWithReadline=NO
-  AC_DEFINE([HAVE_READLINE_HEADERS], [0], [Define to 1 if readline/readline.h and readline/history.h exist.])
-fi
-AC_SUBST(GhcLibsWithReadline)
+AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/mman.h sys/resource.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h sched.h])
 
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
 AC_HEADER_TIME
 
-dnl ** how do we get a timezone name, and UTC offset ?
-AC_STRUCT_TIMEZONE
-
-dnl ** do we have altzone?
-FP_DECL_ALTZONE
-
 dnl ** do we have long longs?
 AC_CHECK_TYPES([long long])
 
@@ -1068,7 +738,27 @@ fi
 
 dnl ** check for more functions
 dnl ** The following have been verified to be used in ghc/, but might be used somewhere else, too.
-AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r])
+AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r, sched_setaffinity])
+
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/time.h>
+int main(void) {
+  struct itimerval tval;
+  tval.it_value.tv_sec = 1;
+  tval.it_value.tv_usec = 0;
+  tval.it_interval = tval.it_value;
+  return setitimer(ITIMER_VIRTUAL, &tval, (void*)0) != 0;
+}
+],[AC_DEFINE([HAVE_SETITIMER_VIRTUAL], [1], [Define to 1 if setitimer accepts ITIMER_VIRTUAL, 0 else.])])
+
+dnl ** On OS X 10.4 (at least), time.h doesn't declare ctime_r if
+dnl ** _POSIX_C_SOURCE is defined
+AC_CHECK_DECLS([ctime_r], , ,
+[#define _POSIX_SOURCE 1
+#define _POSIX_C_SOURCE 199506L
+#include <time.h>])
+
 dnl ** For ghc/rts/gmp:
 AC_CHECK_FUNCS([getpagesize])
 
@@ -1076,22 +766,27 @@ dnl ** check whether this machine has gmp3 installed
 AC_CHECK_LIB(gmp,  __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
   AC_CHECK_LIB(gmp3, __gmpz_fdiv_qr,  HaveLibGmp=YES; LibGmp=gmp3,
     HaveLibGmp=NO; LibGmp=not-installed))
+  if test $HaveLibGmp = YES; then
+    AC_DEFINE([HAVE_LIB_GMP], [1], [Define to 1 if GMP library is installed.])
+  fi;
 AC_SUBST(HaveLibGmp)
 AC_SUBST(LibGmp)
 
 dnl ** (Mac OS X only: check for GMP.framework)
 HaveFrameworkGMP=NO
-if test $HostPlatform = "powerpc-apple-darwin"; then
- AC_MSG_CHECKING([for GMP.framework])
- save_libs="$LIBS"
- LIBS="-framework GMP"
- AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
- if test $HaveFrameworkGMP = YES; then
-  AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
- fi;
- LIBS="$save_libs"
- AC_MSG_RESULT([$HaveFrameworkGMP])
-fi;
+case $HostPlatform in
+*-apple-darwin)
+    AC_MSG_CHECKING([for GMP.framework])
+    save_libs="$LIBS"
+    LIBS="-framework GMP"
+    AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
+    if test $HaveFrameworkGMP = YES; then
+      AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
+    fi;
+    LIBS="$save_libs"
+    AC_MSG_RESULT([$HaveFrameworkGMP])
+    ;;
+esac
 AC_SUBST(HaveFrameworkGMP)
 
 dnl ** check for mingwex library
@@ -1113,40 +808,6 @@ dnl    the order of these tests matters: bfd needs liberty
 AC_CHECK_LIB(iberty, xmalloc)
 AC_CHECK_LIB(bfd,    bfd_init)
 
-dnl ** check for readline, for Hugs and hslibs' Readline
-dnl ncurses supersedes termcap and curses, but for compatibility,
-dnl we have to check for all...
-AC_CHECK_LIB(ncurses, tputs, HaveLibTermcap=YES; LibTermcap=ncurses,
-  AC_CHECK_LIB(termcap, tputs, HaveLibTermcap=YES; LibTermcap=termcap,
-    AC_CHECK_LIB(curses, tputs, HaveLibTermcap=YES; LibTermcap=curses,
-      HaveLibTermcap=NO; LibTermcap=not-installed)))
-
-if test $HaveLibTermcap = YES ; then
-  LIBS="-l$LibTermcap $LIBS"
-  AC_CHECK_LIB(readline, readline, HaveLibReadline=YES, HaveLibReadline=NO)
-fi
-
-if test $HaveLibTermcap = YES && test x"$HaveLibReadline" = xYES ; then
-  AC_DEFINE([HAVE_READLINE_LIBS], [1], [Define to 1 if readline plus any additional libs needed for it exist.])
-  LibsReadline="readline $LibTermcap"
-else
-  AC_DEFINE([HAVE_READLINE_LIBS], [0], [Define to 1 if readline plus any additional libs needed for it exist.])
-  LibsReadline=
-fi
-AC_SUBST(LibsReadline)
-
-if test "$HaveLibReadline"; then
-  AC_CHECK_LIB(readline, rl_erase_empty_line,
-    [AC_DEFINE([HAVE_READLINE_4], [1], [Define to 1 if readline has version >= 4.0.])],
-    [AC_DEFINE([HAVE_READLINE_4], [0], [Define to 1 if readline has version >= 4.0.])])
-  AC_CHECK_LIB(readline, rl_free_undo_list,
-    [AC_DEFINE([HAVE_READLINE_4_2], [1], [Define to 1 if readline has version >= 4.2.])],
-    [AC_DEFINE([HAVE_READLINE_4_2], [0], [Define to 1 if readline has version >= 4.2.])])
-else
-  AC_DEFINE([HAVE_READLINE_4], [0], [Define to 1 if readline has version >= 4.0.])
-  AC_DEFINE([HAVE_READLINE_4_2], [0], [Define to 1 if readline has version >= 4.2.])
-fi
-
 dnl ** check for math library
 AC_CHECK_FUNC(atan,[fp_libm_not_needed=yes;LIBM=],[fp_libm_not_needed=dunno])
 if test x"$fp_libm_not_needed" = xdunno; then
@@ -1160,10 +821,10 @@ dnl ################################################################
 
 dnl ** check whether we need -ldl to get dlopen()
 
-AC_CHECK_LIB(dl, dlopen, 
+AC_CHECK_LIB(dl, dlopen,
     [HaveLibDL=YES
      AC_DEFINE([HAVE_LIBDL], [1], [Define to 1 if you need -ldl to get dlopen().])
-     LIBS="$LIBS -ldl"], 
+     LIBS="$LIBS -ldl"],
     [HaveLibDL=NO])
 AC_SUBST(HaveLibDL)
 
@@ -1182,6 +843,7 @@ AC_C_CONST
 
 dnl ** are we big endian?
 AC_C_BIGENDIAN
+FPTOOLS_FLOAT_WORD_ORDER_BIGENDIAN
 
 dnl ** check for leading underscores in symbol names
 FP_LEADING_UNDERSCORE
@@ -1195,25 +857,34 @@ dnl    (.subsections-via-symbols assembler directive)
 
 
 AC_MSG_CHECKING(for .subsections_via_symbols)
-AC_TRY_COMPILE(,[__asm__ (".subsections_via_symbols");],
-    [
-        AC_MSG_RESULT(yes)
-        AC_DEFINE([HAVE_SUBSECTIONS_VIA_SYMBOLS],[1],
-            [Define to 1 if Apple-style dead-stripping is supported.])
+AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([], [__asm__ (".subsections_via_symbols");])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE([HAVE_SUBSECTIONS_VIA_SYMBOLS],[1],
+               [Define to 1 if Apple-style dead-stripping is supported.])
     ],
-    [
-        AC_MSG_RESULT(no)
-        AC_DEFINE([HAVE_SUBSECTIONS_VIA_SYMBOLS],[0],
-            [Define to 1 if Apple-style dead-stripping is supported.])
-    ])
+    [AC_MSG_RESULT(no)])
+
+dnl *** check for GNU non-executable stack note support (ELF only)
+dnl     (.section .note.GNU-stack,"",@progbits)
+
+AC_MSG_CHECKING(for GNU non-executable stack support)
+AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([__asm__ (".section .note.GNU-stack,\"\",@progbits");], [0])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE([HAVE_GNU_NONEXEC_STACK],[1],
+               [Define to 1 if GNU non-executable stack notes are supported.])
+    ],
+    [AC_MSG_RESULT(no)])
 
 dnl ** check for librt
 AC_CHECK_LIB(rt, clock_gettime)
-AC_CHECK_FUNCS(clock_gettime)
+AC_CHECK_FUNCS(clock_gettime timer_create timer_settime)
+FP_CHECK_TIMER_CREATE
 
 dnl ** check for Apple's "interesting" long double compatibility scheme
-AC_MSG_CHECKING(for printf$LDBLStub)
-AC_TRY_LINK_FUNC(printf$LSBLStub,
+AC_MSG_CHECKING(for printf\$LDBLStub)
+AC_TRY_LINK_FUNC(printf\$LDBLStub,
     [
         AC_MSG_RESULT(yes)
         AC_DEFINE([HAVE_PRINTF_LDBLSTUB],[1],
@@ -1225,7 +896,134 @@ AC_TRY_LINK_FUNC(printf$LSBLStub,
             [Define to 1 if we have printf$LDBLStub (Apple Mac OS >= 10.4, PPC).])
     ])
 
+# test for GTK+
+AC_PATH_PROGS([GTK_CONFIG], [pkg-config])
+if test -n "$GTK_CONFIG"; then
+  if $GTK_CONFIG gtk+-2.0 --atleast-version=2.0; then
+    GTK_CONFIG="$GTK_CONFIG gtk+-2.0"
+  else
+    AC_MSG_WARN([GTK+ not usable, need at least version 2.0])
+    GTK_CONFIG=
+  fi
+fi
+AC_SUBST([GTK_CONFIG])
+
+#Checking for PAPI
+AC_CHECK_LIB(papi, PAPI_library_init, HavePapiLib=YES, HavePapiLib=NO)
+AC_CHECK_HEADER([papi.h], [HavePapiHeader=YES], [HavePapiHeader=NO])
+AC_SUBST(HavePapiLib)
+AC_SUBST(HavePapiHeader)
+
+if test "$HavePapiLib" = "YES" -a "$HavePapiHeader" = "YES"; then
+   HavePapi=YES
+else
+   HavePapi=NO
+fi
+AC_SUBST(HavePapi)
+
+if test "$HAVE_DOCBOOK_XSL" = "NO" ||
+   test "$XsltprocCmd" = ""
+then
+    BUILD_DOCBOOK_HTML=NO
+else
+    BUILD_DOCBOOK_HTML=YES
+fi
+AC_SUBST(BUILD_DOCBOOK_HTML)
+
+if test "$DblatexCmd" = ""
+then
+    BUILD_DOCBOOK_PS=NO
+    BUILD_DOCBOOK_PDF=NO
+else
+    BUILD_DOCBOOK_PS=YES
+    BUILD_DOCBOOK_PDF=YES
+fi
+AC_SUBST(BUILD_DOCBOOK_PS)
+AC_SUBST(BUILD_DOCBOOK_PDF)
 
-AC_CONFIG_FILES([mk/config.mk])
+AC_CONFIG_FILES([mk/config.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT
+
+# We get caught by
+#     http://savannah.gnu.org/bugs/index.php?1516
+#     $(eval ...) inside conditionals causes errors
+# with make 3.80, so warn the user if it looks like they're about to
+# try to use it.
+# We would use "grep -q" here, but Solaris's grep doesn't support it.
+checkMake380() {
+    if $1 --version 2>&1 | head -1 | grep 'GNU Make 3\.80' > /dev/null
+    then
+        echo
+        echo "WARNING: It looks like \"$1\" is GNU make 3.80."
+        echo "This version cannot be used to build GHC."
+        echo "Please use GNU make >= 3.81."
+    fi
+}
+
+checkMake380 make
+checkMake380 gmake
+
+echo ["
+----------------------------------------------------------------------
+Configure completed successfully.
+
+   Building GHC version  : $ProjectVersion
+
+   Build platform        : $BuildPlatform
+   Host platform         : $HostPlatform
+   Target platform       : $TargetPlatform
+"]
+
+if test "$BootingFromHc" = "YES"; then
+echo ["\
+   Bootstrapping from HC files.
+"]
+else
+echo ["\
+   Bootstrapping using   : $WithGhc
+      which is version   : $GhcVersion
+"]
+fi
+
+echo ["\
+   Using GCC             : $WhatGccIsCalled
+      which is version   : $GccVersion
+
+   ld       : $LdCmd
+   Happy    : $HappyCmd ($HappyVersion)
+   Alex     : $AlexCmd ($AlexVersion)
+   Python   : $PythonCmd
+   Perl     : $PerlCmd
+   dblatex  : $DblatexCmd
+   xsltproc : $XsltprocCmd"]
+
+if test "$HSCOLOUR" = ""; then
+echo ["
+   HsColour was not found; documentation will not contain source links
+"]
+else
+echo ["\
+   HsColour : $HSCOLOUR
+"]
+fi
+
+echo ["\
+   Building DocBook HTML documentation : $BUILD_DOCBOOK_HTML
+   Building DocBook PS documentation   : $BUILD_DOCBOOK_PS
+   Building DocBook PDF documentation  : $BUILD_DOCBOOK_PDF
+
+   Building shared libraries           : $BuildSharedLibs"]
+
+echo ["----------------------------------------------------------------------
+"]
+
+echo "\
+For a standard build of GHC (fully optimised with profiling), type (g)make.
+
+To make changes to the default build configuration, copy the file
+mk/build.mk.sample to mk/build.mk, and edit the settings in there.
+
+For more information on how to configure your GHC build, see
+   http://hackage.haskell.org/trac/ghc/wiki/Building
+"