diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-26 16:18:18 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:08 +1000 |
| commit | 63f20e696e07c1d81f3b449505e6a0190dbcebc7 (patch) | |
| tree | cd5f88c16fb98f53919f673cffc423d7ba50b997 | |
| parent | eb4efc9eca9f0a1773fc974798e461415aa2076b (diff) | |
| download | samba-63f20e696e07c1d81f3b449505e6a0190dbcebc7.tar.gz samba-63f20e696e07c1d81f3b449505e6a0190dbcebc7.tar.bz2 samba-63f20e696e07c1d81f3b449505e6a0190dbcebc7.zip | |
s4-waf: look for libiconv before checking libc
This is needed for solaris8
| -rw-r--r-- | lib/util/charset/wscript_configure | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure index 0322bea446..fe99600803 100644 --- a/lib/util/charset/wscript_configure +++ b/lib/util/charset/wscript_configure @@ -1,2 +1,7 @@ -if conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=True, headers='iconv.h'): +# rather strangely, we need to look for libiconv before checking libc +# as the external libiconv can use a macro to override iconv_open to libiconv_open +# and then we may find the wrong iconv.h later due to other packages looking +# in /usr/local +if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h') or + conf.CHECK_FUNCS('iconv_open', headers='iconv.h')): conf.DEFINE('HAVE_NATIVE_ICONV', 1) |