Add ghc and version number in .ident directive in NCG
[ghc.git] / configure.ac
index a8a484b..532aea3 100644 (file)
@@ -3,17 +3,22 @@ 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-1998
+# (c) The AQUA Project, Glasgow University, 1994-2004
 #
 # Configure script template for the Glasgow functional programming tools
 #
-# Process with 'autoconf' to get a working configure script.
+# Process with 'autoreconf' to get a working configure script.
 #
 # For the generated configure script, do "./configure --help" to
 # 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.5], [glasgow-haskell-bugs@haskell.org], [ghc])
+
+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])
@@ -21,14 +26,14 @@ AC_CONFIG_SRCDIR([mk/config.mk.in])
 dnl * We require autoconf version 2.52
 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)
+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])
+AC_CONFIG_SUBDIRS([libraries])
 
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
@@ -72,64 +77,73 @@ exeext=''
 # 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=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=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=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=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=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=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'
         ;;
+amd64-*-freebsd*)
+        HostPlatform=x86_64-unknown-freebsd
+        TargetPlatform=x86_64-unknown-freebsd
+        BuildPlatform=x86_64-unknown-freebsd
+        HostPlatform_CPP='x86_64_unknown_freebsd'
+        HostArch_CPP='x86_64'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='freebsd'
+        ;;
 arm*-linux*)
         HostPlatform=arm-unknown-linux # hack again
         TargetPlatform=arm-unknown-linux
         BuildPlatform=arm-unknown-linux
-        HostPlatform_CPP='arm_unknown_linux'                 
+        HostPlatform_CPP='arm_unknown_linux'
         HostArch_CPP='arm'
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
@@ -138,7 +152,7 @@ arm*-openbsd*)
         HostPlatform=arm-unknown-openbsd
         TargetPlatform=arm-unknown-openbsd
         BuildPlatform=arm-unknown-openbsd
-        HostPlatform_CPP='arm_unknown_openbsd'                 
+        HostPlatform_CPP='arm_unknown_openbsd'
         HostArch_CPP='arm'
         HostVendor_CPP='unknown'
         HostOS_CPP='openbsd'
@@ -147,111 +161,138 @@ hppa*-*-linux*)
         HostPlatform=hppa-unknown-linux # hack again
         TargetPlatform=hppa-unknown-linux
         BuildPlatform=hppa-unknown-linux
-        HostPlatform_CPP='hppa_unknown_linux'                
+        HostPlatform_CPP='hppa_unknown_linux'
         HostArch_CPP='hppa'
-        HostVendor_CPP='unknown'                             
+        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'                
+        HostPlatform_CPP='hppa_unknown_openbsd'
         HostArch_CPP='hppa'
-        HostVendor_CPP='unknown'                             
+        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=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=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=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-*-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=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=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=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=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=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=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'
+        exeext='.exe'
         ;;
 i[[3456]]86-*-mingw32*)
-       HostPlatform=i386-unknown-mingw32 # hack again
-       TargetPlatform=i386-unknown-mingw32
-       BuildPlatform=i386-unknown-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'
+        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'
+        ;;
+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
         ;;
 ia64-*-linux*)
         HostPlatform=ia64-unknown-linux # hack again
@@ -270,10 +311,10 @@ x86_64-*-linux*)
         HostArch_CPP='x86_64'
         HostVendor_CPP='unknown'
         HostOS_CPP='linux'
-       ;;
+        ;;
 m68k-*-linux*)
         HostPlatform=m68k-unknown-linux # hack again
-        TargetPlatform=m68k-unknown-linux                    
+        TargetPlatform=m68k-unknown-linux
         BuildPlatform=m68k-unknown-linux
         HostPlatform_CPP='m68k_unknown_linux'
         HostArch_CPP='m68k'
@@ -293,45 +334,45 @@ m68k-next-nextstep3)
         HostOS_CPP='nextstep3'
         ;;
 i[[3456]]86-next-nextstep3)
-       HostPlatform=i386-next-nextstep3 # hack again
-       TargetPlatform=i386-next-nextstep3
-       BuildPlatform=i386-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=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=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=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=m88k-unknown-openbsd
+        TargetPlatform=m88k-unknown-openbsd
+        BuildPlatform=m88k-unknown-openbsd
         HostPlatform_CPP='m88k_unknown_openbsd'
         HostArch_CPP='m88k'
         HostVendor_CPP='unknown'
@@ -353,41 +394,41 @@ mips-dec-ultrix*)
         HostOS_CPP='ultrix'
         ;;
 mips-sgi-irix*)
-       HostPlatform=mips-sgi-irix
-       TargetPlatform=mips-sgi-irix #hack
-       BuildPlatform=mips-sgi-irix #hack
+        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=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=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'
-       ;;
+        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
@@ -406,6 +447,16 @@ powerpc-unknown-openbsd*)
         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
@@ -416,18 +467,18 @@ s390-ibm-linux*)
         HostOS_CPP='linux'
         ;;
 sparc-sun-sunos4*)
-       HostPlatform=sparc-sun-sunos4
-       TargetPlatform=sparc-sun-sunos4 #hack
-       BuildPlatform=sparc-sun-sunos4 #hack
+        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=sparc-sun-solaris2
+        TargetPlatform=sparc-sun-solaris2 #hack
+        BuildPlatform=sparc-sun-solaris2 #hack
         HostPlatform_CPP='sparc_sun_solaris2'
         HostArch_CPP='sparc'
         HostVendor_CPP='sun'
@@ -522,23 +573,28 @@ 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 Find 'hardtop_plat', the native format for 'hardtop'
+dnl (i.e., right kind of \dnl slashes on a Win32 box, but with b-slashes
+dnl 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 Note OSTYPE: On Cygwin we need to use 'cygpath' to convert
+dnl              /cygdrive/c/foo to c:/foo but we must not do that if we
+dnl              aren't building using Cygwin (notably msys), because
+dnl              cygpath doesn't exist.  It seems that 'bash' sets
+dnl              OSTYPE to 'cygwin' or 'msys' respectively, but cygwin's
+dnl              'sh' does not.  So we hackily assume that if the shell
+dnl              hasn't set it to 'msys' then we must be in Cygwin.
+dnl              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              The Right Thing is probably to test $BuildPlatform
+dnl              instead, but we are sloppy about setting that correctly
+dnl              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.
+dnl              The quotes round "$(OSTYPE)" are essential, for the
+dnl              Cygwin-sh case where OSTYPE is not set.
 case $HostPlatform in
   i386-unknown-mingw32 | i386-unknown-cygwin32)
-        if test "${OSTYPE}" != "msys" 
+        if test "${OSTYPE}" != "msys"
           then
             # convert $hardtop to a path that mingw will understand too
             cyghardtop=${hardtop}
@@ -549,14 +605,22 @@ case $HostPlatform in
         fi
         ;;
   *)
-       hardtop_plat=${hardtop}
-       ;;
+        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 --------------------------------------------------------------
@@ -568,22 +632,20 @@ dnl use either is considered a Feature.
 dnl ** What command to use to compile compiler sources ?
 dnl --------------------------------------------------------------
 
-AC_ARG_WITH(ghc,
+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)
+  [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)
+  WithGhc="$GHC"])
+AC_SUBST([WithGhc])
 
 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]
 )
@@ -597,6 +659,9 @@ if test "$WithGhc" != ""; then
   AC_SUBST(GhcPatchLevel)dnl
 fi
 
+# Check whether this GHC has readline installed
+FP_GHC_HAS_READLINE
+
 AC_PATH_PROGS(NHC,nhc nhc98)
 AC_PATH_PROG(HBC,hbc)
 
@@ -614,7 +679,9 @@ AC_ARG_WITH(gcc,
          withval=`cygpath -w ${withval} | sed -e 's@\\\\@/@g' `
        fi
  fi;
- CC="$withval"],
+ CC="$withval"
+ export CC
+ ],
 [WhatGccIsCalled="gcc"]
 )
 AC_SUBST(WhatGccIsCalled)
@@ -626,9 +693,9 @@ AC_ARG_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
+        BootingFromHc=YES
   else
-       BootingFromHc=NO
+        BootingFromHc=NO
   fi
 ],
 [BootingFromHc=NO]
@@ -643,9 +710,9 @@ AC_ARG_ENABLE(hc-boot-unregisterised,
  unregisterised rather than registerised code.
  (This option is mostly of interest to porters.) [default=no]])],
 [ if test x"$enableval" = x"yes"; then
-       BootingFromUnregisterisedHc=YES
+        BootingFromUnregisterisedHc=YES
   else
-       BootingFromUnregisterisedHc=NO
+        BootingFromUnregisterisedHc=NO
   fi
 ],
 [BootingFromUnregisterisedHc=NO]
@@ -659,40 +726,25 @@ 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
+if test "$BootingFromHc" = "NO" -a "$WithGhc" = "" -a -d "$srcdir/compiler"; then
 AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
 fi;
 
-dnl ** --enable-threaded-rts (not used any more)
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE(threaded-rts,
-[AC_HELP_STRING([--enable-threaded-rts],
-[DEPRECATED (backwards compatibility only). [default=no]])],
-[ if test x"$enableval" = x"yes"; then
-       ThreadedRts=YES
-  else
-       ThreadedRts=NO
-  fi
-],
-[ThreadedRts=NO]
-)
-AC_SUBST(ThreadedRts)
-
 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
@@ -717,39 +769,24 @@ 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
+        GhcLibsWithObjectIO=YES
   else
-       GhcLibsWithObjectIO=NO
+        GhcLibsWithObjectIO=NO
   fi
 ],
 [GhcLibsWithObjectIO=NO]
 )
 AC_SUBST(GhcLibsWithObjectIO)
 
-dnl ** Enable the building of the OpenAL binding?
-dnl --------------------------------------------------------------
-AC_ARG_ENABLE([openal],
-  AC_HELP_STRING([--enable-openal],
-                 [Build OpenAL binding [[default=autodetect]]]),
-  [ if test x"$enableval" = x"yes"; then
-       GhcLibsWithOpenAL=YES
-    else
-       GhcLibsWithOpenAL=NO
-    fi
-  ],
-  [GhcLibsWithOpenAL=YES])
-
-AC_SUBST([GhcLibsWithOpenAL])
-
 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
+        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]
 )
@@ -809,9 +846,10 @@ dnl ** look for GCC and find out which version
 dnl     Figure out which C compiler to use.  Gcc is preferred.
 dnl     If gcc, make sure it's at least 2.1
 dnl
-AC_PROG_CC
-FPTOOLS_HAVE_GCC
-FPTOOLS_GCC_NEEDS_NO_OMIT_LFPTR
+FP_HAVE_GCC
+FP_MINGW_GCC
+FP_GCC_NEEDS_NO_OMIT_LFPTR
+FP_GCC_HAS_NO_UNIT_AT_A_TIME
 
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
@@ -831,6 +869,9 @@ FP_PROG_CONTEXT_DIFF
 dnl ** Find find command (for Win32's benefit)
 FP_PROG_FIND
 
+dnl ** Find sort command (for the benefit of Win32 environs)
+FP_PROG_SORT
+
 dnl ** figure out how to do a BSD-ish install
 AC_PROG_INSTALL
 
@@ -858,7 +899,7 @@ AC_PATH_PROGS(TarCmd,gtar tar,tar)
 
 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])
+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
 
 dnl ** check for ghc-pkg command
@@ -873,51 +914,15 @@ 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
@@ -942,8 +947,6 @@ 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([unistd.h], [AC_CHECK_FUNCS(lchown)])
-
 AC_CHECK_HEADER([readline/readline.h], [HaveReadlineReadlineH=YES], [HaveReadlineReadlineH=NO])
 AC_CHECK_HEADER([readline/history.h], [HaveReadlineHistoryH=YES], [HaveReadlineHistoryH=NO])
 
@@ -956,41 +959,9 @@ else
 fi
 AC_SUBST(GhcLibsWithReadline)
 
-dnl ** check for OpenGL/GLUT include paths and libraries
-FP_CHECK_GLUT
-
-if test x"$no_GLU" = xyes; then
-  GhcLibsWithOpenGL=NO
-else
-  GhcLibsWithOpenGL=YES
-fi
-AC_SUBST([GhcLibsWithOpenGL])
-
-if test x"$no_GLUT" = xyes; then
-  GhcLibsWithGLUT=NO
-else
-  GhcLibsWithGLUT=YES
-fi
-AC_SUBST([GhcLibsWithGLUT])
-
-dnl ** check for OpenGL include files
-fp_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-if test x"$use_quartz_opengl" = xyes; then
-  AC_CHECK_HEADERS([OpenGL/gl.h])
-else
-  AC_CHECK_HEADERS([GL/gl.h])
-fi
-CPPFLAGS="$fp_save_cppflags"
-
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
 AC_HEADER_TIME
 
-dnl ** check for POSIX regex
-HavePosixRegex=NO
-AC_CHECK_HEADERS([regex.h], [AC_CHECK_FUNCS(regcomp, [HavePosixRegex=YES])])
-AC_SUBST(HavePosixRegex)
-
 dnl ** how do we get a timezone name, and UTC offset ?
 AC_STRUCT_TIMEZONE
 
@@ -1038,69 +1009,6 @@ fi
 FP_CHECK_ALIGNMENT(unsigned short)
 FP_CHECK_ALIGNMENT(void *)
 
-dnl ** map standard C types and ISO types to Haskell types
-FPTOOLS_CHECK_HTYPE(char)
-FPTOOLS_CHECK_HTYPE(signed char)
-FPTOOLS_CHECK_HTYPE(unsigned char)
-FPTOOLS_CHECK_HTYPE(short)
-FPTOOLS_CHECK_HTYPE(unsigned short)
-FPTOOLS_CHECK_HTYPE(int)
-FPTOOLS_CHECK_HTYPE(unsigned int)
-FPTOOLS_CHECK_HTYPE(long)
-FPTOOLS_CHECK_HTYPE(unsigned long)
-if test "$ac_cv_type_long_long" = yes; then
-FPTOOLS_CHECK_HTYPE(long long)
-FPTOOLS_CHECK_HTYPE(unsigned long long)
-fi
-FPTOOLS_CHECK_HTYPE(float)
-FPTOOLS_CHECK_HTYPE(double)
-FPTOOLS_CHECK_HTYPE(ptrdiff_t)
-FPTOOLS_CHECK_HTYPE(size_t)
-FPTOOLS_CHECK_HTYPE(wchar_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)
-FPTOOLS_CHECK_HTYPE(dev_t, Word32)
-FPTOOLS_CHECK_HTYPE(ino_t)
-FPTOOLS_CHECK_HTYPE(mode_t)
-FPTOOLS_CHECK_HTYPE(off_t)
-FPTOOLS_CHECK_HTYPE(pid_t)
-FPTOOLS_CHECK_HTYPE(gid_t)
-FPTOOLS_CHECK_HTYPE(uid_t)
-FPTOOLS_CHECK_HTYPE(cc_t)
-FPTOOLS_CHECK_HTYPE(speed_t)
-FPTOOLS_CHECK_HTYPE(tcflag_t)
-FPTOOLS_CHECK_HTYPE(blkcnt_t)
-FPTOOLS_CHECK_HTYPE(nlink_t)
-FPTOOLS_CHECK_HTYPE(ssize_t)
-FPTOOLS_CHECK_HTYPE(rlim_t)
-FPTOOLS_CHECK_HTYPE(wint_t)
-
-dnl ** Map OpenGL data types to Haskell types
-if test $GhcLibsWithOpenGL = YES ; then
-FPTOOLS_CHECK_HTYPE(GLboolean)
-FPTOOLS_CHECK_HTYPE(GLbyte)
-FPTOOLS_CHECK_HTYPE(GLubyte)
-FPTOOLS_CHECK_HTYPE(GLshort)
-FPTOOLS_CHECK_HTYPE(GLushort)
-FPTOOLS_CHECK_HTYPE(GLint)
-FPTOOLS_CHECK_HTYPE(GLuint)
-FPTOOLS_CHECK_HTYPE(GLsizei)
-FPTOOLS_CHECK_HTYPE(GLenum)
-FPTOOLS_CHECK_HTYPE(GLbitfield)
-FPTOOLS_CHECK_HTYPE(GLfloat)
-FPTOOLS_CHECK_HTYPE(GLclampf)
-FPTOOLS_CHECK_HTYPE(GLdouble)
-FPTOOLS_CHECK_HTYPE(GLclampd)
-fi
-
-FP_CHECK_CONSTS([E2BIG EACCES EADDRINUSE EADDRNOTAVAIL EADV EAFNOSUPPORT EAGAIN EALREADY EBADF EBADMSG EBADRPC EBUSY ECHILD ECOMM ECONNABORTED ECONNREFUSED ECONNRESET EDEADLK EDESTADDRREQ EDIRTY EDOM EDQUOT EEXIST EFAULT EFBIG EFTYPE EHOSTDOWN EHOSTUNREACH EIDRM EILSEQ EINPROGRESS EINTR EINVAL EIO EISCONN EISDIR ELOOP EMFILE EMLINK EMSGSIZE EMULTIHOP ENAMETOOLONG ENETDOWN ENETRESET ENETUNREACH ENFILE ENOBUFS ENODATA ENODEV ENOENT ENOEXEC ENOLCK ENOLINK ENOMEM ENOMSG ENONET ENOPROTOOPT ENOSPC ENOSR ENOSTR ENOSYS ENOTBLK ENOTCONN ENOTDIR ENOTEMPTY ENOTSOCK ENOTTY ENXIO EOPNOTSUPP EPERM EPFNOSUPPORT EPIPE EPROCLIM EPROCUNAVAIL EPROGMISMATCH EPROGUNAVAIL EPROTO EPROTONOSUPPORT EPROTOTYPE ERANGE EREMCHG EREMOTE EROFS ERPCMISMATCH ERREMOTE ESHUTDOWN ESOCKTNOSUPPORT ESPIPE ESRCH ESRMNT ESTALE ETIME ETIMEDOUT ETOOMANYREFS ETXTBSY EUSERS EWOULDBLOCK EXDEV], [#include <stdio.h>
-#include <errno.h>])
-
-dnl ** can we open files in binary mode?
-FP_CHECK_CONST([O_BINARY], [#include <fcntl.h>], [0])
-
 FP_CHECK_FUNC([WinExec],
   [@%:@include <windows.h>], [WinExec("",0)])
 
@@ -1111,16 +1019,16 @@ dnl ** check return type of signal handlers
 dnl Foo: assumes we can use prototypes.
 dnl On BCC, signal handlers have type "int(void)", elsewhere its "void(int)".
 dnl AC_CACHE_CHECK([type of signal handlers], ac_cv_type_signal_handler,
-dnl [AC_TRY_COMPILE([#include <sys/types.h>
+dnl [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 dnl #include <signal.h>
 dnl #ifdef signal
 dnl #undef signal
 dnl #endif
 dnl void (*signal (int, void (*)(int)))(int);
-dnl ],
-dnl [int i;], 
-dnl ac_cv_type_signal_handler=void_int,
-dnl ac_cv_type_signal_handler=int_void)])
+dnl ]],
+dnl [[int i;]])],
+dnl [ac_cv_type_signal_handler=void_int],
+dnl [ac_cv_type_signal_handler=int_void])])
 dnl if test "$ac_cv_type_signal_handler" = void_int; then
 dnl AC_DEFINE(VOID_INT_SIGNALS)
 dnl fi
@@ -1132,15 +1040,10 @@ if test "$ac_cv_type_signal" = void; then
 fi
 
 dnl ** check for more functions
-AC_CHECK_FUNCS([ftime getclock getgrgid_r getgrnam_r getpagesize getpwnam_r getpwuid_r getrusage gettimeofday gmtime_r localtime_r lstat readdir_r readlink setenv setitimer siginterrupt symlink sysconf times unsetenv])
-
-dnl ** Solaris2 needs additionl flag for getpw*_r()
-case "$TargetPlatform" in
-  *-solaris2*)
-    unix_SRC_HSC2HS_OPTS="-D_POSIX_PTHREAD_SEMANTICS"
-    AC_SUBST(unix_SRC_HSC2HS_OPTS)
-  ;;
-esac
+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])
+dnl ** For ghc/rts/gmp:
+AC_CHECK_FUNCS([getpagesize])
 
 dnl ** check whether this machine has gmp3 installed
 AC_CHECK_LIB(gmp,  __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
@@ -1149,20 +1052,22 @@ AC_CHECK_LIB(gmp,  __gmpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
 AC_SUBST(HaveLibGmp)
 AC_SUBST(LibGmp)
 
-dnl ** (Mac OS X only: check for HaskellSupport.framework)
-HaveFrameworkHaskellSupport=NO
-if test $HostPlatform = "powerpc-apple-darwin"; then
- AC_MSG_CHECKING([for HaskellSupport.framework])
- save_libs="$LIBS"
- LIBS="-framework HaskellSupport"
- AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkHaskellSupport=YES,)
- if test $HaveFrameworkHaskellSupport = YES; then
-  AC_DEFINE([HAVE_FRAMEWORK_HASKELLSUPPORT], [1], [Define to 1 if the HaskellSupport.framework is installed (Mac OS X only).])
- fi;
- LIBS="$save_libs"
- AC_MSG_RESULT([$HaveFrameworkHaskellSupport])
-fi;
-AC_SUBST(HaveFrameworkHaskellSupport)
+dnl ** (Mac OS X only: check for GMP.framework)
+HaveFrameworkGMP=NO
+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
 AC_CHECK_LIB(mingwex, closedir, HaveLibMingwEx=YES, HaveLibMingwEx=NO)
@@ -1183,193 +1088,25 @@ dnl    the order of these tests matters: bfd needs liberty
 AC_CHECK_LIB(iberty, xmalloc)
 AC_CHECK_LIB(bfd,    bfd_init)
 
-dnl ** check for wide-char classifications
-dnl FreeBSD has an emtpy wctype.h, so test one of the affected
-dnl functions if it's really there.
-AC_CHECK_HEADERS([wctype.h], [AC_CHECK_FUNCS(iswspace)])
-
-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_LIB([m], [atan], [LIBS="-lm $LIBS"; LIBM="-lm"], [LIBM=])
-AC_SUBST([LIBM])
-
-dnl ** check for X Window System
-AC_PATH_XTRA()
-
-if test "$no_x" = yes; then
-  GhcLibsWithX11=NO
-else
-  GhcLibsWithX11=YES
+AC_CHECK_FUNC(atan,[fp_libm_not_needed=yes;LIBM=],[fp_libm_not_needed=dunno])
+if test x"$fp_libm_not_needed" = xdunno; then
+   AC_CHECK_LIB([m], [atan], [LIBS="-lm $LIBS"; LIBM="-lm"],[LIBM=])
 fi
-AC_SUBST([GhcLibsWithX11])
+AC_SUBST([LIBM])
 
 dnl ################################################################
 dnl Check for libraries
 dnl ################################################################
 
-dnl ** check for libdl & RTLD_NEXT
-
-dnl (Mac OS X only) ... but don't check if we already have the
-dnl HaskellSupport.framework
-
-if test $HaveFrameworkHaskellSupport = YES; then
-    HaveLibDL=NO
-    HaveRtldNext=NO
-    HaveRtldLocal=YES
-    AC_DEFINE([HAVE_RTLDLOCAL], [1], [Define to 1 if RTLD_LOCAL is available.])
-    HaveRtldGlobal=YES
-    AC_DEFINE([HAVE_RTLDGLOBAL], [1], [Define to 1 if RTLD_GLOBAL is available.])
-    HaveRtldNow=YES
-    AC_DEFINE([HAVE_RTLDNOW], [1], [Define to 1 if we can see RTLD_NOW in dlfcn.h.])
-    AC_SUBST(HaveLibDL)
-    AC_SUBST(HaveRtldNext)
-    AC_SUBST(HaveRtldLocal)
-    AC_SUBST(HaveRtldGlobal)
-    AC_SUBST(HaveRtldNow)
-else
-    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"], 
-       [HaveLibDL=NO])
-    AC_SUBST(HaveLibDL)
-
-    dnl ** sometimes RTLD_NEXT is hidden in #ifdefs we really don't wan to set
-    AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h)
-    AC_EGREP_CPP(yes,
-    [
-     #include <dlfcn.h>
-     #ifdef RTLD_NEXT
-            yes
-     #endif
-    ], [
-      AC_MSG_RESULT(yes)
-      AC_DEFINE([HAVE_RTLDNEXT], [1], [Define to 1 if we can see RTLD_NEXT in dlfcn.h.])
-      HaveRtldNext=YES
-    ], [
-      AC_MSG_RESULT(no)
-      HaveRtldNext=NO
-      ])    
-    AC_SUBST(HaveRtldNext)
-
-    dnl ** RTLD_LOCAL isn't available on cygwin or openbsd
-    AC_MSG_CHECKING(for RTLD_LOCAL from dlfcn.h)
-    AC_EGREP_CPP(yes,
-    [
-     #include <dlfcn.h>
-     #ifdef RTLD_LOCAL
-            yes
-     #endif
-    ], [
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_RTLDLOCAL)
-      HaveRtldLocal=YES
-    ], [
-      AC_MSG_RESULT(no)
-      HaveRtldLocal=NO
-      ])    
-    AC_SUBST(HaveRtldLocal)
-
-    dnl ** RTLD_GLOBAL isn't available on openbsd
-    AC_MSG_CHECKING(for RTLD_GLOBAL from dlfcn.h)
-    AC_EGREP_CPP(yes,
-    [
-     #include <dlfcn.h>
-     #ifdef RTLD_GLOBAL
-            yes
-     #endif
-    ], [
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_RTLDGLOBAL)
-      HaveRtldGlobal=YES
-    ], [
-      AC_MSG_RESULT(no)
-      HaveRtldGlobal=NO
-      ])    
-    AC_SUBST(HaveRtldGlobal)
-
-    dnl ** RTLD_NOW isn't available on openbsd
-    AC_MSG_CHECKING(for RTLD_NOW from dlfcn.h)
-    AC_EGREP_CPP(yes,
-    [
-     #include <dlfcn.h>
-     #ifdef RTLD_NOW
-            yes
-     #endif
-    ], [
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_RTLDNOW)
-      HaveRtldNow=YES
-    ], [
-      AC_MSG_RESULT(no)
-      HaveRtldNow=NO
-      ])    
-    AC_SUBST(HaveRtldNow)
-fi
+dnl ** check whether we need -ldl to get dlopen()
 
-dnl ---------- usleep ----------
-dnl --- stolen from guile configure ---
-dnl --- FIXME: /usr/include/unistd.h can't be right?
-
-### On some systems usleep has no return value.  If it does have one,
-### we'd like to return it; otherwise, we'll fake it.
-AC_CACHE_CHECK([return type of usleep], cv_func_usleep_return_type,
-  [AC_EGREP_HEADER(changequote(<, >)<void[      ]+usleep>changequote([, ]),
-                   /usr/include/unistd.h,
-                   [cv_func_usleep_return_type=void],
-                   [cv_func_usleep_return_type=int])])
-case "$cv_func_usleep_return_type" in
-  "void" )
-    AC_DEFINE([USLEEP_RETURNS_VOID], [1], [Define if the system headers declare usleep to return void.])
-  ;;
-esac
-
-dnl --------------------------------------------------
-dnl * test for GTK+
-dnl --------------------------------------------------
-
-AC_PATH_PROGS([GTK_CONFIG], [gtk-config gtk12-config])
-if test -n "$GTK_CONFIG"; then
-  AC_CACHE_CHECK([for version of GTK+], [fp_cv_gtk_version],
-    [fp_cv_gtk_version=`$GTK_CONFIG --version`])
-  FP_COMPARE_VERSIONS([$fp_cv_gtk_version], [-lt], [1.2],
-    [AC_MSG_WARN([GTK+ not usable, need at least version 1.2])
-     GTK_CONFIG=])
-fi
-AC_SUBST([GTK_CONFIG])
+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"],
+    [HaveLibDL=NO])
+AC_SUBST(HaveLibDL)
 
 dnl --------------------------------------------------
 dnl * Miscellaneous feature tests
@@ -1390,25 +1127,69 @@ AC_C_BIGENDIAN
 dnl ** check for leading underscores in symbol names
 FP_LEADING_UNDERSCORE
 
-dnl ** check for ld, and whether ld has -x option
-AC_PATH_PROG(LdCmdRaw, ld)
-case $HostOS_CPP in
- mingw32) 
-        if test "${OSTYPE}" == "msys"
-          then
-             LdCmd=${LdCmdRaw}
-          else
-             LdCmd=`cygpath -w ${LdCmdRaw} | sed -e 's@\\\\@/@g' `
-       fi
-          ;;
- *) LdCmd=${LdCmdRaw}
-    ;;
-esac
-AC_SUBST(LdCmd)
-FPTOOLS_LD_X
+dnl ** check for ld, whether it has an -x option, and if it is GNU ld
+FP_PROG_LD_X
+FP_PROG_LD_IS_GNU
+
+dnl ** check for Apple-style dead-stripping support
+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_MSG_RESULT(no)
+        AC_DEFINE([HAVE_SUBSECTIONS_VIA_SYMBOLS],[0],
+            [Define to 1 if Apple-style dead-stripping is supported.])
+    ])
+
+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)
+
+dnl ** check for Apple's "interesting" long double compatibility scheme
+AC_MSG_CHECKING(for printf$LDBLStub)
+AC_TRY_LINK_FUNC(printf$LSBLStub,
+    [
+        AC_MSG_RESULT(yes)
+        AC_DEFINE([HAVE_PRINTF_LDBLSTUB],[1],
+            [Define to 1 if we have printf$LDBLStub (Apple Mac OS >= 10.4, PPC).])
+    ],
+    [
+        AC_MSG_RESULT(no)
+        AC_DEFINE([HAVE_PRINTF_LDBLSTUB],[0],
+            [Define to 1 if we have printf$LDBLStub (Apple Mac OS >= 10.4, PPC).])
+    ])
 
-FP_EMPTY_STRUCTS
+# 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])
 
-AC_CONFIG_FILES([mk/config.mk])
+AC_CONFIG_FILES([mk/config.mk ghc.spec docs/users_guide/ug-book.xml])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT