summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-09-26 07:41:38 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-09-26 00:24:20 +0200
commit1c5c96d7cd63ad1d46fb120119c5ad6594e103cf (patch)
tree17f3b9d8a6f255a68af4b17d0532efd02f37fef8 /lib/util
parent6146b609e7add16a34067a4c40902f63d19fe5fe (diff)
downloadsamba-1c5c96d7cd63ad1d46fb120119c5ad6594e103cf.tar.gz
samba-1c5c96d7cd63ad1d46fb120119c5ad6594e103cf.tar.bz2
samba-1c5c96d7cd63ad1d46fb120119c5ad6594e103cf.zip
lib/util/charset: Try to find iconv on HP-UX
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/charset/wscript_configure3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure
index 98756fee2b..dc197c1244 100644
--- a/lib/util/charset/wscript_configure
+++ b/lib/util/charset/wscript_configure
@@ -10,8 +10,11 @@
conf.CHECK_LIB(libs="iconv", shlib=True)
+#HP-UX can use libiconv as an add-on package, which has #define iconv_open libiconv_open
if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h') or
+ conf.CHECK_FUNCS_IN('libiconv_open', 'iconv', checklibc=False, headers='iconv.h') or
conf.CHECK_FUNCS('iconv_open', headers='iconv.h')):
+
if conf.env['HAVE_LIBICONV']:
if conf.CHECK_FUNCS('mbrtowc', headers='wchar.h'):
conf.DEFINE('HAVE_NATIVE_ICONV', 1)