X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fconfigure-bin.ac;h=62562b864b5ea59daa243355040bbfffdea2db4a;hb=442f06cc8f9f729d33a8de3aa14cdaf80545808e;hp=fd8c2f15d9124169d396178db8bc5247d44f6654;hpb=79b5a2cb4b9ed5fe41a05fa2ec98bd1f83971daf;p=ghc-hetmet.git

diff --git a/distrib/configure-bin.ac b/distrib/configure-bin.ac
index fd8c2f1..62562b8 100644
--- a/distrib/configure-bin.ac
+++ b/distrib/configure-bin.ac
@@ -5,7 +5,7 @@ dnl
 #
 
 # Is it there?
-AC_INIT(Makefile-vars.in)
+AC_INIT(mk/config.mk.in)
 
 exeext=''
 
@@ -53,11 +53,6 @@ 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*)
@@ -132,6 +127,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)
@@ -143,10 +143,15 @@ FP_HAVE_GCC
 AC_PROG_CPP
 
 #
-AC_OUTPUT(Makefile-vars)
+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 "****************************************************"