summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-06-12 23:13:07 +0000
committerIan Lynagh <igloo@earth.li>2009-06-12 23:13:07 +0000
commit7834fd6eab74b90a42b143406c3a75276499f52e (patch)
treec7020eaba14d594385c2a10b7700f88a30e4e762
parent7b067f2d08d4968ab323405828fa2f053964ffb0 (diff)
downloadhaskell-7834fd6eab74b90a42b143406c3a75276499f52e.tar.gz
Add iconv as an extra library on platform that need to link with it
For example, we need -liconv on OS X.
-rw-r--r--libraries/base/base.buildinfo.in1
-rw-r--r--libraries/base/configure.ac6
2 files changed, 7 insertions, 0 deletions
diff --git a/libraries/base/base.buildinfo.in b/libraries/base/base.buildinfo.in
new file mode 100644
index 0000000000..9fe31efe4c
--- /dev/null
+++ b/libraries/base/base.buildinfo.in
@@ -0,0 +1 @@
+extra-libraries: @EXTRA_LIBS@
diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac
index b66966e99e..c261c05a05 100644
--- a/libraries/base/configure.ac
+++ b/libraries/base/configure.ac
@@ -102,4 +102,10 @@ FP_CHECK_CONST([O_BINARY], [#include <fcntl.h>], [0])
# Check for idiosyncracies in some mingw impls of directory handling.
FP_READDIR_EOF_ERRNO
+AC_CHECK_LIB(iconv, iconv_open,
+ [EXTRA_LIBS="$EXTRA_LIBS iconv"])
+
+AC_SUBST(EXTRA_LIBS)
+AC_CONFIG_FILES([base.buildinfo])
+
AC_OUTPUT