X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=configure.ac;h=3b6cc97c2b1f82e08138c585cf25d7c5b9ac77dd;hp=f8d64d5a47631e1e50e162d46a3fea4a6bf91a3b;hb=2f6ad11fa0c2995d950c91fd4301f23aceeb443b;hpb=1eff6846ec58e0b480af27acacb3f2826e82728e diff --git a/configure.ac b/configure.ac index f8d64d5..3b6cc97 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,17 @@ 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.5], [glasgow-haskell-bugs@haskell.org], [ghc]) + +if test ! -f mk/config.h.in; then + echo "mk/config.h.in doesn't exist: perhaps you haven't run 'autoreconf'?" + exit 1 +fi + +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]) @@ -28,7 +38,7 @@ 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,73 +82,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' - ;; + 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' @@ -147,7 +157,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' @@ -156,42 +166,42 @@ 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' @@ -207,79 +217,79 @@ i[[3456]]86-*-kfreebsd*-gnu) 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' - ;; + 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 @@ -306,10 +316,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' @@ -329,45 +339,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' @@ -382,6 +392,15 @@ mips-*-linux*) HostVendor_CPP='unknown' HostOS_CPP='linux' ;; +mipsel-*-linux*) + HostPlatform=mipsel-unknown-linux # hack again + TargetPlatform=mipsel-unknown-linux + BuildPlatform=mipsel-unknown-linux + HostPlatform_CPP='mipsel_unknown_linux' + HostArch_CPP='mipsel' + HostVendor_CPP='unknown' + HostOS_CPP='linux' + ;; mips-dec-ultrix*) HostPlatform_CPP='mips_dec_ultrix' HostArch_CPP='mipsel' # NB a little different @@ -389,41 +408,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 @@ -443,15 +462,15 @@ powerpc-unknown-openbsd*) 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' + 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' - ;; - + HostOS_CPP='linux' + ;; + s390-ibm-linux*) HostPlatform=s390-ibm-linux TargetPlatform=s390-ibm-linux #hack @@ -462,18 +481,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' @@ -568,23 +587,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} @@ -595,8 +619,8 @@ case $HostPlatform in fi ;; *) - hardtop_plat=${hardtop} - ;; + hardtop_plat=${hardtop} + ;; esac AC_SUBST(hardtop) AC_SUBST(hardtop_plat) @@ -635,7 +659,7 @@ 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] ) @@ -649,6 +673,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) @@ -680,9 +707,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] @@ -697,9 +724,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] @@ -713,40 +740,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 @@ -771,9 +783,9 @@ 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] @@ -786,9 +798,9 @@ 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] ) @@ -850,6 +862,8 @@ 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 dnl ** figure out how to invoke cpp directly (gcc -E is no good) AC_PROG_CPP @@ -914,51 +928,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 @@ -998,12 +976,6 @@ AC_SUBST(GhcLibsWithReadline) dnl ** check if it is safe to include both and 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]) @@ -1124,40 +1096,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 @@ -1171,10 +1109,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) @@ -1206,17 +1144,25 @@ 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) @@ -1236,7 +1182,18 @@ 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]) -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