s4:auth Move struct auth_usersupplied_info to a common location

[samba.git] / lib / talloc / wscript

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index a7476b7ec40182ce54244c54fdba01d698d047ba..4f95da722363f9d8e976ec68dbaf1495b5875707 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -1,52 +1,76 @@
 #!/usr/bin/env python
 
 APPNAME = 'talloc'
-VERSION = '2.0.2'
+VERSION = '2.0.3'
 
-blddir = 'bin'
 
-# find the buildtools directory
-import os
-buildtools = 'buildtools ../../buildtools'
-for d in buildtools.split():
-    if os.path.exists(d):
-        srcdir = os.path.dirname(d) or '.'
-        break
+blddir = 'bin'
 
+import os, sys
 
-LIBREPLACE_DIR= srcdir + '/lib/replace'
+# find the buildtools directory
+srcdir = '.'
+while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5:
+    srcdir = '../' + srcdir
+sys.path.insert(0, srcdir + '/buildtools/wafsamba')
 
 import sys
 sys.path.insert(0, srcdir+"/buildtools/wafsamba")
-import wafsamba, samba_dist
+import wafsamba, samba_dist, Options
+
+# setup what directories to put in a tarball
+samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools')
+
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
-    opt.BUNDLED_EXTENSION_DEFAULT('talloc', noextenion='talloc')
-    opt.recurse(LIBREPLACE_DIR)
+    opt.BUNDLED_EXTENSION_DEFAULT('talloc', noextension='talloc')
+    opt.RECURSE('lib/replace')
+    opt.add_option('--enable-talloc-compat1',
+                   help=("Build talloc 1.x.x compat library [False]"),
+                   action="store_true", dest='TALLOC_COMPAT1', default=False)
 
 def configure(conf):
-    conf.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools')
-    conf.sub_config(LIBREPLACE_DIR)
-
-    if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
-                                 implied_deps='replace'):
-        conf.define('USING_SYSTEM_TALLOC', 1)
+    conf.RECURSE('lib/replace')
 
     conf.env.standalone_talloc = conf.IN_LAUNCH_DIR()
 
+    if not conf.env.standalone_talloc:
+        if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
+                                     implied_deps='replace'):
+            conf.define('USING_SYSTEM_TALLOC', 1)
+
+    conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
+
+    if conf.env.standalone_talloc:
+        conf.find_program('xsltproc', var='XSLTPROC')
+
     conf.SAMBA_CONFIG_H()
 
 
 
 def build(bld):
-    bld.BUILD_SUBDIR(LIBREPLACE_DIR)
+    bld.RECURSE('lib/replace')
 
     if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'):
+
         bld.SAMBA_LIBRARY('talloc',
                           'talloc.c',
                           deps='replace',
-                          vnum=VERSION)
+                          abi_file='ABI/talloc-%s.sigs' % VERSION,
+                          abi_match='talloc* _talloc*',
+                          hide_symbols=True,
+                          vnum=VERSION,
+                                                 is_bundled=not bld.env.standalone_talloc, 
+                                                 manpages='talloc.3')
+
+        # should we also install the symlink to libtalloc1.so here?
+        bld.SAMBA_LIBRARY('talloc-compat1',
+                          'compat/talloc_compat1.c',
+                          deps='talloc',
+                          enabled = bld.env.TALLOC_COMPAT1,
+                          vnum=VERSION,
+                                                 is_bundled=not bld.env.standalone_talloc)
 
     if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
         # s4 already has the talloc testsuite builtin to smbtorture
@@ -59,9 +83,14 @@ def build(bld):
         bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
         bld.env.TALLOC_VERSION = VERSION
         bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
+        bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
 
+def test(ctx):
+    '''run talloc testsuite'''
+    import Utils
+    cmd = os.path.join(Utils.g_module.blddir, 'talloc_testsuite')
+    os.system(cmd)
 
 def dist():
     '''makes a tarball for distribution'''
     samba_dist.dist()
-