X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=b799d4f6bbf44228a53d5f6b4bbc95f375d0bfc9;hb=30f15b4e7d579dc142537342161c460c6b80290b;hp=cfadc777b78758654e59ce3830a24081d09fe583;hpb=10521d8418fd3a1cf32882718b5bd28992db36fd;p=ghc-hetmet.git diff --git a/configure.in b/configure.in index cfadc77..b799d4f 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,8 @@ AC_INIT(STARTUP.in) # # Prepare to generate the following header files # -AC_CONFIG_HEADER(ghc/includes/config.h literate/config.h) +AC_CONFIG_HEADER(ghc/includes/config.h) +# and literate/config.h ??? # ToDo !!!!!!!!!!!!!!!! # # No, we don't do `--srcdir'... @@ -27,15 +28,16 @@ if test x"$srcdir" != 'x.' ; then fi # ------------------------------------------------------------------------- -dnl ** choose what blobs to build (ghc,haggis,happy,nofib,????) +dnl ** choose what blobs to build (ghc,hslibs,haggis,happy,nofib,????) # set to the name for the dir if doing it, otherwise empty DoingGHC='ghc' +DoingHsLibs='' DoingNoFib='' DoingHappy='' DoingHaggis='' +DoingLiterate='' # the following are not normally changed -DoingLiterate='literate' DoingMkWorld='mkworld' DoingGlaFpUtils='glafp-utils' @@ -48,7 +50,7 @@ AC_ARG_ENABLE(ghc, ********************************************************************** First, select *which* of the tools you want to build, -with --{enable,disable}-{ghc,nofib,happy,haggis}. +with --{enable,disable}-{ghc,hslibs,nofib,happy,haggis}. (The default is: only GHC (Glasgow Haskell compiler).) Second, you may set one of a few applies-in-all-cases options. @@ -91,6 +93,26 @@ if test "xxx$DoingGHC" = 'xxx' ; then # ghc_includes_config_h='' fi +AC_ARG_ENABLE(hslibs, + [--enable-hslibs build suite of Haskell libraries], + [case "$enableval" in + yes) DoingHsLibs='hslibs' + ;; + no) DoingHsLibs='' + ;; + *) echo "I don't understand this option: --enable-hslibs=$enableval" + exit 1 + ;; + esac]) +if test "xxx$DoingHsLibs" = 'xxxhslibs' -a \( ! -d hslibs \) ; then + DoingHsLibs='' + echo 'Doing --disable-hslibs, as there is no hslibs directory' +fi +hslibs_mkworld_site_hslibs_jm='hslibs/mkworld/site-hslibs.jm' +if test "xxx$DoingHsLibs" = 'xxx' ; then + hslibs_mkworld_site_hslibs_jm='' +fi + AC_ARG_ENABLE(nofib, [--enable-nofib build NoFib suite as part of Glasgow FP tools], [case "$enableval" in @@ -128,7 +150,7 @@ if test "xxx$DoingHappy" = 'xxxhappy' -a \( ! -d happy \) ; then fi AC_ARG_ENABLE(haggis, - [--disable-haggis build Haggis GUI toolkit as part of Glasgow FP tools], + [--enable-haggis build Haggis GUI toolkit as part of Glasgow FP tools], [case "$enableval" in yes) DoingHaggis='haggis' ;; @@ -194,6 +216,7 @@ if test "xxx$DoingGlaFpUtils" = 'xxxglafp-utils' -a \( ! -d glafp-utils \) ; the fi AC_SUBST(DoingGHC) +AC_SUBST(DoingHsLibs) AC_SUBST(DoingNoFib) AC_SUBST(DoingHappy) AC_SUBST(DoingHaggis) @@ -207,7 +230,7 @@ dnl ** choose host(/target/build) platform # Partly stolen from GCC "configure". # if test "x$target" = xNONE ; then - if test "x$nonopt" != xNONE; then + if test "x$nonopt" != xNONE ; then target=$nonopt else # This way of testing the result of a command substitution is @@ -217,8 +240,7 @@ if test "x$target" = xNONE ; then else echo 'Config.guess failed to determine the host type. You need \ to specify one.' 1>&2 - if [ -r config.status ] - then + if test -r config.status ; then tail +2 config.status 1>&2 fi exit 1 @@ -254,7 +276,7 @@ fi # We also record the architecture, vendor, and operating system (OS) # separately. case $HostPlatform in -alpha-dec-osf1* | alpha-dec-osf2*) +alpha-dec-osf[[1234]]*) HostPlatform=alpha-dec-osf1 # canonicalise for our purposes TargetPlatform=alpha-dec-osf1 # this will work for now... (hack) BuildPlatform=alpha-dec-osf1 #hack @@ -272,7 +294,7 @@ hppa1.1-hp-hpux*) HostVendor_CPP='hp' HostOS_CPP='hpux' ;; -i386-*-linuxaout*) +i[[3456]]86-*-linuxaout*) HostPlatform=i386-unknown-linuxaout # hack again TargetPlatform=i386-unknown-linuxaout BuildPlatform=i386-unknown-linuxaout @@ -281,16 +303,7 @@ i386-*-linuxaout*) HostVendor_CPP='unknown' HostOS_CPP='linuxaout' ;; -i486-*-linuxaout*) - HostPlatform=i386-unknown-linuxaout # hack again: NB: name for arch is *i386*! - TargetPlatform=i386-unknown-linuxaout - BuildPlatform=i386-unknown-linuxaout - HostPlatform_CPP='i386_unknown_linuxaout' - HostArch_CPP='i386' - HostVendor_CPP='unknown' - HostOS_CPP='linuxaout' - ;; -i386-*-linux*) +i[[3456]]86-*-linux*) HostPlatform=i386-unknown-linux # hack again TargetPlatform=i386-unknown-linux BuildPlatform=i386-unknown-linux @@ -299,40 +312,25 @@ i386-*-linux*) HostVendor_CPP='unknown' HostOS_CPP='linux' ;; -i486-*-linux*) - HostPlatform=i386-unknown-linux # hack again: NB: name for arch is *i386*! - TargetPlatform=i386-unknown-linux - BuildPlatform=i386-unknown-linux - HostPlatform_CPP='i386_unknown_linux' - HostArch_CPP='i386' - HostVendor_CPP='unknown' - HostOS_CPP='linux' - ;; -i386-*-freebsd*) +i[[3456]]86-*-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' ;; -i486-*-freebsd*) - HostPlatform_CPP='i386_unknown_freebsd' - HostArch_CPP='i386' - HostVendor_CPP='unknown' - HostOS_CPP='freebsd' - ;; -i386-*-netbsd*) - HostPlatform_CPP='i386_unknown_netbsd' - HostArch_CPP='i386' - HostVendor_CPP='unknown' - HostOS_CPP='netbsd' - ;; -i486-*-netbsd*) +i[[3456]]86-*-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' ;; -i386-*-solaris2*) +i[[3456]]86-*-solaris2*) HostPlatform=i386-unknown-solaris2 # hack again TargetPlatform=i386-unknown-solaris2 BuildPlatform=i386-unknown-solaris2 @@ -353,7 +351,7 @@ m68k-next-nextstep3) HostVendor_CPP='next' HostOS_CPP='nextstep3' ;; -i386-next-nextstep3) +i[[3456]]86-next-nextstep3) HostPlatform=i386-next-nextstep3 # hack again TargetPlatform=i386-next-nextstep3 BuildPlatform=i386-next-nextstep3 @@ -617,6 +615,10 @@ if test -z "$YaccCmd"; then fi fi +dnl ** Find lex command (lex or flex) and library (-ll or -lfl) +# +AC_PROG_LEX + #-------------------------------------------------------------- WithHc='haskell-compiler-unspecified' WithHcType='HC_UNSPECIFIED' @@ -689,14 +691,37 @@ esac AC_SUBST(WithHc) AC_SUBST(WithHcType) +dnl ** Possibly use something else instead of 'gcc'. +WhatGccIsCalled=gcc +AC_ARG_WITH(gcc, + [--with-gcc= + Use a different command instead of 'gcc' for the GNU C compiler.], + [HaveGcc=YES; WhatGccIsCalled="$withval"]) +AC_SUBST(WhatGccIsCalled) + +dnl ** Choose which make to use (default 'make -r') +MakeCmd='make -r' +AC_ARG_WITH(make, + [ +--with-make= + Use an alternate command instead of 'make'. This is useful + when GNU make is required (for instance when the default make + supplied by the system won't work, as is the case on FreeBSD + and NetBSD). You probably want to include the '-r' flag with + make, to exclude implicit suffix rules.], + [MakeCmd="$withval"]) +AC_SUBST(MakeCmd) + dnl ** possibly choose a different tmpdir (default /tmp) # let the user decide where the best tmpdir is # /tmp is the default; /usr/tmp is sometimes a good choice. # Very site-specific. TmpDir='/tmp' AC_ARG_WITH(tmpdir, - [--with-tmpdir= Use an alternative directory for -temporary files (presumably because /tmp is too small).], + [ +--with-tmpdir= + Use an alternative directory for temporary files (presumably + because /tmp is too small).], [TmpDir="$withval"]) AC_SUBST(TmpDir) @@ -707,8 +732,9 @@ HcMaxHeapWasSet='NO' HcMaxHeap='0' AC_ARG_WITH(max-heap, [ ---with-max-heap= Do all Haskell compilations -with a heap of this size. (If you've got it, flaunt it.)], +--with-max-heap= + Do all Haskell compilations with a heap of this size. (If + you've got it, flaunt it.)], [HcMaxHeapWasSet='YES' HcMaxHeap="$withval"]) AC_SUBST(HcMaxHeapWasSet) @@ -736,8 +762,12 @@ if echo $CPP | egrep gcc >/dev/null 2>&1; then echo > conftest.c gcc -v -E conftest.c >/dev/null 2>conftest.out echo '/(\S+\/cpp)/ && print "$1";' > conftest.pl - GNUCPP="`eval $PerlCmd -n conftest.pl conftest.out`" + # GNUCPP: used in jmake.c (GnuCppCmd) and in mkdependC + # (where we could do with the usual pre-#defines) + GNUCPP="gcc -E" test -n "$verbose" && echo " setting GNUCPP to $GNUCPP" + # RAWCPP: we do not want *any* pre-#defines... + # (e.g., hscpp, mkdependHS) RAWCPP="`eval $PerlCmd -n conftest.pl conftest.out` -traditional" test -n "$verbose" && echo " setting RAWCPP to $RAWCPP" rm -fr conftest* @@ -769,6 +799,9 @@ elif $ArCmd clq conftest.a >/dev/null 2>/dev/null; then elif $ArCmd cq conftest.a >/dev/null 2>/dev/null; then ArCmd="$ArCmd cq" NeedRanLib='YES' +elif $ArCmd cq conftest.a 2>&1 | grep 'no archive members specified' >/dev/null 2>/dev/null; then + ArCmd="$ArCmd cq" + NeedRanLib='YES' else echo "I can't figure out how to use your $ArCmd" exit 1 @@ -801,7 +834,7 @@ AC_HEADER_STDC # dnl ** check for specific header (.h) files that we are interested in # -AC_CHECK_HEADERS(dirent.h fcntl.h grp.h malloc.h memory.h nlist.h pwd.h siginfo.h signal.h stdlib.h string.h sys/fault.h sys/file.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/vadvise.h sys/wait.h termios.h time.h types.h unistd.h utime.h vfork.h ) +AC_CHECK_HEADERS(dirent.h fcntl.h grp.h malloc.h memory.h nlist.h pwd.h siginfo.h signal.h stdlib.h string.h sys/fault.h sys/file.h sys/mman.h sys/param.h sys/procfs.h sys/resource.h sys/signal.h sys/socket.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/vadvise.h sys/wait.h termios.h time.h types.h unistd.h utime.h vfork.h ) # dnl ** check if it is safe to include both and # @@ -815,21 +848,6 @@ dnl ** determine the type of signal() # AC_TYPE_SIGNAL # -dnl ** decide whether or not flex lexers need to be linked with -lfl -# -AC_CHECK_LIB(fl,yywrap, - FlexLibAvailable='YES', - FlexLibAvailable='NO') -AC_SUBST(FlexLibAvailable) -# -dnl ** Decide whether or not lex lexers need to be linked with -ll -# (Linux, for example, does not have "lex", only "flex") -# -AC_CHECK_LIB(l,yywrap, - LexLibAvailable='YES', - LexLibAvailable='NO') -AC_SUBST(LexLibAvailable) -# dnl ** check for specific library functions that we are interested in # AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect setitimer stat sysconf timelocal times vadvise vfork) @@ -864,49 +882,45 @@ char **argv; }], LeadingUnderscore='YES', LeadingUnderscore='NO', LeadingUnderscore='YES') test -n "$verbose" && echo " setting LeadingUnderscore to $LeadingUnderscore" -# ------------------------------------------------------------------------- -dnl -dnl * `GHC' CONFIGURATION STUFF - -if test "xxx$DoingGHC" = 'xxxghc' ; then -# a very big "if"! -# +dnl ------------------------------------------------------- dnl ** which builds to build? +dnl ** (applies to anything w/ libraries (ghc, hslibs, ???) +dnl ------------------------------------------------------- # builds: normal = sequential _ap_o ; _p = profiling (sequential); # _t = ticky; _u = unregisterized -GhcBuild_normal='YES' -GhcBuild_p='YES' -GhcBuild_t='NO' -GhcBuild_u='NO' +Build_normal='YES' +Build_p='YES' +Build_t='NO' +Build_u='NO' # _mc = concurrent; _mr = profiled concurrent; _mt = ticky concurrent # _mp = parallel; _mg = gransim -GhcBuild_mc='NO' -GhcBuild_mr='NO' -GhcBuild_mt='NO' -GhcBuild_mp='NO' -GhcBuild_mg='NO' +Build_mc='NO' +Build_mr='NO' +Build_mt='NO' +Build_mp='NO' +Build_mg='NO' # GC builds: _2s, _1s, _du (, _gn) -GhcBuild_2s='NO' -GhcBuild_1s='NO' -GhcBuild_du='NO' +Build_2s='NO' +Build_1s='NO' +Build_du='NO' # user builds: a...o -GhcBuild_a='NO' -GhcBuild_b='NO' -GhcBuild_c='NO' -GhcBuild_d='NO' -GhcBuild_e='NO' -GhcBuild_f='NO' -GhcBuild_g='NO' -GhcBuild_h='NO' -GhcBuild_i='NO' -GhcBuild_j='NO' -GhcBuild_k='NO' -GhcBuild_l='NO' -GhcBuild_m='NO' -GhcBuild_n='NO' -GhcBuild_o='NO' -GhcBuild_A='NO' -GhcBuild_B='NO' +Build_a='NO' +Build_b='NO' +Build_c='NO' +Build_d='NO' +Build_e='NO' +Build_f='NO' +Build_g='NO' +Build_h='NO' +Build_i='NO' +Build_j='NO' +Build_k='NO' +Build_l='NO' +Build_m='NO' +Build_n='NO' +Build_o='NO' +Build_A='NO' +Build_B='NO' # More could be added here... AC_ARG_ENABLE(normal-build, @@ -918,9 +932,9 @@ Choose all the \`builds' of GHC that you want: --disable-normal-build do *not* build GHC for normal sequential code], [case "$enableval" in - yes) GhcBuild_normal='YES' + yes) Build_normal='YES' ;; - no) GhcBuild_normal='NO' + no) Build_normal='NO' ;; *) echo "I don't understand this option: --enable-normal-build=$enableval" exit 1 @@ -930,9 +944,9 @@ Choose all the \`builds' of GHC that you want: AC_ARG_ENABLE(profiling, [--disable-profiling do *not* build profiling features], [case "$enableval" in - yes) GhcBuild_p='YES' + yes) Build_p='YES' ;; - no) GhcBuild_p='NO' + no) Build_p='NO' ;; *) echo "I don't understand this option: --enable-profiling=$enableval" exit 1 @@ -942,9 +956,9 @@ AC_ARG_ENABLE(profiling, AC_ARG_ENABLE(ticky, [--enable-ticky build for \`ticky-ticky' profiling (for implementors)], [case "$enableval" in - yes) GhcBuild_t='YES' + yes) Build_t='YES' ;; - no) GhcBuild_t='NO' + no) Build_t='NO' ;; *) echo "I don't understand this option: --enable-ticky=$enableval" exit 1 @@ -954,9 +968,9 @@ AC_ARG_ENABLE(ticky, AC_ARG_ENABLE(concurrent, [--enable-concurrent turn on \`concurrent Haskell' features], [case "$enableval" in - yes) GhcBuild_mc='YES' + yes) Build_mc='YES' ;; - no) GhcBuild_mc='NO' + no) Build_mc='NO' ;; *) echo "I don't understand this option: --enable-concurrent=$enableval" exit 1 @@ -966,9 +980,9 @@ AC_ARG_ENABLE(concurrent, AC_ARG_ENABLE(profiled-concurrent, [--enable-profiled-concurrent turn on profiling for \`concurrent Haskell'], [case "$enableval" in - yes) GhcBuild_mr='YES' + yes) Build_mr='YES' ;; - no) GhcBuild_mr='NO' + no) Build_mr='NO' ;; *) echo "I don't understand this option: --enable-profiled-concurrent=$enableval" exit 1 @@ -978,9 +992,9 @@ AC_ARG_ENABLE(profiled-concurrent, AC_ARG_ENABLE(ticky-concurrent, [--enable-ticky-concurrent turn on \`ticky-ticky' profiling for \`concurrent Haskell'], [case "$enableval" in - yes) GhcBuild_mt='YES' + yes) Build_mt='YES' ;; - no) GhcBuild_mt='NO' + no) Build_mt='NO' ;; *) echo "I don't understand this option: --enable-ticky-concurrent=$enableval" exit 1 @@ -990,9 +1004,9 @@ AC_ARG_ENABLE(ticky-concurrent, AC_ARG_ENABLE(parallel, [--enable-parallel turn on \`parallel Haskell' features], [case "$enableval" in - yes) GhcBuild_mp='YES'; + yes) Build_mp='YES'; ;; - no) GhcBuild_mp='NO' + no) Build_mp='NO' ;; *) echo "I don't understand this option: --enable-parallel=$enableval" exit 1 @@ -1002,9 +1016,9 @@ AC_ARG_ENABLE(parallel, AC_ARG_ENABLE(gransim, [--enable-gransim turn on GranSim parallel simulator], [case "$enableval" in - yes) GhcBuild_mg='YES'; + yes) Build_mg='YES'; ;; - no) GhcBuild_mg='NO' + no) Build_mg='NO' ;; *) echo "I don't understand this option: --enable-gransim=$enableval" exit 1 @@ -1014,9 +1028,9 @@ AC_ARG_ENABLE(gransim, AC_ARG_ENABLE(gc-2s, [--enable-gc-2s a build with the 2-space copying garbage collector], [case "$enableval" in - yes) GhcBuild_2s='YES' + yes) Build_2s='YES' ;; - no) GhcBuild_2s='NO' + no) Build_2s='NO' ;; *) echo "I don't understand this option: --enable-gc-2s=$enableval" exit 1 @@ -1026,9 +1040,9 @@ AC_ARG_ENABLE(gc-2s, AC_ARG_ENABLE(gc-1s, [--enable-gc-1s a build with the 1-space compacting garbage collector], [case "$enableval" in - yes) GhcBuild_1s='YES' + yes) Build_1s='YES' ;; - no) GhcBuild_1s='NO' + no) Build_1s='NO' ;; *) echo "I don't understand this option: --enable-gc-1s=$enableval" exit 1 @@ -1038,251 +1052,230 @@ AC_ARG_ENABLE(gc-1s, AC_ARG_ENABLE(gc-du, [--enable-gc-du a build with \`dual-mode' (1s/2s) garbage collector], [case "$enableval" in - yes) GhcBuild_du='YES' + yes) Build_du='YES' ;; - no) GhcBuild_du='NO' + no) Build_du='NO' ;; *) echo "I don't understand this option: --enable-gc-du=$enableval" exit 1 ;; esac]) -dnl some seds only allow 99 commands, meaning no more -dnl than 99 AC_SUBSTs. AARRGGHH!! -dnl AC_ARG_ENABLE(user-way-a, -dnl [--enable-user-way-a build for \`user way a' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_a='YES' -dnl ;; -dnl no) GhcBuild_a='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-a=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-b, -dnl [--enable-user-way-b build for \`user way b' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_b='YES' -dnl ;; -dnl no) GhcBuild_b='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-b=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-c, -dnl [--enable-user-way-c build for \`user way c' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_c='YES' -dnl ;; -dnl no) GhcBuild_c='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-c=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-d, -dnl [--enable-user-way-d build for \`user way d' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_d='YES' -dnl ;; -dnl no) GhcBuild_d='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-d=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-e, -dnl [--enable-user-way-e build for \`user way e' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_e='YES' -dnl ;; -dnl no) GhcBuild_e='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-e=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-f, -dnl [--enable-user-way-f build for \`user way f' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_f='YES' -dnl ;; -dnl no) GhcBuild_f='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-f=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-g, -dnl [--enable-user-way-g build for \`user way g' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_g='YES' -dnl ;; -dnl no) GhcBuild_g='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-g=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-h, -dnl [--enable-user-way-h build for \`user way h' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_h='YES' -dnl ;; -dnl no) GhcBuild_h='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-h=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-i, -dnl [--enable-user-way-i build for \`user way i' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_i='YES' -dnl ;; -dnl no) GhcBuild_i='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-i=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-j, -dnl [--enable-user-way-j build for \`user way j' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_j='YES' -dnl ;; -dnl no) GhcBuild_j='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-j=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-k, -dnl [--enable-user-way-k build for \`user way k' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_k='YES' -dnl ;; -dnl no) GhcBuild_k='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-k=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-l, -dnl [--enable-user-way-l build for \`user way l' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_l='YES' -dnl ;; -dnl no) GhcBuild_l='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-l=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-m, -dnl [--enable-user-way-m build for \`user way m' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_m='YES' -dnl ;; -dnl no) GhcBuild_m='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-m=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-n, -dnl [--enable-user-way-n build for \`user way n' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_n='YES' -dnl ;; -dnl no) GhcBuild_n='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-n=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-o, -dnl [--enable-user-way-o build for \`user way o' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_o='YES' -dnl ;; -dnl no) GhcBuild_o='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-o=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-A, -dnl [--enable-user-way-A build for \`user way A' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_A='YES' -dnl ;; -dnl no) GhcBuild_A='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-A=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -dnl AC_ARG_ENABLE(user-way-B, -dnl [--enable-user-way-B build for \`user way B' (mostly for implementors)], -dnl [case "$enableval" in -dnl yes) GhcBuild_B='YES' -dnl ;; -dnl no) GhcBuild_B='NO' -dnl ;; -dnl *) echo "I don't understand this option: --enable-user-way-B=$enableval" -dnl exit 1 -dnl ;; -dnl esac]) -dnl -AC_SUBST(GhcBuild_normal) -AC_SUBST(GhcBuild_p) -AC_SUBST(GhcBuild_t) -AC_SUBST(GhcBuild_u) -AC_SUBST(GhcBuild_mc) -AC_SUBST(GhcBuild_mr) -AC_SUBST(GhcBuild_mt) -AC_SUBST(GhcBuild_mp) -AC_SUBST(GhcBuild_mg) -AC_SUBST(GhcBuild_2s) -AC_SUBST(GhcBuild_1s) -AC_SUBST(GhcBuild_du) -dnl AC_SUBST(GhcBuild_a) -dnl AC_SUBST(GhcBuild_b) -dnl AC_SUBST(GhcBuild_c) -dnl AC_SUBST(GhcBuild_d) -dnl AC_SUBST(GhcBuild_e) -dnl AC_SUBST(GhcBuild_f) -dnl AC_SUBST(GhcBuild_g) -dnl AC_SUBST(GhcBuild_h) -dnl AC_SUBST(GhcBuild_i) -dnl AC_SUBST(GhcBuild_j) -dnl AC_SUBST(GhcBuild_k) -dnl AC_SUBST(GhcBuild_l) -dnl AC_SUBST(GhcBuild_m) -dnl AC_SUBST(GhcBuild_n) -dnl AC_SUBST(GhcBuild_o) -dnl AC_SUBST(GhcBuild_A) -dnl AC_SUBST(GhcBuild_B) +AC_ARG_ENABLE(user-way-a, + [--enable-user-way-a build for \`user way a' (mostly for implementors)], + [case "$enableval" in + yes) Build_a='YES' + ;; + no) Build_a='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-a=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-b, + [--enable-user-way-b build for \`user way b' (mostly for implementors)], + [case "$enableval" in + yes) Build_b='YES' + ;; + no) Build_b='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-b=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-c, + [--enable-user-way-c build for \`user way c' (mostly for implementors)], + [case "$enableval" in + yes) Build_c='YES' + ;; + no) Build_c='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-c=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-d, + [--enable-user-way-d build for \`user way d' (mostly for implementors)], + [case "$enableval" in + yes) Build_d='YES' + ;; + no) Build_d='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-d=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-e, + [--enable-user-way-e build for \`user way e' (mostly for implementors)], + [case "$enableval" in + yes) Build_e='YES' + ;; + no) Build_e='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-e=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-f, + [--enable-user-way-f build for \`user way f' (mostly for implementors)], + [case "$enableval" in + yes) Build_f='YES' + ;; + no) Build_f='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-f=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-g, + [--enable-user-way-g build for \`user way g' (mostly for implementors)], + [case "$enableval" in + yes) Build_g='YES' + ;; + no) Build_g='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-g=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-h, + [--enable-user-way-h build for \`user way h' (mostly for implementors)], + [case "$enableval" in + yes) Build_h='YES' + ;; + no) Build_h='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-h=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-i, + [--enable-user-way-i build for \`user way i' (mostly for implementors)], + [case "$enableval" in + yes) Build_i='YES' + ;; + no) Build_i='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-i=$enableval" + exit 1 + ;; + esac]) +AC_ARG_ENABLE(user-way-j, + [--enable-user-way-j build for \`user way j' (mostly for implementors)], + [case "$enableval" in + yes) Build_j='YES' + ;; + no) Build_j='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-j=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-k, + [--enable-user-way-k build for \`user way k' (mostly for implementors)], + [case "$enableval" in + yes) Build_k='YES' + ;; + no) Build_k='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-k=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-l, + [--enable-user-way-l build for \`user way l' (mostly for implementors)], + [case "$enableval" in + yes) Build_l='YES' + ;; + no) Build_l='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-l=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-m, + [--enable-user-way-m build for \`user way m' (mostly for implementors)], + [case "$enableval" in + yes) Build_m='YES' + ;; + no) Build_m='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-m=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-n, + [--enable-user-way-n build for \`user way n' (mostly for implementors)], + [case "$enableval" in + yes) Build_n='YES' + ;; + no) Build_n='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-n=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-o, + [--enable-user-way-o build for \`user way o' (mostly for implementors)], + [case "$enableval" in + yes) Build_o='YES' + ;; + no) Build_o='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-o=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-A, + [--enable-user-way-A build for \`user way A' (mostly for implementors)], + [case "$enableval" in + yes) Build_A='YES' + ;; + no) Build_A='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-A=$enableval" + exit 1 + ;; + esac]) + +AC_ARG_ENABLE(user-way-B, + [--enable-user-way-B build for \`user way B' (mostly for implementors)], + [case "$enableval" in + yes) Build_B='YES' + ;; + no) Build_B='NO' + ;; + *) echo "I don't understand this option: --enable-user-way-B=$enableval" + exit 1 + ;; + esac]) + +dnl We do not use AC_SUBST to communicate the Build_* info, +dnl as some seds (notably OSF) only allow 99 commands (!!!). +dnl We will do the equivalent by a HACK further down. + +# ------------------------------------------------------------------------- +dnl +dnl * `GHC' CONFIGURATION STUFF + +if test "xxx$DoingGHC" = 'xxxghc' ; then +# a very big "if"! +# #--------------------------------------------------------------- # dnl ** which Haskell compiler to bootstrap GHC with? @@ -1291,7 +1284,7 @@ dnl ** which Haskell compiler to bootstrap GHC with? # first, the defaults... WithGhcHc='haskell-compiler-unspecified' WithGhcHcType='HC_UNSPECIFIED' -GhcBuilderVersion='26' +GhcBuilderVersion='28' AC_ARG_WITH(hc-for-ghc, [ @@ -1335,9 +1328,9 @@ case $WithGhcHc in ;; ghc* | glhc* ) WithGhcHcType='HC_GLASGOW_GHC' - AC_CHECK_PROG(have_ghc,$WithGhcHc,$ac_dir/$ac_word) - if test -z "$have_ghc"; then - echo "Can't find Glasgow Haskell to compile with: $WithGhcHc" + AC_CHECK_PROG(have_ghc_ghc,$WithGhcHc,$ac_dir/$ac_word) + if test -z "$have_ghc_ghc"; then + echo "Can't find Glasgow Haskell to compile GHC with: $WithGhcHc" exit 1 else touch conftest.o @@ -1383,9 +1376,9 @@ fi AC_SUBST(GhcWithRegisterised) if test $GhcWithRegisterised = 'NO'; then - GhcBuild_u='YES' - GhcBuild_normal='NO' - GhcBuild_p='NO' + Build_u='YES' + Build_normal='NO' + Build_p='NO' fi # ToDo: make sure we can do concurrent for platform/circs... # ToDo: make sure we can do profiling for platform/circs... @@ -1519,24 +1512,99 @@ AC_ARG_ENABLE(sockets-library, esac]) AC_SUBST(GhcWithSockets) -dnl ** build the interpreter? -BuildGHCI='NO' -AC_ARG_ENABLE(ghci, - [--enable-ghci build Glasgow Haskell interpreter (HACKERS ONLY)], - [case "$enableval" in - yes) BuildGHCI='YES' - ;; - no) BuildGHCI='NO' - ;; - *) echo "I don't understand this option: --enable-ghci=$enableval" - exit 1 - ;; - esac]) -AC_SUBST(BuildGHCI) +# Here, by HACK means, we dump all the Build_ info +# into a file. See comment above. +rm -f ghc/mkworld/buildinfo.jm +echo creating ghc/mkworld/buildinfo.jm +cat > ghc/mkworld/buildinfo.jm <> ghc/mkworld/buildinfo.jm + echo "#define Build_$xx $yy" >> ghc/mkworld/buildinfo.jm + echo "#endif" >> ghc/mkworld/buildinfo.jm +done # here ends a very big if DoingGHC = 'ghc' ... fi +# ------------------------------------------------------------------------- +dnl +dnl * `HsLibs' CONFIGURATION STUFF + +if test "xxx$DoingHsLibs" = 'xxxhslibs' ; then +# a very big "if"! + +dnl ** which Haskell compiler to use on hslibs? +WithHsLibsHc='haskell-compiler-unspecified' +WithHsLibsHcType='HC_UNSPECIFIED' + +AC_ARG_WITH(hc-for-hslibs, + [ +******************************************************************* +** \`HsLibs' HASKELL LIBRARIES OPTIONS: + +The Haskell compiler to compile the Haskell Libraries suite; this +option, if used, overrides --with-hc=<...>: + + --with-hc-for-hslibs= + ghc* => Glasgow Haskell invoked by the name given + and you want to use it un-installed ("in-place").], + [case "$withval" in + ghc* | glhc* ) + WithHsLibsHc=$withval + ;; + in-place ) + WithHsLibsHc='IN-PLACE' + ;; + *) echo "I don't understand this option: --with-hc-for-hslibs=$withval" + exit 1 + ;; + esac]) + +# make sure that what they said makes sense.... set WithHsLibsHcType +case $WithHsLibsHc in + haskell-compiler-unspecified ) # maybe they said something earlier... + if test $WithHc = 'haskell-compiler-unspecified' ; then + echo "Neither --with-hc nor --with-hc-for-hslibs was properly set" + exit 1 + fi + ;; + ghc* | glhc* ) + WithHsLibsHcType='HC_GLASGOW_GHC' + AC_CHECK_PROG(have_ghc_hslibs,$WithHsLibsHc,$ac_dir/$ac_word) + if test -z "$have_ghc_hslibs"; then + echo "Can't find Glasgow Haskell to compile HsLibs with: $WithHsLibsHc" + exit 1 + fi + ;; + IN-PLACE) WithHsLibsHcType='HC_GLASGOW_GHC' + ;; +esac +AC_SUBST(WithHsLibsHc) +AC_SUBST(WithHsLibsHcType) + +# Here, by HACK means, we dump all the Build_ info +# into a file. See comment above. +rm -f hslibs/mkworld/buildinfo.jm +echo creating hslibs/mkworld/buildinfo.jm +cat > hslibs/mkworld/buildinfo.jm <> hslibs/mkworld/buildinfo.jm + echo "#define Build_$xx $yy" >> hslibs/mkworld/buildinfo.jm + echo "#endif" >> hslibs/mkworld/buildinfo.jm +done + +# here ends a very big if DoingHsLibs = 'hslibs' ... +fi # # ------------------------------------------------------------------------- dnl @@ -1589,9 +1657,9 @@ case $WithHappyHc in ;; ghc* | glhc* ) WithHappyHcType='HC_GLASGOW_GHC' - AC_CHECK_PROG(have_ghc,$WithHappyHc,$ac_dir/$ac_word) - if test -z "$have_ghc"; then - echo "Can't find Glasgow Haskell to compile with: $WithHappyHc" + AC_CHECK_PROG(have_ghc_happy,$WithHappyHc,$ac_dir/$ac_word) + if test -z "$have_ghc_happy"; then + echo "Can't find Glasgow Haskell to compile Happy with: $WithHappyHc" exit 1 fi ;; @@ -1664,9 +1732,9 @@ case $WithHaggisHc in ;; ghc* | glhc* ) WithHaggisHcType='HC_GLASGOW_GHC' - AC_CHECK_PROG(have_ghc,$WithHaggisHc,$ac_dir/$ac_word) - if test -z "$have_ghc"; then - echo "Can't find Glasgow Haskell to compile with: $WithHaggisHc" + AC_CHECK_PROG(have_ghc_haggis,$WithHaggisHc,$ac_dir/$ac_word) + if test -z "$have_ghc_haggis"; then + echo "Can't find Glasgow Haskell to compile Haggis with: $WithHaggisHc" exit 1 fi ;; @@ -1676,6 +1744,8 @@ esac AC_SUBST(WithHaggisHc) AC_SUBST(WithHaggisHcType) +# builds stuff?? ToDo + # here ends a very big if DoingHaggis = 'haggis' ... fi # @@ -1759,9 +1829,9 @@ case $WithNoFibHc in ;; ghc* | glhc* ) WithNoFibHcType='HC_GLASGOW_GHC' - AC_CHECK_PROG(have_ghc,$WithNoFibHc,$ac_dir/$ac_word) - if test -z "$have_ghc"; then - echo "Can't find Glasgow Haskell to compile with: $WithNoFibHc" + AC_CHECK_PROG(have_ghc_nofib,$WithNoFibHc,$ac_dir/$ac_word) + if test -z "$have_ghc_nofib"; then + echo "Can't find Glasgow Haskell to compile NoFib with: $WithNoFibHc" exit 1 fi ;; @@ -1769,7 +1839,7 @@ case $WithNoFibHc in WithNoFibHcType='HC_CHALMERS_HBC' AC_CHECK_PROG(have_hbc,$WithNoFibHc,YES,NO) if test $have_hbc = 'NO' ; then - echo "Can't find Chalmers HBC to compile with: $WithNoFibHc" + echo "Can't find Chalmers HBC to compile NoFib with: $WithNoFibHc" exit 1 fi ;; @@ -1777,7 +1847,7 @@ case $WithNoFibHc in WithNoFibHcType='HC_ROJEMO_NHC' AC_CHECK_PROG(have_nhc,$WithNoFibHc,YES,NO) if test $have_nhc = 'NO' ; then - echo "Can't find Niklas Rojemo's NHC to compile with: $WithNoFibHc" + echo "Can't find Niklas Rojemo's NHC to compile NoFib with: $WithNoFibHc" exit 1 fi ;; @@ -1816,8 +1886,7 @@ fi IncludeRealNoFibTests='YES' # defaults IncludeSpectralNoFibTests='YES' IncludeImaginaryNoFibTests='YES' -IncludePENDINGNoFibTests='NO' -IncludeUNUSEDNoFibTests='NO' +IncludeSpecialiseNoFibTests='NO' IncludeGHC_ONLYNoFibTests='NO' IncludePRIVATENoFibTests='NO' IncludeParallelNoFibTests='NO' @@ -1830,15 +1899,13 @@ only if using GHC): --enable-all-tests do *all* tests], [case "$enableval" in - yes) IncludePENDINGNoFibTests='YES' - IncludeUNUSEDNoFibTests='YES' - IncludeGHC_ONLYNoFibTests='YES' + yes) IncludeGHC_ONLYNoFibTests='YES' + IncludeSpecialiseNoFibTests='YES' IncludePRIVATENoFibTests='YES' IncludeParallelNoFibTests='YES' ;; - no) IncludePENDINGNoFibTests='NO' - IncludeUNUSEDNoFibTests='NO' - IncludeGHC_ONLYNoFibTests='NO' + no) IncludeGHC_ONLYNoFibTests='NO' + IncludeSpecialiseNoFibTests='NO' IncludePRIVATENoFibTests='NO' IncludeParallelNoFibTests='NO' @@ -1892,38 +1959,26 @@ AC_ARG_ENABLE(real-tests, ;; esac]) -AC_ARG_ENABLE(PENDING-tests, - [--enable-PENDING-tests include PENDING tests], - [case "$enableval" in - yes) IncludePENDINGNoFibTests='YES' - ;; - no) IncludePENDINGNoFibTests='NO' - ;; - *) echo "I don't understand this option: --enable-PENDING-tests=$enableval" - exit 1 - ;; - esac]) - -AC_ARG_ENABLE(UNUSED-tests, - [--enable-UNUSED-tests include UNUSED tests], +AC_ARG_ENABLE(GHC-ONLY-tests, + [--enable-GHC-ONLY-tests include GHC_ONLY tests], [case "$enableval" in - yes) IncludeUNUSEDNoFibTests='YES' + yes) IncludeGHC_ONLYNoFibTests='YES' ;; - no) IncludeUNUSEDNoFibTests='NO' + no) IncludeGHC_ONLYNoFibTests='NO' ;; - *) echo "I don't understand this option: --enable-UNUSED-tests=$enableval" + *) echo "I don't understand this option: --enable-GHC-ONLY-tests=$enableval" exit 1 ;; esac]) -AC_ARG_ENABLE(GHC-ONLY-tests, - [--enable-GHC-ONLY-tests include GHC_ONLY tests], +AC_ARG_ENABLE(specialise-tests, + [--enable-specialise-tests include specialisation tests], [case "$enableval" in - yes) IncludeGHC_ONLYNoFibTests='YES' + yes) IncludeSpecialiseNoFibTests='YES' ;; - no) IncludeGHC_ONLYNoFibTests='NO' + no) IncludeSpecialiseNoFibTests='NO' ;; - *) echo "I don't understand this option: --enable-GHC-ONLY-tests=$enableval" + *) echo "I don't understand this option: --enable-specialise-tests=$enableval" exit 1 ;; esac]) @@ -1953,15 +2008,47 @@ AC_ARG_ENABLE(parallel-tests, ;; esac]) -AC_SUBST(IncludeRealNoFibTests) -AC_SUBST(IncludeSpectralNoFibTests) -AC_SUBST(IncludeImaginaryNoFibTests) -AC_SUBST(IncludePENDINGNoFibTests) -AC_SUBST(IncludeUNUSEDNoFibTests) -AC_SUBST(IncludeGHC_ONLYNoFibTests) -AC_SUBST(IncludeSpecialiseNoFibTests) -AC_SUBST(IncludePRIVATENoFibTests) -AC_SUBST(IncludeParallelNoFibTests) +dnl not AC_SUBSTd because of 99-command seds (sigh) +dnl (See what follows instead) +dnl AC_SUBST(IncludeRealNoFibTests) +dnl AC_SUBST(IncludeSpectralNoFibTests) +dnl AC_SUBST(IncludeImaginaryNoFibTests) +dnl AC_SUBST(IncludeGHC_ONLYNoFibTests) +dnl AC_SUBST(IncludeSpecialiseNoFibTests) +dnl AC_SUBST(IncludePRIVATENoFibTests) +dnl AC_SUBST(IncludeParallelNoFibTests) + +# Here, by HACK means, we dump all the Include*NoFibTests info +# into a file. See comment above. +rm -f nofib/mkworld/buildinfo.jm +echo creating nofib/mkworld/buildinfo.jm +cat > nofib/mkworld/buildinfo.jm <> nofib/mkworld/buildinfo.jm + echo "#define Include${xx}NoFibTests $yy" >> nofib/mkworld/buildinfo.jm + echo "#endif" >> nofib/mkworld/buildinfo.jm +done + +# Here, by HACK means, we dump all the Build_ info +# into a file. See comment above. +rm -f nofib/mkworld/buildinfo.jm +echo creating nofib/mkworld/buildinfo.jm +cat > nofib/mkworld/buildinfo.jm <> nofib/mkworld/buildinfo.jm + echo "#define Build_$xx $yy" >> nofib/mkworld/buildinfo.jm + echo "#endif" >> nofib/mkworld/buildinfo.jm +done # here ends a very big if DoingNoFib = 'nofib' ... fi @@ -1972,7 +2059,7 @@ dnl * extract non-header files with substitution (end) # AC_SUBST(MkWorldSetup) -AC_OUTPUT(Makefile STARTUP mkworld/site.jm mkworld/platform.h mkworld/config.h $ghc_mkworld_site_ghc_jm $ghc_includes_platform_h $nofib_mkworld_site_nofib_jm) +AC_OUTPUT(Makefile STARTUP mkworld/site.jm mkworld/platform.h mkworld/config.h $ghc_mkworld_site_ghc_jm $ghc_includes_platform_h $hslibs_mkworld_site_hslibs_jm $nofib_mkworld_site_nofib_jm) echo '************************************************' echo '*** NOW DO: sh < STARTUP'