git.samba.org
/
ab
/
samba.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f2518d
)
build: finishing fixing broken libiconv on hpux
author
Matthieu Patou
<mat@matws.net>
Thu, 9 Dec 2010 20:31:16 +0000
(23:31 +0300)
committer
Matthieu Patou
<mat@matws.net>
Thu, 9 Dec 2010 23:07:18 +0000
(
02:07
+0300)
lib/util/charset/wscript_configure
patch
|
blob
|
history
diff --git
a/lib/util/charset/wscript_configure
b/lib/util/charset/wscript_configure
index 346d585f5c49eb5d79581e7701ed983013bc748b..e38f22be047f7b059f5c08726030adcbbd08eab3 100644
(file)
--- 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)