X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=41e6c3f9f86e7b576c7641e47f3505dbf941d308;hb=95ec750f94236c2ae127a147d7c9bebec036bcab;hp=14d8710c079d2f73baa56c11c5b7ca7265c90981;hpb=efc0f420bad7df729c0f0222641d820ca0cfaa2a;p=ghc-hetmet.git

diff --git a/configure.ac b/configure.ac
index 14d8710..41e6c3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,25 @@ AC_SUBST([WithGhc])
 dnl ** Without optimization some INLINE trickery fails for GHCi
 SRC_CC_OPTS="-O"
 
+dnl Allow to specify iconv options to the toplevel configure script
+dnl so they can be properly passed to sub-builds.
+dnl Note: ICONV_LIB_DIRS and ICONV_INCLUDE_DIRS are not predefined
+dnl to the empty string to allow them to be overridden from the
+dnl environment.
+
+AC_ARG_WITH([iconv-includes],
+  [AC_HELP_STRING([--with-iconv-includes],
+    [directory containing iconv.h])],
+    [ICONV_INCLUDE_DIRS=$withval])
+
+AC_ARG_WITH([iconv-libraries],
+  [AC_HELP_STRING([--with-iconv-libraries],
+    [directory containing iconv library])],
+    [ICONV_LIB_DIRS=$withval])
+
+AC_SUBST(ICONV_INCLUDE_DIRS)
+AC_SUBST(ICONV_LIB_DIRS)
+
 dnl--------------------------------------------------------------------
 dnl * Choose host(/target/build) platform
 dnl--------------------------------------------------------------------