summaryrefslogtreecommitdiff
path: root/lib/util/charset
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-23 09:29:51 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:00 +1000
commit00649a9c6266f959dbc7d857180e43f2b1363844 (patch)
tree52fb65dfd462e2a4baf5865a1a6c662c7f9dffc0 /lib/util/charset
parentf95ca1afc984ecf295b9181b2f699a72afcb4772 (diff)
downloadsamba-00649a9c6266f959dbc7d857180e43f2b1363844.tar.gz
samba-00649a9c6266f959dbc7d857180e43f2b1363844.tar.bz2
samba-00649a9c6266f959dbc7d857180e43f2b1363844.zip
build: updated configure checks or new syntax
Diffstat (limited to 'lib/util/charset')
-rw-r--r--lib/util/charset/wscript_configure12
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure
index 4dbb46d0fb..0322bea446 100644
--- a/lib/util/charset/wscript_configure
+++ b/lib/util/charset/wscript_configure
@@ -1,10 +1,2 @@
-conf.CHECK_HEADERS('iconv.h')
-
-conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=True)
-
-conf.CHECK_CODE('''
- iconv_t cd = iconv_open("ASCII","UCS-2LE");
- if (cd == 0 || cd == (iconv_t)-1) return -1;
- ''',
- define='HAVE_NATIVE_ICONV')
-
+if conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=True, headers='iconv.h'):
+ conf.DEFINE('HAVE_NATIVE_ICONV', 1)