From 672c48b763ce3d53dc93cce1c73f3f1ced1147e8 Mon Sep 17 00:00:00 2001
From: Matthieu Patou <mat@matws.net>
Date: Thu, 9 Dec 2010 23:31:16 +0300
Subject: [PATCH] build: finishing fixing broken libiconv on hpux

---
 lib/util/charset/wscript_configure | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure
index 346d585f5c4..e38f22be047 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)
-- 
2.11.4.GIT