waf: remove the restriction that private libraries must not have a vnum

[nivanova/samba-autobuild/.git] / lib / talloc / wscript

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 4e5131c01535041da4e516cf02cdfc1dabc4d145..a23532a189cee1afa85999034a91a96443c64e6d 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'talloc'
-VERSION = '2.0.3'
+VERSION = '2.0.4'
 
 
 blddir = 'bin'
@@ -32,7 +32,7 @@ def set_options(opt):
                    action="store_true", dest='TALLOC_COMPAT1', default=False)
     if opt.IN_LAUNCH_DIR():
         opt.add_option('--disable-python',
-                       help=("disable the pytevent module"),
+                       help=("disable the pytalloc module"),
                        action="store_true", dest='disable_python', default=False)
 
 
@@ -53,8 +53,7 @@ def configure(conf):
 
     conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
 
-    if conf.env.standalone_talloc:
-        conf.find_program('xsltproc', var='XSLTPROC')
+    conf.CHECK_XSLTPROC_MANPAGES()
 
     if not conf.env.disable_python:
         # also disable if we don't have the python libs installed
@@ -77,7 +76,6 @@ def build(bld):
         bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
         bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
         private_library = False
-        vnum = VERSION
 
         # should we also install the symlink to libtalloc1.so here?
         bld.SAMBA_LIBRARY('talloc-compat1-%s' % (VERSION),
@@ -90,28 +88,36 @@ def build(bld):
             bld.PKG_CONFIG_FILES('pytalloc-util.pc', vnum=VERSION)
     else:
         private_library = True
-        vnum = None
 
     if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'):
 
         bld.SAMBA_LIBRARY('talloc',
                           'talloc.c',
                           deps='replace',
-                          abi_file='ABI/talloc-%s.sigs' % VERSION,
+                          abi_directory='ABI',
                           abi_match='talloc* _talloc*',
                           hide_symbols=True,
-                          vnum=vnum,
+                          vnum=VERSION,
                           private_library=private_library,
                           manpages='talloc.3')
 
     if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python:
 
         bld.SAMBA_LIBRARY('pytalloc-util',
-            source='pytalloc.c',
+            source='pytalloc_util.c',
             public_deps='talloc',
+            abi_directory='ABI',
+            abi_match='py* Py*',
             pyext=True,
             vnum=VERSION,
+            private_library=private_library,
             )
+        bld.INSTALL_FILES('${INCLUDEDIR}', 'pytalloc.h')
+        bld.SAMBA_PYTHON('pytalloc',
+                         'pytalloc.c',
+                         deps='talloc pytalloc-util',
+                         enabled=True,
+                         realname='talloc.so')
 
     if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
         # s4 already has the talloc testsuite builtin to smbtorture
@@ -132,3 +138,8 @@ def test(ctx):
 def dist():
     '''makes a tarball for distribution'''
     samba_dist.dist()
+
+def reconfigure(ctx):
+    '''reconfigure if config scripts have changed'''
+    import samba_utils
+    samba_utils.reconfigure(ctx)