summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2010-11-20 17:37:35 +0000
committerIan Lynagh <igloo@earth.li>2010-11-20 17:37:35 +0000
commitdc03e1edd86d02a94de6367edd16ecba24ca9936 (patch)
treeec8b297600af1b555353855f723f467c7d9d94fe /distrib
parente69c73766b85435741a83c87185be6f1f9ebdc92 (diff)
downloadhaskell-dc03e1edd86d02a94de6367edd16ecba24ca9936.tar.gz
Tweak the bindist configure.ac.in
Diffstat (limited to 'distrib')
-rw-r--r--distrib/configure.ac.in27
1 files changed, 7 insertions, 20 deletions
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index cc834679d3..1879fd143a 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -15,20 +15,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 +39,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 +72,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