X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fconfigure-bin.in;h=2dd90f03e6c4d80d722d1ce79f774bdb476147da;hb=5363a2a46f9d4569ccddd6463fd75fd7c2dd72b0;hp=afbab59977e6a832383c8dc68082248343100126;hpb=76eb32ad02c69685d653999bf68747e8be166a92;p=ghc-hetmet.git

diff --git a/distrib/configure-bin.in b/distrib/configure-bin.in
index afbab59..2dd90f0 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[[34]]*)
+	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*)
+	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 to
+	# arrange for good things to happen.
+	CFLAGS="-mno-cygwin $CFLAGS"
+	TargetPlatform=i386-unknown-mingw32
+	;;
 m68k-next-nextstep2)
 	TargetPlatform=m68k-next-nextstep2;;
 m68k-next-nextstep3)
@@ -66,6 +88,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 +108,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 +130,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 "****************************************************"
 echo "Configuration done, ready to either 'make install'"
-echo "or 'make in-place'."
+echo "or 'make in-place', followed by 'make install-docs'."
 echo "(see README and INSTALL files for more info.)"
-echo "**************************************************"
+echo "****************************************************"