summaryrefslogtreecommitdiff
path: root/source4/lib/charset
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-19 22:01:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:28 -0500
commit069e498da2a03bd253a2fcf2b7ff13f266ab63b4 (patch)
tree640f3f77f4a16577c5deab17c4c9216da51bd179 /source4/lib/charset
parent700120068620f32f7affb479dc5986544afed643 (diff)
downloadsamba-069e498da2a03bd253a2fcf2b7ff13f266ab63b4.tar.gz
samba-069e498da2a03bd253a2fcf2b7ff13f266ab63b4.tar.bz2
samba-069e498da2a03bd253a2fcf2b7ff13f266ab63b4.zip
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)
Diffstat (limited to 'source4/lib/charset')
-rw-r--r--source4/lib/charset/SConscript14
1 files changed, 12 insertions, 2 deletions
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')