Pass configure arguments to the library configure scripts

diff --git a/configure.ac b/configure.ac
index ac9835a..ac69cb1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,8 @@ if test ! -f mk/config.h.in; then
    exit 1
 fi
 
+AC_SUBST([CONFIGURE_ARGS], [$ac_configure_args])
+
 FP_SETUP_PROJECT_VERSION
 
 # Hmmm, we fix the RPM release number to 1 here... Is this convenient?

diff --git a/libraries/Makefile b/libraries/Makefile
index c405f4f..68d84f9 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -150,6 +150,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
                             --with-ld=$(LD) \
                             --datasubdir=ghc \
                             --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" \
+                            $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
                             --configure-option=--with-cc=$(CC)
        touch $@
 

diff --git a/mk/config.mk.in b/mk/config.mk.in
index cda113a..bc31ba2 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -1230,3 +1230,11 @@ WAY_o_HC_OPTS=
 # GhcLibCppOpts += -DWORD_SIZE_IN_BITS=31
 # SplitObjs=NO
 
+################################################################################
+#
+#    Library configure arguments
+#
+################################################################################
+
+CONFIGURE_ARGS = @CONFIGURE_ARGS@
+