X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fconfigure-bin.in;h=65743f3fe5c99a1f6d6ad00834d47046f0740d08;hb=d89f0e2d2adf5ebce15984d08b1d00de60db6d78;hp=2b2672f6ebbac81ced9409b30130f28107d84248;hpb=42b29bf991409fe8987e34478901022000cb7f54;p=ghc-hetmet.git

diff --git a/distrib/configure-bin.in b/distrib/configure-bin.in
index 2b2672f..65743f3 100644
--- a/distrib/configure-bin.in
+++ b/distrib/configure-bin.in
@@ -24,10 +24,14 @@ 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[[12]]*)
+alpha*-dec-osf[[12]]*)
 	TargetPlatform=alpha-dec-osf1;;
-alpha-dec-osf[[34]]*)
+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*)
@@ -36,15 +40,26 @@ i[[3456]]86-*-linux*)
 	TargetPlatform=i386-unknown-linux;;
 i[[3456]]86-*-freebsd2*)
 	TargetPlatform=i386-unknown-freebsd2;;
-i[[3456]]86-*-freebsd3*)
-	TargetPlatform=i386-unknown-freebsd3;;
+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)
@@ -61,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*)
@@ -118,13 +135,12 @@ dnl ** How to invoke cpp directly **
 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 "or 'make in-place', followed by 'make install-docs'."
+echo "or 'make in-place'."
 echo "(see README and INSTALL files for more info.)"
 echo "****************************************************"