X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=distrib%2Fconfigure-bin.ac;h=ba0803336e6e1f000b4482c5cb26980ba7a1eca4;hp=ca29d7de2108a4dbc8f5a525c88a0ca24ff3acb9;hb=4905e62021b94b01cdb3a83b22d81d8c763b36f9;hpb=81cb7610337b33508066dd400cd371ff6033c987

diff --git a/distrib/configure-bin.ac b/distrib/configure-bin.ac
index ca29d7d..ba08033 100644
--- a/distrib/configure-bin.ac
+++ b/distrib/configure-bin.ac
@@ -5,7 +5,7 @@ dnl
 #
 
 # Is it there?
-AC_INIT(Makefile.in)
+AC_INIT(Makefile-vars.in)
 
 exeext=''
 
@@ -60,6 +60,8 @@ i[[3456]]86-*-mingw32*)
 	CFLAGS="-mno-cygwin -mwin32 $CFLAGS"
 	TargetPlatform=i386-unknown-mingw32
 	;;
+i[[3456]]86-apple-darwin*)
+	TargetPlatform=i386-apple-darwin;;
 m68k-next-nextstep2)
 	TargetPlatform=m68k-next-nextstep2;;
 m68k-next-nextstep3)
@@ -78,10 +80,24 @@ rs6000-ibm-aix*)
 	TargetPlatform=rs6000-ibm-aix;;
 powerpc-apple-darwin*)
 	TargetPlatform=powerpc-apple-darwin;;
+powerpc-*-linux*)
+	TargetPlatform=powerpc-unknown-linux;;
+powerpc64-*-linux*)
+	TargetPlatform=powerpc64-unknown-linux;;
 sparc-sun-sunos4*)
 	TargetPlatform=sparc-sun-sunos4;;
 sparc-sun-solaris2*)
 	TargetPlatform=sparc-sun-solaris2;;
+x86_64-*-linux*)
+        TargetPlatform=x86_64-unknown-linux;;
+x86_64-*-freebsd*)
+	TargetPlatform=x86_64-unknown-freebsd;;
+x86_64-*-openbsd*)
+	TargetPlatform=x86_64-unknown-openbsd;;
+x86_64-*-netbsd*)
+	TargetPlatform=x86_64-unknown-netbsd;;
+x86_64-apple-darwin*)
+	TargetPlatform=x86_64-apple-darwin;;
 *)
         echo "Unrecognised platform: $TargetPlatform"
         exit 1
@@ -92,6 +108,8 @@ echo "Which we'll further canonicalise into: $TargetPlatform"
 AC_SUBST(TargetPlatform)
 AC_SUBST(exeext)
 
+FP_FIND_ROOT
+
 #
 dnl ** Check Perl installation **
 #
@@ -114,6 +132,11 @@ dnl ** how to do symlinks **
 AC_PROG_LN_S()
 
 #
+dnl ** how to invoke `ar' and `ranlib'
+#
+FP_PROG_AR_NEEDS_RANLIB
+
+#
 dnl ** Find the path to sed **
 #
 AC_PATH_PROG(SedCmd,sed)
@@ -121,15 +144,19 @@ AC_PATH_PROG(SedCmd,sed)
 #
 dnl ** How to invoke cpp directly **
 #
-AC_PROG_CC
-FPTOOLS_HAVE_GCC
+FP_HAVE_GCC
 AC_PROG_CPP
 
 #
-AC_OUTPUT(Makefile)
+dnl ** Check gcc version and flags we need to pass it **
+#
+FP_GCC_EXTRA_FLAGS
+
+#
+AC_CONFIG_FILES(Makefile-vars extra-gcc-opts)
+AC_OUTPUT
 
 echo "****************************************************"
-echo "Configuration done, ready to either 'make install'"
-echo "or 'make in-place'."
+echo "Configuration done, ready to 'make install'"
 echo "(see README and INSTALL files for more info.)"
 echo "****************************************************"