X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fconfigure-bin.in;h=2b2672f6ebbac81ced9409b30130f28107d84248;hb=0268d6925e117661769fbe1ed823cbef7e4da8e3;hp=90967f465d9cd9a1ef6d48338022a69ce4dc5ae1;hpb=85f5a1aa5b5e1172ccfdcab8dca2d01b79da21eb;p=ghc-hetmet.git

diff --git a/distrib/configure-bin.in b/distrib/configure-bin.in
index 90967f4..2b2672f 100644
--- a/distrib/configure-bin.in
+++ b/distrib/configure-bin.in
@@ -7,6 +7,8 @@ dnl
 # Is it there?
 AC_INIT(Makefile.in)
 
+exeext=''
+
 #
 # First off, what system are we running under?
 #
@@ -22,21 +24,26 @@ TargetPlatform=`/bin/sh $srcdir/config.sub $target` || exit 1
 # We also record the architecture, vendor, and operating system (OS)
 # separately.
 case $TargetPlatform in
-alpha-dec-osf[[1234]]*)
+alpha-dec-osf[[12]]*)
 	TargetPlatform=alpha-dec-osf1;;
+alpha-dec-osf[[34]]*)
+	TargetPlatform=alpha-dec-osf3;;
 hppa1.1-hp-hpux*)
 	TargetPlatform=hppa1.1-hp-hpux;;
 i[[3456]]86-*-linuxaout*)
 	TargetPlatform=i386-unknown-linuxaout;;
 i[[3456]]86-*-linux*)
 	TargetPlatform=i386-unknown-linux;;
-i[[3456]]86-*-freebsd*)
-	TargetPlatform=i386-unknown-freebsd;;
+i[[3456]]86-*-freebsd2*)
+	TargetPlatform=i386-unknown-freebsd2;;
+i[[3456]]86-*-freebsd3*)
+	TargetPlatform=i386-unknown-freebsd3;;
 i[[3456]]86-*-netbsd*)
 	TargetPlatform=i386-unknown-netbsd;;
 i[[3456]]86-*-solaris2*)
 	TargetPlatform=i386-unknown-solaris2;;
 i[[3456]]86-*-cygwin32*)
+	exeext='.exe'
 	TargetPlatform=i386-unknown-cygwin32;;
 m68k-next-nextstep2)
 	TargetPlatform=m68k-next-nextstep2;;
@@ -66,6 +73,7 @@ esac
 echo "Which we'll further canonicalise into: $TargetPlatform"
 
 AC_SUBST(TargetPlatform)
+AC_SUBST(exeext)
 
 AC_CHECK_PROG(PerlCmd,perl,$ac_dir/$ac_word)
 if test -z "$PerlCmd"; then
@@ -85,8 +93,7 @@ chmod u+x conftest
 if test $? -ne 69; then
    echo "It does!"
 else
-   echo "It doesn't!  Perhaps \`#!$PerlCmd' is too long (often 32 characters max)"
-   exit 1
+   echo "It doesn't!  Perhaps \`#!$PerlCmd' is too long (often 32 characters max).."
 fi
 rm -f conftest
 
@@ -108,13 +115,16 @@ AC_PATH_PROG(SedCmd,sed)
 #
 dnl ** How to invoke cpp directly **
 #
-AC_PROG_GNUCPP
+AC_PROG_CC
+FPTOOLS_HAVE_GCC
+AC_PROG_CPP
+FPTOOLS_PROG_GNUCPP
 
 #
 AC_OUTPUT(Makefile)
 
-echo "**************************************************"
-echo "Configuration done, ready to either `make install' "
-echo ""
+echo "****************************************************"
+echo "Configuration done, ready to either 'make install'"
+echo "or 'make in-place', followed by 'make install-docs'."
 echo "(see README and INSTALL files for more info.)"
-echo "**************************************************"
+echo "****************************************************"