Set the soname when creating a shared lib
[ghc-hetmet.git] / configure.ac
index ac69cb1..eb63052 100644 (file)
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.7], [glasgow-haskell-bugs@haskell.org], [ghc])
+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}
@@ -95,11 +95,20 @@ HostPlatform=`/bin/sh $srcdir/config.sub $host` || exit 1
 TargetPlatform=`/bin/sh $srcdir/config.sub $target` || exit 1
 
 if test x"$TargetPlatform" != x"$HostPlatform" ; then
-    echo "GHC configuration does not support differing host/target (i.e., cross-compiling)"
-    exit 1
+    AC_MSG_ERROR([
+      GHC configuration does not support differing host/target (i.e., cross-compiling)])
 fi
 
+case $HostPlatform in
+*-cygwin*)
+    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])
+    HostPlatform=i386-unknown-mingw32  
+    ;;
+esac
+
 exeext=''
+soext='.so'
 #
 # The following will be more difficult when we *are* cross-compiling.
 # Suitable names to slam in *_CPP are in platform.h.in.
@@ -160,7 +169,7 @@ amd64-*-openbsd*|x86_64-*-openbsd*)
         HostVendor_CPP='unknown'
         HostOS_CPP='openbsd'
         ;;
-amd64-*-freebsd*)
+amd64-*-freebsd*|x86_64-*-freebsd*)
         HostPlatform=x86_64-unknown-freebsd
         TargetPlatform=x86_64-unknown-freebsd
         BuildPlatform=x86_64-unknown-freebsd
@@ -169,6 +178,15 @@ amd64-*-freebsd*)
         HostVendor_CPP='unknown'
         HostOS_CPP='freebsd'
         ;;
+amd64-*-netbsd*|x86_64-*-netbsd*)
+        HostPlatform=x86_64-unknown-netbsd
+        TargetPlatform=x86_64-unknown-netbsd
+        BuildPlatform=x86_64-unknown-netbsd
+        HostPlatform_CPP='x86_64_unknown_netbsd'
+        HostArch_CPP='x86_64'
+        HostVendor_CPP='unknown'
+        HostOS_CPP='netbsd'
+        ;;
 arm*-linux*)
         HostPlatform=arm-unknown-linux # hack again
         TargetPlatform=arm-unknown-linux
@@ -295,6 +313,7 @@ i[[3456]]86-*-cygwin*)
         HostVendor_CPP='unknown'
         HostOS_CPP='cygwin32'
         exeext='.exe'
+       soext='.dll'
         ;;
 i[[3456]]86-*-mingw32*)
         HostPlatform=i386-unknown-mingw32 # hack again
@@ -305,6 +324,7 @@ i[[3456]]86-*-mingw32*)
         HostVendor_CPP='unknown'
         HostOS_CPP='mingw32'
         exeext='.exe'
+       soext='.dll'
         ;;
 i[[3456]]86-apple-darwin*)
         HostPlatform=i386-apple-darwin
@@ -314,6 +334,7 @@ i[[3456]]86-apple-darwin*)
         HostArch_CPP='i386'
         HostVendor_CPP='apple'
         HostOS_CPP='darwin'
+       soext='.dylib'
         ;;
 i[[3456]]86-*-gnu*)
         HostPlatform=i386-unknown-gnu
@@ -350,6 +371,7 @@ x86_64-apple-darwin*)
         HostArch_CPP='x86_64'
         HostVendor_CPP='apple'
         HostOS_CPP='darwin'
+       soext='.dylib'
         ;;
 m68k-*-linux*)
         HostPlatform=m68k-unknown-linux # hack again
@@ -476,6 +498,7 @@ powerpc-apple-darwin*)
         HostArch_CPP='powerpc'
         HostVendor_CPP='apple'
         HostOS_CPP='darwin'
+       soext='.dylib'
         ;;
 powerpc-unknown-linux*)
         HostPlatform=powerpc-unknown-linux
@@ -608,71 +631,7 @@ 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
-dnl being escaped).
-dnl
-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
-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
-dnl              Cygwin-sh case where OSTYPE 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
-dnl OK, so we're in the MSYS case.  hardtop looks like /c/....
-dnl We want to make hardtop_plat into c:/...
-dnl Stop using [] for quotes temporarily, so we can use [] in the sed regexp
-changequote(, )dnl
-               hardtop_plat=`echo ${hardtop} | sed -e 's@^/\\([a-zA-Z]\\)/@\\1:/@g'`
-changequote([, ])dnl
-        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
+AC_SUBST(soext)
 
 dnl --------------------------------------------------------------
 dnl * Project specific configuration options
@@ -693,6 +652,18 @@ AC_ARG_WITH([ghc],
     AC_PATH_PROG([GHC], [ghc])
   fi
   WithGhc="$GHC"])
+# GHC is passed to Cabal, so we need a native path
+if test "${WithGhc}" != "" && test "$HostPlatform" = "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 "Canonicalised to: ${WithGhc}"
+fi
 AC_SUBST([WithGhc])
 
 AC_ARG_WITH(hc,
@@ -704,29 +675,32 @@ AC_ARG_WITH(hc,
 )
 AC_SUBST(WithHc)
 
+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 504; then ghc_ge_504=YES; else ghc_ge_504=NO; fi
-  if test $GhcCanonVersion -ge 601; then ghc_ge_601=YES; else ghc_ge_601=NO; fi
-  if test $GhcCanonVersion -ge 602; then ghc_ge_602=YES; else ghc_ge_602=NO; fi
-  if test $GhcCanonVersion -ge 603; then ghc_ge_603=YES; else ghc_ge_603=NO; fi
-  if test $GhcCanonVersion -ge 605; then ghc_ge_605=YES; else ghc_ge_605=NO; fi
-  AC_SUBST(ghc_ge_504)dnl
-  AC_SUBST(ghc_ge_601)dnl
-  AC_SUBST(ghc_ge_602)dnl
-  AC_SUBST(ghc_ge_603)dnl
-  AC_SUBST(ghc_ge_605)dnl
+  if test $GhcCanonVersion -ge 607; then ghc_ge_607=YES; else ghc_ge_607=NO; fi
+  if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi
+  AC_SUBST(ghc_ge_607)dnl
+  AC_SUBST(ghc_ge_609)dnl
 fi
 
-# Check whether this GHC has readline installed
-FP_GHC_HAS_READLINE
-
 AC_PATH_PROGS(NHC,nhc nhc98)
 AC_PATH_PROG(HBC,hbc)
 
@@ -736,13 +710,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
@@ -756,13 +729,12 @@ dnl --------------------------------------------------------------
 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"
-    then
-       if test "${OSTYPE}" != "msys"
-         then
-         # Canonicalise to <drive>:/path/to/ld
-         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/ld
+     withval=`cygpath -m ${withval}`
  fi;
  LD=$withval
  FP_PROG_LD([$LD])
@@ -770,6 +742,36 @@ AC_ARG_WITH(ld,
  [FP_PROG_LD()]
 )
 
+dnl ** Build shared and/or static libs?
+dnl --------------------------------------------------------------
+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
+        AC_MSG_WARN([--enable-shared is experimental and not fully supported at this time])
+        BuildSharedLibs=YES
+  else
+        BuildSharedLibs=NO
+  fi
+],
+[BuildSharedLibs=NO]
+)
+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)
+
 dnl ** Booting from .hc files?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(hc-boot,
@@ -810,10 +812,28 @@ fi;
 fi;
 
 dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on
-if test "$BootingFromHc" = "NO" -a "$WithGhc" = "" -a -d "$srcdir/compiler"; then
-AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
+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.6],
+    [AC_MSG_ERROR([GHC version 6.6 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;
 
+# 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
@@ -847,34 +867,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_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_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(DotnetSupport)
+FP_CHECK_MACOSX_DEPLOYMENT_TARGET
+AC_SUBST(MACOSX_DEPLOYMENT_VERSION)
+AC_SUBST(MACOSX_DEPLOYMENT_SDK)
 
 dnl --------------------------------------------------------------
 dnl End of configure script option section
@@ -932,9 +940,7 @@ dnl     If gcc, make sure it's at least 2.1
 dnl
 FP_HAVE_GCC
 FP_MINGW_GCC
-FP_GCC_NEEDS_NO_OMIT_LFPTR
-FP_GCC_HAS_NO_UNIT_AT_A_TIME
-FP_GCC_HAS_WRAPV
+FP_GCC_EXTRA_FLAGS
 
 dnl ** figure out how to invoke cpp directly (gcc -E is no good)
 AC_PROG_CPP
@@ -942,10 +948,6 @@ 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"])
 AC_SUBST(SRC_CC_OPTS)
 
 dnl ** figure out how to do context diffs
@@ -957,11 +959,11 @@ 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
 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
 
 dnl If you can run configure, you certainly have /bin/sh
 AC_DEFINE([HAVE_BIN_SH], [1], [Define to 1 if you have /bin/sh.])
@@ -985,38 +987,46 @@ 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 /opt/local/share/xsl/docbook-xsl])
-FP_PROG_FO_PROCESSOR
+FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/xml/docbook/xsl-stylesheets* /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 /opt/local/share/xsl/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)
-]
-)
-
 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;
 
-dnl ** check for installed haddock
-FPTOOLS_HADDOCK
-
 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 --------------------------------------------------
@@ -1033,19 +1043,7 @@ 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
@@ -1123,7 +1121,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])
 
@@ -1131,6 +1149,9 @@ 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)
 
@@ -1283,6 +1304,106 @@ else
 fi
 AC_SUBST(HavePapi)
 
-AC_CONFIG_FILES([mk/config.mk ghc.spec docs/users_guide/ug-book.xml])
+if test "$DIR_DOCBOOK_XSL" = "" ||
+   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 mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml])
 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
+   Alex     : $AlexCmd
+   Python   : $PythonCmd
+   Perl     : $PerlCmd"]
+
+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"
+echo "Building DocBook PS documentation:   $BUILD_DOCBOOK_PS"
+echo "Building DocBook PDF documentation:  $BUILD_DOCBOOK_PDF"
+
+echo ["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
+"