X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=c3f058c3ff5456226102fdd7eb0d45032d8110fc;hb=ca5a4a480d10d61e5b7a52eb4d556e8b8c33e69d;hp=4958303d80a9ee920ad4d178927342cb648cf870;hpb=e7d21ee4f8ac907665a7e170c71d59e13a01da09;p=ghc-hetmet.git diff --git a/configure.in b/configure.in index 4958303..c3f058c 100644 --- a/configure.in +++ b/configure.in @@ -386,9 +386,12 @@ mips-sgi-irix*) HostVendor_CPP='sgi' HostOS_CPP='irix' ;; -rs6000-ibm-aix*) - HostPlatform_CPP='rs6000_ibm_aix' - HostArch_CPP='rs6000' +powerpc-ibm-aix*) + 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' ;; @@ -502,8 +505,12 @@ glafp-utils/perl-4.035-fixes to your 4.035 perl. " fi else - echo "I'm not sure if your version of perl will work," - echo "but it's worth a shot, eh?" + if egrep "version 5" conftest.out >/dev/null 2>&1; then + : + else + echo "I'm not sure if your version of perl will work," + echo "but it's worth a shot, eh?" + fi fi rm -fr conftest* fi @@ -898,6 +905,9 @@ GhcBuild_l='NO' GhcBuild_m='NO' GhcBuild_n='NO' GhcBuild_o='NO' +GhcBuild_A='NO' +GhcBuild_B='NO' +# More could be added here... AC_ARG_ENABLE(normal-build, [ @@ -1219,6 +1229,30 @@ 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) @@ -1246,6 +1280,8 @@ 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) #--------------------------------------------------------------- # @@ -1299,9 +1335,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 @@ -1336,7 +1372,7 @@ AC_ARG_ENABLE(portable-C, if test $GhcWithRegisterised = 'YES'; then case $HostPlatform in - alpha-* | hppa1.1-* | i386-* | m68k-* | mips-* | sparc-* ) + alpha-* | hppa1.1-* | i386-* | m68k-* | mips-* | powerpc-* | sparc-* ) ;; *) echo "Don't know non-portable C tricks for this platform: $HostPlatform" @@ -1428,7 +1464,7 @@ AC_ARG_ENABLE(native-code-generator, esac]) if test $GhcWithNativeCodeGen = 'YES'; then case $TargetPlatform in - sparc-sun-sunos4 | sparc-sun-solaris2 | alpha-dec-osf1 ) + i386-* | alpha-* | sparc-* ) ;; *) echo "Don't have a native-code generator for this platform: $TargetPlatform" @@ -1553,9 +1589,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 ;; @@ -1628,9 +1664,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 ;; @@ -1645,6 +1681,34 @@ fi # # ------------------------------------------------------------------------- dnl +dnl * `Literate' CONFIGURATION STUFF + +if test "xxx$DoingLiterate" = 'xxxliterate' ; then +# a very big "if"! + +BuildInfoUtils='NO' +AC_ARG_ENABLE(info-utils, + [ +******************************************************************* +** Literate programming system OPTIONS: + +--enable-info-utils build GNU info/makeinfo utilities], + [case "$enableval" in + yes) BuildInfoUtils='YES' + ;; + no) BuildInfoUtils='NO' + ;; + *) echo "I don't understand this option: --enable-info-utils=$enableval" + exit 1 + ;; + esac]) +AC_SUBST(BuildInfoUtils) + +# here ends a very big if DoingLiterate = 'literate' ... +fi +# +# ------------------------------------------------------------------------- +dnl dnl * `NoFib' CONFIGURATION STUFF if test "xxx$DoingNoFib" = 'xxxnofib' ; then @@ -1695,9 +1759,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 ;; @@ -1705,7 +1769,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 ;; @@ -1713,7 +1777,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 ;; @@ -1726,8 +1790,8 @@ AC_SUBST(WithNoFibHcType) dnl ** what mkworld \`setup' should be used? AC_ARG_WITH(setup, [ -What mkworld \`setup' should be used? -Choices: ghc, hbc, nhc +--with-setup= : What mkworld \`setup' should be used? + Choices: ghc, hbc, nhc ], [case "$withval" in ghc ) MkWorldSetup='ghc' @@ -1736,7 +1800,7 @@ Choices: ghc, hbc, nhc ;; nhc ) MkWorldSetup='nhc' ;; - *) echo "I don't understand this option: --with-hc-for-nofib=$withval" + *) echo "I don't understand this option: --with-setup=$withval" exit 1 ;; esac])