X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fconfigure-bin.ac;h=783c1f1680a83281e6503b76dfc102493bfd2236;hb=25cead299c5857b9142a82c917080a654be44b83;hp=11d3db2ff8aa9e5b4d79785d67302be867d80885;hpb=f30908b63b7bda01ac4fc8a3a62ea2a23da01ae9;p=ghc-hetmet.git

diff --git a/distrib/configure-bin.ac b/distrib/configure-bin.ac
index 11d3db2..783c1f1 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(mk/config.mk.in)
 
 exeext=''
 
@@ -53,13 +53,10 @@ i[[3456]]86-*-cygwin*)
 	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
 	;;
+i[[3456]]86-apple-darwin*)
+	TargetPlatform=i386-apple-darwin;;
 m68k-next-nextstep2)
 	TargetPlatform=m68k-next-nextstep2;;
 m68k-next-nextstep3)
@@ -78,10 +75,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 +103,27 @@ echo "Which we'll further canonicalise into: $TargetPlatform"
 AC_SUBST(TargetPlatform)
 AC_SUBST(exeext)
 
+FP_FIND_ROOT
+
+dnl--------------------------------------------------------------------
+dnl * Deal with arguments telling us gmp is somewhere odd
+dnl--------------------------------------------------------------------
+
+FP_ARG_GMP
+
+GMP_INCLUDE_DIRS=
+GMP_LIB_DIRS=
+if test "x$gmp_libraries" != "xNONE"; then
+  LDFLAGS="-L$gmp_libraries $LDFLAGS"
+  GMP_LIB_DIRS=$gmp_libraries
+fi
+if test "x$gmp_includes" != "xNONE"; then
+  CPPFLAGS="-I$gmp_includes $CPPFLAGS"
+  GMP_INCLUDE_DIRS=$gmp_includes
+fi
+AC_SUBST(GMP_INCLUDE_DIRS)
+AC_SUBST(GMP_LIB_DIRS)
+
 #
 dnl ** Check Perl installation **
 #
@@ -114,6 +146,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)
@@ -125,10 +162,15 @@ 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(extra-gcc-opts mk/config.mk)
+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 "****************************************************"