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 3a875060d764d0c7efcd1a094234111a091f834c..4f95da722363f9d8e976ec68dbaf1495b5875707 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -24,7 +24,7 @@ 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.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]"),
@@ -60,14 +60,17 @@ def build(bld):
                           abi_file='ABI/talloc-%s.sigs' % VERSION,
                           abi_match='talloc* _talloc*',
                           hide_symbols=True,
-                          vnum=VERSION)
+                          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)
+                          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
@@ -82,22 +85,6 @@ def build(bld):
         bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
         bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
 
-        if bld.env.XSLTPROC:
-            bld.env.TALLOC_MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
-            bld.env.TALLOC_WEB_XSL = 'http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl'
-            bld.SAMBA_GENERATOR('talloc.3',
-                                source='talloc.3.xml',
-                                target='talloc.3',
-                                rule='${XSLTPROC} -o ${TGT} ${TALLOC_MAN_XSL} ${SRC}'
-                                )
-            bld.SAMBA_GENERATOR('talloc.3.html',
-                                source='talloc.3.xml',
-                                target='talloc.3.html',
-                                rule='${XSLTPROC} -o ${TGT} ${TALLOC_WEB_XSL} ${SRC}'
-                                )
-            bld.INSTALL_FILES('${MANDIR}/man3', 'talloc.3')
-
-
 def test(ctx):
     '''run talloc testsuite'''
     import Utils