diff options
| author | Matthieu Patou <mat@matws.net> | 2010-12-09 23:31:16 +0300 |
|---|---|---|
| committer | Matthieu Patou <mat@matws.net> | 2010-12-10 02:07:18 +0300 |
| commit | 672c48b763ce3d53dc93cce1c73f3f1ced1147e8 (patch) | |
| tree | c45b578a15d204cdcd04d5f9d2fe4bd2cc4d4115 | |
| parent | 1f2518df5a4f21bb7a2bd2abc601517d7988c507 (diff) | |
| download | samba-672c48b763ce3d53dc93cce1c73f3f1ced1147e8.tar.gz samba-672c48b763ce3d53dc93cce1c73f3f1ced1147e8.tar.bz2 samba-672c48b763ce3d53dc93cce1c73f3f1ced1147e8.zip | |
build: finishing fixing broken libiconv on hpux
| -rw-r--r-- | lib/util/charset/wscript_configure | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure index 346d585f5c..e38f22be04 100644 --- a/lib/util/charset/wscript_configure +++ b/lib/util/charset/wscript_configure @@ -15,5 +15,7 @@ if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h if conf.env['HAVE_LIBICONV']: if conf.CHECK_FUNCS('mbrtowc', headers='wchar.h'): conf.DEFINE('HAVE_NATIVE_ICONV', 1) + elif conf.env.get['LIB_ICONV']: + del conf.env['LIB_ICONV'] else: conf.DEFINE('HAVE_NATIVE_ICONV', 1) |