X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fconfigure.ac.in;h=677a249dc41012b38eba0cc7c961ca4f33b3caed;hb=ed333003733fd3f3a3de015998f59ee1a709230a;hp=cc834679d36b6b823ff84bdca71072b81c7dcbb3;hpb=793bde8add5bf57f06ed8e48cd99e84861d01a1a;p=ghc-hetmet.git

diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index cc83467..677a249 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -6,6 +6,7 @@ dnl
 
 AC_INIT([The Glorious Glasgow Haskell Compilation System], [@ProjectVersion@], [glasgow-haskell-bugs@haskell.org], [ghc])
 
+FP_BINDIST_GHC_PWD
 FP_FIND_ROOT
 
 BootingFromHc=NO
@@ -15,20 +16,7 @@ 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)
+FP_GMP
 
 #
 dnl ** Check Perl installation **
@@ -52,14 +40,9 @@ 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)
+AC_PATH_PROG(SedCmd,gsed sed,sed)
 
 #
 dnl ** How to invoke gcc/cpp **
@@ -90,6 +73,11 @@ AC_SUBST(CONF_LD_OPTS_STAGE1)
 AC_SUBST(CONF_LD_OPTS_STAGE2)
 
 #
+dnl ** how to invoke `ar' and `ranlib'
+#
+FP_PROG_AR_NEEDS_RANLIB
+
+#
 AC_CONFIG_FILES(extra-gcc-opts mk/config.mk mk/install.mk)
 AC_OUTPUT