From 069e498da2a03bd253a2fcf2b7ff13f266ab63b4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 19 Sep 2005 22:01:57 +0000
Subject: r10330: Add SConscript to more subsystems. Some of the tdb tools
 build now. Start on custom Samba scons tools (for handling proto generation,
 pidl, etc) (This used to be commit 4bffe4435944fffa3f9680b5a2fe63f2bdd98003)

---
 source4/lib/charset/SConscript | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'source4/lib/charset/SConscript')

diff --git a/source4/lib/charset/SConscript b/source4/lib/charset/SConscript
index d73d390309..7d9044d547 100644
--- a/source4/lib/charset/SConscript
+++ b/source4/lib/charset/SConscript
@@ -1,5 +1,15 @@
+SConscript('../../build/scons/iconv.py')
 #            tastes like -*- python -*-
-
 Import('hostenv')
-charset = hostenv.StaticLibrary('charset',['iconv.c','charcnv.c'])
+
+#conf = Configure(hostenv, custom_tests = { 'CheckIconv' : CheckIconv })
+#(have_iconv,iconv) = conf.CheckIconv()
+#conf.Finish()
+
+#if not have_iconv:
+#	print "Install iconv for better charset compatibility"
+
+iconv = []
+
+charset = hostenv.StaticLibrary('charset',['iconv.c','charcnv.c',iconv])
 Export('charset')
-- 
cgit