Test "ghc-pkg check" passes in bindisttest

Also fixes it so that it really does pass (we weren't substituting the
GMP variables in the RTS package config).

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index 1599b37..1abbd78 100644 (file)
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -36,6 +36,7 @@ endif
        $(BIN_DIST_INST_DIR)/bin/ghc --make HelloWorld
        ./HelloWorld > output
        $(CONTEXT_DIFF) output expected_output
+       $(BIN_DIST_INST_DIR)/bin/ghc-pkg check
 
 clean distclean:
        $(RM) -rf $(BIN_DIST_INST_SUBDIR)

diff --git a/distrib/configure-bin.ac b/distrib/configure-bin.ac
index 62562b8..783c1f1 100644 (file)
--- a/distrib/configure-bin.ac
+++ b/distrib/configure-bin.ac
@@ -105,6 +105,25 @@ 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 **
 #