From ab1cbc51f69101676412ab60021f7313f103b8be Mon Sep 17 00:00:00 2001 From: Matthias Kilian Date: Wed, 26 Aug 2009 15:44:06 +0000 Subject: [PATCH] Allow for configurable iconv include and library locations. This should help to fix the build on OpenBSD. --- base.buildinfo.in | 2 ++ configure.ac | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/base.buildinfo.in b/base.buildinfo.in index 9fe31ef..c225d5a 100644 --- a/base.buildinfo.in +++ b/base.buildinfo.in @@ -1 +1,3 @@ +extra-lib-dirs: @ICONV_LIB_DIRS@ extra-libraries: @EXTRA_LIBS@ +include-dirs: @ICONV_INCLUDE_DIRS@ 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) -- 1.7.10.4