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

diff --git a/distrib/configure-bin.in b/distrib/configure-bin.in
index 90967f4..ca29d7d 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,22 +24,42 @@ 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[[345]]*)
+	TargetPlatform=alpha-dec-osf3;;
+alpha*-unknown-linux)
+	TargetPlatform=alpha-unknown-linux;;
+alpha*-unknown-freebsd*)
+	TargetPlatform=alpha-unknown-freebsd;;
 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*)
+i[[3456]]86-*-freebsd2*)
+	TargetPlatform=i386-unknown-freebsd2;;
+i[[3456]]86-*-freebsd[[3-9]]*)
 	TargetPlatform=i386-unknown-freebsd;;
 i[[3456]]86-*-netbsd*)
 	TargetPlatform=i386-unknown-netbsd;;
+i[[3456]]86-*-openbsd*)
+	TargetPlatform=i386-unknown-openbsd;;
 i[[3456]]86-*-solaris2*)
 	TargetPlatform=i386-unknown-solaris2;;
-i[[3456]]86-*-cygwin32*)
+i[[3456]]86-*-cygwin*)
+	exeext='.exe'
 	TargetPlatform=i386-unknown-cygwin32;;
+i[[3456]]86-*-mingw32*)
+	exeext='.exe'
+	# We assume you're using mingw32 via the gcc that comes
+	# with cygwin, and not the native port, so let's augment
+	# the gcc command-line used here with -mno-cygwin -mwin32
+	# to arrange for good things to happen.
+	CFLAGS="-mno-cygwin -mwin32 $CFLAGS"
+	TargetPlatform=i386-unknown-mingw32
+	;;
 m68k-next-nextstep2)
 	TargetPlatform=m68k-next-nextstep2;;
 m68k-next-nextstep3)
@@ -54,6 +76,8 @@ powerpc-ibm-aix*)
 	TargetPlatform=powerpc-ibm-aix;;
 rs6000-ibm-aix*)
 	TargetPlatform=rs6000-ibm-aix;;
+powerpc-apple-darwin*)
+	TargetPlatform=powerpc-apple-darwin;;
 sparc-sun-sunos4*)
 	TargetPlatform=sparc-sun-sunos4;;
 sparc-sun-solaris2*)
@@ -66,29 +90,18 @@ 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
-    echo "You must install perl before you can continue"
-    echo "Perhaps it is already installed, but not in your PATH?"
-    echo ""
-    echo "Continuing, assuming perl will be available as: perl"
-fi
 #
-dnl ** does #!.../perl work? (sometimes it's too long...)
-echo "checking if \`#!$PerlCmd' works in shell scripts"
-echo "#!$PerlCmd"'
-exit $1;
-' > conftest
-chmod u+x conftest
-(SHELL=/bin/sh; export SHELL; ./conftest 69 > /dev/null)
-if test $? -ne 69; then
-   echo "It does!"
-else
-   echo "It doesn't!  Perhaps \`#!$PerlCmd' is too long (often 32 characters max)"
+dnl ** Check Perl installation **
+#
+AC_PATH_PROG(PerlCmd,perl)
+if test -z "$PerlCmd"; then
+   echo "You must install perl before you can continue"
+   echo "Perhaps it is already installed, but not in your PATH?"
    exit 1
 fi
-rm -f conftest
+FPTOOLS_SHEBANG_PERL
 
 #
 dnl ** figure out how to do a BSD-ish install **
@@ -108,13 +121,15 @@ AC_PATH_PROG(SedCmd,sed)
 #
 dnl ** How to invoke cpp directly **
 #
-AC_PROG_GNUCPP
+AC_PROG_CC
+FPTOOLS_HAVE_GCC
+AC_PROG_CPP
 
 #
 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'."
 echo "(see README and INSTALL files for more info.)"
-echo "**************************************************"
+echo "****************************************************"