X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=26cd8903cb0a863d844b62d3ae03cb8b4ec195d8;hb=bedd73e0bbc92dc1855dce6698473eda3d06adac;hp=91c72a5205dc8fba90e2687b452a62861f9d4ab3;hpb=689dd035ca641ac6f8dea8337364c65b4b4aacd7;p=ghc-base.git

diff --git a/configure.ac b/configure.ac
index 91c72a5..26cd890 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,25 @@ AC_CHECK_FUNCS([lstat])
 AC_CHECK_FUNCS([getclock getrusage times])
 AC_CHECK_FUNCS([_chsize ftruncate])
 
+dnl--------------------------------------------------------------------
+dnl * Deal with arguments telling us iconv is somewhere odd
+dnl--------------------------------------------------------------------
+
+AC_ARG_WITH([iconv-includes],
+  [AC_HELP_STRING([--with-iconv-includes],
+    [directory containing iconv.h])],
+    [ICONV_INCLUDE_DIRS=$withval; CPPFLAGS="-I$withval"],
+    [ICONV_INCLUDE_DIRS=])
+
+AC_ARG_WITH([iconv-libraries],
+  [AC_HELP_STRING([--with-iconv-libraries],
+    [directory containing iconv library])],
+    [ICONV_LIB_DIRS=$withval; LDFLAGS="-L$withval"],
+    [ICONV_LIB_DIRS=])
+
+AC_SUBST(ICONV_INCLUDE_DIRS)
+AC_SUBST(ICONV_LIB_DIRS)
+
 # map standard C types and ISO types to Haskell types
 FPTOOLS_CHECK_HTYPE(char)
 FPTOOLS_CHECK_HTYPE(signed char)