X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=8f7b0ab17f452de9a9e8f3e968306ef7827f79de;hp=eb64f4e853b4c81b90b793280f270a134ccf4065;hb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;hpb=5bb59869cb0f488c2b143320a1ae413c5f59f833

diff --git a/configure.ac b/configure.ac
index eb64f4e..8f7b0ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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.
 #
@@ -15,11 +15,24 @@ dnl
 
 AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.7], [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 'autoreconf'?"
+   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?
@@ -33,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([libraries])
-
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
 #
@@ -53,6 +59,25 @@ 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 * Choose host(/target/build) platform
 dnl--------------------------------------------------------------------
 
@@ -584,70 +609,7 @@ 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
+FP_FIND_ROOT
 
 dnl --------------------------------------------------------------
 dnl * Project specific configuration options
@@ -685,6 +647,18 @@ if test "$WithGhc" != ""; then
   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 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
+  if test $GhcCanonVersion -ge 607; then ghc_ge_607=YES; else ghc_ge_607=NO; fi
+  AC_SUBST(ghc_ge_601)dnl
+  AC_SUBST(ghc_ge_602)dnl
+  AC_SUBST(ghc_ge_603)dnl
+  AC_SUBST(ghc_ge_605)dnl
+  AC_SUBST(ghc_ge_607)dnl
 fi
 
 # Check whether this GHC has readline installed
@@ -714,6 +688,25 @@ AC_ARG_WITH(gcc,
 )
 AC_SUBST(WhatGccIsCalled)
 
+dnl ** Which ld to use?
+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
+ fi;
+ LD=$withval
+ FP_PROG_LD([$LD])
+ ],
+ [FP_PROG_LD()]
+)
+
 dnl ** Booting from .hc files?
 dnl --------------------------------------------------------------
 AC_ARG_ENABLE(hc-boot,
@@ -1185,7 +1178,8 @@ AC_COMPILE_IFELSE(
 
 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)