From 00649a9c6266f959dbc7d857180e43f2b1363844 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 23 Mar 2010 09:29:51 +1100
Subject: build: updated configure checks or new syntax

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

(limited to 'lib/util/charset/wscript_configure')

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)
-- 
cgit