X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=8dec5693929c4effceba4dca74558d53e3b795b6;hp=d4335229e165eb3c6ccad65d57ed90e09398723d;hb=refs%2Ftags%2FBefore_type_family_merge;hpb=8b7e4e09174a407fb4e9f6e8f2e105c9d272b214 diff --git a/configure.ac b/configure.ac index d433522..8dec569 100644 --- a/configure.ac +++ b/configure.ac @@ -27,10 +27,12 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.7], [glasgow-haske # 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? @@ -44,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 # @@ -105,6 +100,7 @@ if test x"$TargetPlatform" != x"$HostPlatform" ; then fi 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. @@ -300,6 +296,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 @@ -310,6 +307,7 @@ i[[3456]]86-*-mingw32*) HostVendor_CPP='unknown' HostOS_CPP='mingw32' exeext='.exe' + soext='.dll' ;; i[[3456]]86-apple-darwin*) HostPlatform=i386-apple-darwin @@ -319,6 +317,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 @@ -355,6 +354,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 @@ -481,6 +481,7 @@ powerpc-apple-darwin*) HostArch_CPP='powerpc' HostVendor_CPP='apple' HostOS_CPP='darwin' + soext='.dylib' ;; powerpc-unknown-linux*) HostPlatform=powerpc-unknown-linux @@ -613,71 +614,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 @@ -700,6 +637,8 @@ AC_ARG_WITH([ghc], WithGhc="$GHC"]) AC_SUBST([WithGhc]) +FP_FIND_ROOT + AC_ARG_WITH(hc, [AC_HELP_STRING([--with-hc=ARG], [Use ARG as the path to the compiler for compiling ordinary @@ -715,16 +654,18 @@ if test "$WithGhc" != ""; then AC_SUBST(GhcMajVersion)dnl AC_SUBST(GhcMinVersion)dnl AC_SUBST(GhcPatchLevel)dnl - ghc_ge_504=`if test $(GhcCanonVersion) -ge 504; then echo YES; else echo NO; fi` - AC_SUBST(ghc_ge_504)dnl - ghc_ge_601=`if test $(GhcCanonVersion) -ge 601; then echo YES; else echo NO; fi` + 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 - ghc_ge_602=`if test $(GhcCanonVersion) -ge 602; then echo YES; else echo NO; fi` AC_SUBST(ghc_ge_602)dnl - ghc_ge_603=`if test $(GhcCanonVersion) -ge 603; then echo YES; else echo NO; fi` AC_SUBST(ghc_ge_603)dnl - ghc_ge_605=`if test $(GhcCanonVersion) -ge 605; then echo YES; else echo NO; fi` AC_SUBST(ghc_ge_605)dnl + AC_SUBST(ghc_ge_607)dnl fi # Check whether this GHC has readline installed @@ -754,6 +695,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 :/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, @@ -916,9 +876,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 @@ -1115,6 +1073,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) @@ -1267,6 +1228,6 @@ else fi AC_SUBST(HavePapi) -AC_CONFIG_FILES([mk/config.mk ghc.spec docs/users_guide/ug-book.xml]) +AC_CONFIG_FILES([mk/config.mk ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml]) AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h]) AC_OUTPUT