ldb: Fix included ldb build.
[kamenim/samba.git] / buildtools / wafsamba / wafsamba.py
index a7258d3e9efb2ffd2fa1ce8019005dbf1cf89a3f..666a28254021c75eeb42ce55273fdfe5d7de598c 100644 (file)
@@ -1,14 +1,16 @@
 # a waf tool to add autoconf-like macros to the configure section
 # and for SAMBA_ macros for building libraries, binaries etc
 
-import Build, os, Options, Task, Utils, cc, TaskGen, fnmatch, re, shutil, Logs
+import Build, os, Options, Task, Utils, cc, TaskGen, fnmatch, re, shutil, Logs, Constants
 from Configure import conf
 from Logs import debug
 from samba_utils import SUBST_VARS_RECURSIVE
+TaskGen.task_gen.apply_verif = Utils.nada
 
 # bring in the other samba modules
 from samba_optimisation import *
 from samba_utils import *
+from samba_version import *
 from samba_autoconf import *
 from samba_patterns import *
 from samba_pidl import *
@@ -18,7 +20,16 @@ from samba_autoproto import *
 from samba_python import *
 from samba_deps import *
 from samba_bundled import *
+import samba_install
 import samba_conftests
+import samba_abi
+import tru64cc
+import irixcc
+import generic_cc
+import samba_dist
+import samba_wildcard
+
+O644 = 420
 
 # some systems have broken threading in python
 if os.environ.get('WAF_NOTHREADS') == '1':
@@ -28,14 +39,28 @@ LIB_PATH="shared"
 
 os.putenv('PYTHONUNBUFFERED', '1')
 
+
+if Constants.HEXVERSION < 0x105016:
+    Logs.error('''
+Please use the version of waf that comes with Samba, not
+a system installed version. See http://wiki.samba.org/index.php/Waf
+for details.
+
+Alternatively, please use ./autogen-waf.sh, and then
+run ./configure and make as usual. That will call the right version of waf.
+''')
+    sys.exit(1)
+
+
 @conf
 def SAMBA_BUILD_ENV(conf):
     '''create the samba build environment'''
-    conf.env['BUILD_DIRECTORY'] = conf.blddir
+    conf.env.BUILD_DIRECTORY = conf.blddir
     mkdir_p(os.path.join(conf.blddir, LIB_PATH))
     mkdir_p(os.path.join(conf.blddir, 'python/samba/dcerpc'))
     # this allows all of the bin/shared and bin/python targets
     # to be expressed in terms of build directory paths
+    mkdir_p(os.path.join(conf.blddir, 'default'))
     for p in ['python','shared']:
         link_target = os.path.join(conf.blddir, 'default/' + p)
         if not os.path.lexists(link_target):
@@ -50,8 +75,6 @@ def SAMBA_BUILD_ENV(conf):
         os.unlink(blib_src)
     elif os.path.exists(blib_src):
         shutil.rmtree(blib_src)
-    os.symlink(blib_bld, blib_src)
-
 
 
 def ADD_INIT_FUNCTION(bld, subsystem, target, init_function):
@@ -90,6 +113,11 @@ def SAMBA_LIBRARY(bld, libname, source,
                   target_type='LIBRARY',
                   bundled_extension=True,
                   link_name=None,
+                  abi_file=None,
+                  abi_match=None,
+                  hide_symbols=False,
+                  is_bundled=False,
+                  manpages=None,
                   enabled=True):
     '''define a Samba library'''
 
@@ -100,7 +128,7 @@ def SAMBA_LIBRARY(bld, libname, source,
     source = bld.EXPAND_VARIABLES(source, vars=vars)
 
     # remember empty libraries, so we can strip the dependencies
-    if (source == '') or (source == []):
+    if ((source == '') or (source == [])) and deps == '' and public_deps == '':
         SET_TARGET_TYPE(bld, libname, 'EMPTY')
         return
 
@@ -124,6 +152,7 @@ def SAMBA_LIBRARY(bld, libname, source,
                         autoproto      = autoproto,
                         depends_on     = depends_on,
                         needs_python   = needs_python,
+                        hide_symbols   = hide_symbols,
                         local_include  = local_include)
 
     if libname == obj_target:
@@ -137,18 +166,28 @@ def SAMBA_LIBRARY(bld, libname, source,
     deps = TO_LIST(deps)
     deps.append(obj_target)
 
-    if needs_python:
-        bundled_name = libname
+    if target_type == 'PYTHON' or realname or not is_bundled:
+        # Sanitize the library name
+        bundled_name = libname.lower().replace('_', '-')
+        while bundled_name.startswith("lib"):
+            bundled_name = bundled_name[3:]
     else:
         bundled_name = BUNDLED_NAME(bld, libname, bundled_extension)
 
-    features = 'cc cshlib'
-    if needs_python:
+    features = 'cc cshlib symlink_lib install_lib'
+    if target_type == 'PYTHON':
         features += ' pyext'
+    elif needs_python:
+        features += ' pyembed'
+    if abi_file:
+        features += ' abi_check'
+
+    if abi_file:
+        abi_file = os.path.join(bld.curdir, abi_file)
 
     bld.SET_BUILD_GROUP(group)
     t = bld(
-        features        = features + ' symlink_lib',
+        features        = features,
         source          = [],
         target          = bundled_name,
         samba_cflags    = CURRENT_CFLAGS(bld, libname, cflags),
@@ -158,73 +197,28 @@ def SAMBA_LIBRARY(bld, libname, source,
         local_include   = local_include,
         vnum            = vnum,
         install_path    = None,
-        ldflags         = build_rpath(bld),
-        name           = libname
+        samba_inst_path = install_path,
+        name            = libname,
+        samba_realname  = realname,
+        samba_install   = install,
+        abi_file        = abi_file,
+        abi_match       = abi_match,
+        is_bundled      = is_bundled
         )
 
+    if realname and not link_name:
+        link_name = 'shared/%s' % realname
+
     if link_name:
         t.link_name = link_name
 
-    # we don't need the double libraries if rpath is off
-    if (bld.env.RPATH_ON_INSTALL == False and
-        bld.env.RPATH_ON_BUILD == False):
-        install_target = bundled_name
-    else:
-        install_target = bundled_name + '.inst'
-        if install:
-            t.install_target = install_target
-
-    if install_path is None:
-        install_path = '${LIBDIR}'
-    install_path = SUBST_VARS_RECURSIVE(install_path, bld.env)
-
-    if install and install_target != bundled_name:
-        # create a separate install library, which may have
-        # different rpath settings
-        SET_TARGET_TYPE(bld, install_target, target_type)
-        t = bld(
-            features        = features,
-            source          = [],
-            target          = install_target,
-            samba_cflags    = CURRENT_CFLAGS(bld, libname, cflags),
-            depends_on      = depends_on,
-            samba_deps      = deps,
-            samba_includes  = includes,
-            local_include   = local_include,
-            vnum            = vnum,
-            install_as     = bundled_name,
-            install_path    = None,
-            ldflags         = install_rpath(bld)
-            )
-
-    if install:
-        if realname:
-            install_name = realname
-            install_link = None
-            inst_name    = install_target + '.so'
-        elif vnum:
-            vnum_base = vnum.split('.')[0]
-            install_name = 'lib%s.so.%s' % (bundled_name, vnum)
-            install_link = 'lib%s.so.%s' % (bundled_name, vnum_base)
-            inst_name    = 'lib%s.so' % install_target
-        else:
-            install_name = 'lib%s.so' % bundled_name
-            install_link = None
-            inst_name    = 'lib%s.so' % install_target
-
-        bld.install_as(os.path.join(install_path, install_name), inst_name)
-        if install_link:
-            bld.symlink_as(os.path.join(install_path, install_link), install_name)
-
-    if autoproto is not None:
-        bld.SAMBA_AUTOPROTO(autoproto, source)
-
-    if public_headers is not None:
-        bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
-
     if pc_files is not None:
         bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
 
+    if manpages is not None and 'XSLTPROC' in bld.env and bld.env['XSLTPROC']:
+        bld.MANPAGES(manpages)
+
+
 Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
 
 
@@ -235,11 +229,11 @@ def SAMBA_BINARY(bld, binname, source,
                  public_headers=None,
                  header_path=None,
                  modules=None,
-                 installdir=None,
                  ldflags=None,
                  cflags='',
                  autoproto=None,
-                 use_hostcc=None,
+                 use_hostcc=False,
+                 use_global_deps=True,
                  compiler=None,
                  group='binaries',
                  manpages=None,
@@ -248,19 +242,25 @@ def SAMBA_BINARY(bld, binname, source,
                  needs_python=False,
                  vars=None,
                  install=True,
-                 install_path=None):
+                 install_path=None,
+                 enabled=True):
     '''define a Samba binary'''
 
+    if not enabled:
+        SET_TARGET_TYPE(bld, binname, 'DISABLED')
+        return
+
     if not SET_TARGET_TYPE(bld, binname, 'BINARY'):
         return
 
-    features = 'cc cprogram'
+    features = 'cc cprogram symlink_bin install_bin'
     if needs_python:
         features += ' pyembed'
 
     obj_target = binname + '.objlist'
 
     source = bld.EXPAND_VARIABLES(source, vars=vars)
+    source = unique_list(TO_LIST(source))
 
     # first create a target for building the object files for this binary
     # by separating in this way, we avoid recompiling the C files
@@ -274,16 +274,18 @@ def SAMBA_BINARY(bld, binname, source,
                         autoproto      = autoproto,
                         subsystem_name = subsystem_name,
                         needs_python   = needs_python,
-                        local_include  = local_include)
+                        local_include  = local_include,
+                        use_hostcc     = use_hostcc,
+                        use_global_deps= use_global_deps)
 
     bld.SET_BUILD_GROUP(group)
 
-    # the library itself will depend on that object target
+    # the binary itself will depend on that object target
     deps = TO_LIST(deps)
     deps.append(obj_target)
 
     t = bld(
-        features       = features + ' symlink_bin',
+        features       = features,
         source         = [],
         target         = binname,
         samba_cflags   = CURRENT_CFLAGS(bld, binname, cflags),
@@ -294,56 +296,19 @@ def SAMBA_BINARY(bld, binname, source,
         top            = True,
         samba_subsystem= subsystem_name,
         install_path   = None,
-        ldflags        = build_rpath(bld)
+        samba_inst_path= install_path,
+        samba_install  = install
         )
 
-    if install_path is None:
-        install_path = '${BINDIR}'
-    install_path = SUBST_VARS_RECURSIVE(install_path, bld.env)
-
-    # we don't need the double binaries if rpath is off
-    if (bld.env.RPATH_ON_INSTALL == False and
-        bld.env.RPATH_ON_BUILD == False):
-        install_target = binname
-    else:
-        install_target = binname + '.inst'
-        if install:
-            t.install_target = install_target
-
-    if install and install_target != binname:
-        # we create a separate 'install' binary, which
-        # will have different rpath settings
-        SET_TARGET_TYPE(bld, install_target, 'BINARY')
-        t = bld(
-            features       = features,
-            source         = [],
-            target         = install_target,
-            samba_cflags   = CURRENT_CFLAGS(bld, binname, cflags),
-            samba_deps     = deps,
-            samba_includes = includes,
-            local_include  = local_include,
-            samba_modules  = modules,
-            top            = True,
-            samba_subsystem= subsystem_name,
-            install_path   = None,
-            ldflags        = install_rpath(bld)
-            )
-
-    if install:
-        bld.install_as(os.path.join(install_path, binname),
-                       install_target,
-                       chmod=0755)
-
     # setup the subsystem_name as an alias for the real
     # binary name, so it can be found when expanding
     # subsystem dependencies
     if subsystem_name is not None:
         bld.TARGET_ALIAS(subsystem_name, binname)
 
-    if autoproto is not None:
-        bld.SAMBA_AUTOPROTO(autoproto, source)
-    if public_headers is not None:
-        bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
+    if manpages is not None and 'XSLTPROC' in bld.env and bld.env['XSLTPROC']:
+        bld.MANPAGES(manpages)
+
 Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
 
 
@@ -363,54 +328,64 @@ def SAMBA_MODULE(bld, modname, source,
                  enabled=True):
     '''define a Samba module.'''
 
-    # we add the init function regardless of whether the module
-    # is enabled or not, as we need to generate a null list if
-    # all disabled
-    bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
+    source = bld.EXPAND_VARIABLES(source, vars=vars)
+
+    obj_target = modname + '.objlist'
+
+    bld.SAMBA_SUBSYSTEM(obj_target, source,
+                    deps=deps,
+                    includes=includes,
+                    autoproto=autoproto,
+                    autoproto_extra_source=autoproto_extra_source,
+                    cflags=cflags,
+                    local_include=local_include,
+                    enabled=enabled)
 
     if internal_module or BUILTIN_LIBRARY(bld, modname):
         # treat internal modules as subsystems for now
-        SAMBA_SUBSYSTEM(bld, modname, source,
-                        deps=deps,
-                        includes=includes,
-                        autoproto=autoproto,
-                        autoproto_extra_source=autoproto_extra_source,
-                        cflags=cflags,
-                        local_include=local_include,
-                        enabled=enabled)
+        bld.SAMBA_SUBSYSTEM(modname, deps=obj_target, source=[],
+                            enabled=enabled)
+        bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
         return
 
     if not enabled:
         SET_TARGET_TYPE(bld, modname, 'DISABLED')
         return
 
-    source = bld.EXPAND_VARIABLES(source, vars=vars)
-
-    # remember empty modules, so we can strip the dependencies
-    if (source == '') or (source == []):
-        SET_TARGET_TYPE(bld, modname, 'EMPTY')
-        return
-
     if not SET_TARGET_TYPE(bld, modname, 'MODULE'):
         return
 
+    deps = TO_LIST(deps)
+    deps.append(obj_target)
+    realname = modname 
     if subsystem is not None:
-        deps += ' ' + subsystem
+        deps.append(subsystem)
+        while realname.startswith("lib"+subsystem+"_"):
+            realname = realname[len("lib"+subsystem+"_"):]
+        while realname.startswith(subsystem+"_"):
+            realname = realname[len(subsystem+"_"):]
+        while realname.startswith("lib"):
+            realname = realname[len("lib"):]
 
     bld.SET_BUILD_GROUP('main')
-    bld(
-        features       = 'cc',
-        source         = source,
-        target         = modname,
+    t = bld(
+        features       = 'cc cshlib install_lib',
+        source         = [],
+        target         = realname,
+        name           = modname,
+        link_name      = "modules/%s/%s.${SHLIBEXT}" % (subsystem, realname),
         samba_cflags   = CURRENT_CFLAGS(bld, modname, cflags),
         samba_includes = includes,
         local_include  = local_include,
-        samba_deps     = TO_LIST(deps)
+        samba_deps     = deps,
+        install_path   = None,
+        samba_inst_path= "${MODULESDIR}/%s" % subsystem,
+        samba_realname = realname+ ".${SHLIBEXT}",
+        vnum           = None,
+        samba_install  = True,
+        is_bundled     = False,
         )
 
-    if autoproto is not None:
-        bld.SAMBA_AUTOPROTO(autoproto, source + ' ' + autoproto_extra_source)
-
 Build.BuildContext.SAMBA_MODULE = SAMBA_MODULE
 
 
@@ -435,7 +410,10 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
                     local_include_first=True,
                     subsystem_name=None,
                     enabled=True,
+                    use_hostcc=False,
+                    use_global_deps=True,
                     vars=None,
+                    hide_symbols=False,
                     needs_python=False):
     '''define a Samba subsystem'''
 
@@ -444,7 +422,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
         return
 
     # remember empty subsystems, so we can strip the dependencies
-    if (source == '') or (source == []):
+    if ((source == '') or (source == [])) and deps == '' and public_deps == '':
         SET_TARGET_TYPE(bld, modname, 'EMPTY')
         return
 
@@ -452,6 +430,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
         return
 
     source = bld.EXPAND_VARIABLES(source, vars=vars)
+    source = unique_list(TO_LIST(source))
 
     deps += ' ' + public_deps
 
@@ -465,13 +444,15 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
         features       = features,
         source         = source,
         target         = modname,
-        samba_cflags   = CURRENT_CFLAGS(bld, modname, cflags),
+        samba_cflags   = CURRENT_CFLAGS(bld, modname, cflags, hide_symbols=hide_symbols),
         depends_on     = depends_on,
         samba_deps     = TO_LIST(deps),
         samba_includes = includes,
         local_include  = local_include,
         local_include_first  = local_include_first,
-        samba_subsystem= subsystem_name
+        samba_subsystem= subsystem_name,
+        samba_use_hostcc = use_hostcc,
+        samba_use_global_deps = use_global_deps
         )
 
     if cflags_end is not None:
@@ -482,7 +463,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
     if heimdal_autoproto_private is not None:
         bld.HEIMDAL_AUTOPROTO_PRIVATE(heimdal_autoproto_private, source)
     if autoproto is not None:
-        bld.SAMBA_AUTOPROTO(autoproto, source + ' ' + autoproto_extra_source)
+        bld.SAMBA_AUTOPROTO(autoproto, source + TO_LIST(autoproto_extra_source))
     if public_headers is not None:
         bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
     return t
@@ -491,7 +472,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
 Build.BuildContext.SAMBA_SUBSYSTEM = SAMBA_SUBSYSTEM
 
 
-def SAMBA_GENERATOR(bld, name, rule, source, target,
+def SAMBA_GENERATOR(bld, name, rule, source='', target='',
                     group='generators', enabled=True,
                     public_headers=None,
                     header_path=None,
@@ -522,18 +503,6 @@ Build.BuildContext.SAMBA_GENERATOR = SAMBA_GENERATOR
 
 
 
-def BUILD_SUBDIR(bld, dir):
-    '''add a new set of build rules from a subdirectory'''
-    path = os.path.normpath(bld.curdir + '/' + dir)
-    cache = LOCAL_CACHE(bld, 'SUBDIR_LIST')
-    if path in cache: return
-    cache[path] = True
-    debug("build: Processing subdirectory %s" % dir)
-    bld.add_subdirs(dir)
-Build.BuildContext.BUILD_SUBDIR = BUILD_SUBDIR
-
-
-
 @runonce
 def SETUP_BUILD_GROUPS(bld):
     '''setup build groups used to ensure that the different build
@@ -581,62 +550,6 @@ def ENABLE_TIMESTAMP_DEPENDENCIES(conf):
 
 
 
-##############################
-# handle the creation of links for libraries and binaries
-# note that we use a relative symlink path to allow the whole tree
-# to me moved/copied elsewhere without breaking the links
-t = Task.simple_task_type('symlink_lib', 'rm -f ${LINK_TARGET} && ln -s ${LINK_SOURCE} ${LINK_TARGET}',
-                          shell=True, color='PINK', ext_in='.bin')
-t.quiet = True
-
-@feature('symlink_lib')
-@after('apply_link')
-def symlink_lib(self):
-    '''symlink a shared lib'''
-    tsk = self.create_task('symlink_lib', self.link_task.outputs[0])
-
-    # calculat the link target and put it in the environment
-    soext=""
-    vnum = getattr(self, 'vnum', None)
-    if vnum is not None:
-        soext = '.' + vnum.split('.')[0]
-
-    link_target = getattr(self, 'link_name', '')
-    if link_target == '':
-        link_target = '%s/lib%s.so%s' % (LIB_PATH, self.target, soext)
-
-
-    link_source = os_path_relpath(self.link_task.outputs[0].abspath(self.env),
-                                  os.path.join(self.env.BUILD_DIRECTORY, link_target))
-
-    tsk.env.LINK_TARGET = link_target
-    tsk.env.LINK_SOURCE = link_source[3:]
-    debug('task_gen: LINK for %s is %s -> %s',
-          self.name, tsk.env.LINK_SOURCE, tsk.env.LINK_TARGET)
-
-
-t = Task.simple_task_type('symlink_bin', 'rm -f ${BIN_TARGET} && ln -s ${SRC} ${BIN_TARGET}',
-                          shell=True, color='PINK', ext_in='.bin')
-t.quiet = True
-
-@feature('symlink_bin')
-@after('apply_link')
-def symlink_bin(self):
-    '''symlink a binary'''
-    if Options.is_install:
-        # we don't want to copy the install binary, as
-        # that has the install rpath, not the build rpath
-        # The rpath of the binaries in bin/default/foo/blah is different
-        # during the install phase, as distros insist on not using rpath in installed binaries
-        return
-    tsk = self.create_task('symlink_bin', self.link_task.outputs[0])
-
-    tsk.env.BIN_TARGET = self.target
-    debug('task_gen: BIN_TARGET for %s is %s', self.name, tsk.env.BIN_TARGET)
-
-
-
-
 t = Task.simple_task_type('copy_script', 'rm -f ${LINK_TARGET} && ln -s ${SRC[0].abspath(env)} ${LINK_TARGET}',
                           shell=True, color='PINK', ext_in='.bin')
 t.quiet = True
@@ -671,8 +584,8 @@ def SAMBA_SCRIPT(bld, name, pattern, installdir, installname=None):
 Build.BuildContext.SAMBA_SCRIPT = SAMBA_SCRIPT
 
 
-def install_file(bld, destdir, file, chmod=0644, flat=False,
-                 python_fixup=False, destname=None):
+def install_file(bld, destdir, file, chmod=O644, flat=False,
+                 python_fixup=False, destname=None, base_name=None):
     '''install a file'''
     destdir = bld.EXPAND_VARIABLES(destdir)
     if not destname:
@@ -688,30 +601,191 @@ def install_file(bld, destdir, file, chmod=0644, flat=False,
                             source=file,
                             target=inst_file)
         file = inst_file
+    if base_name:
+        file = os.path.join(base_name, file)
     bld.install_as(dest, file, chmod=chmod)
 
 
-def INSTALL_FILES(bld, destdir, files, chmod=0644, flat=False,
-                  python_fixup=False, destname=None):
+def INSTALL_FILES(bld, destdir, files, chmod=O644, flat=False,
+                  python_fixup=False, destname=None, base_name=None):
     '''install a set of files'''
     for f in TO_LIST(files):
         install_file(bld, destdir, f, chmod=chmod, flat=flat,
-                     python_fixup=python_fixup, destname=destname)
+                     python_fixup=python_fixup, destname=destname,
+                     base_name=base_name)
 Build.BuildContext.INSTALL_FILES = INSTALL_FILES
 
 
-def INSTALL_WILDCARD(bld, destdir, pattern, chmod=0644, flat=False,
-                     python_fixup=False, exclude=None):
+def INSTALL_WILDCARD(bld, destdir, pattern, chmod=O644, flat=False,
+                     python_fixup=False, exclude=None, trim_path=None):
     '''install a set of files matching a wildcard pattern'''
     files=TO_LIST(bld.path.ant_glob(pattern))
+    if trim_path:
+        files2 = []
+        for f in files:
+            files2.append(os_path_relpath(f, trim_path))
+        files = files2
+
     if exclude:
         for f in files[:]:
             if fnmatch.fnmatch(f, exclude):
                 files.remove(f)
-    INSTALL_FILES(bld, destdir, files, chmod=chmod, flat=flat, python_fixup=python_fixup)
+    INSTALL_FILES(bld, destdir, files, chmod=chmod, flat=flat,
+                  python_fixup=python_fixup, base_name=trim_path)
 Build.BuildContext.INSTALL_WILDCARD = INSTALL_WILDCARD
 
 
+def INSTALL_DIRS(bld, destdir, dirs):
+    '''install a set of directories'''
+    destdir = bld.EXPAND_VARIABLES(destdir)
+    dirs = bld.EXPAND_VARIABLES(dirs)
+    for d in TO_LIST(dirs):
+        bld.install_dir(os.path.join(destdir, d))
+Build.BuildContext.INSTALL_DIRS = INSTALL_DIRS
+
+
+re_header = re.compile('#include[ \t]*"([^"]+)"', re.I | re.M)
+class header_task(Task.Task):
+    """
+    The public headers (the one installed on the system) have both
+    different paths and contents, so the rename is not enough.
+
+    Intermediate .inst.h files are created because path manipulation
+    may be slow. The substitution is thus performed only once.
+    """
+
+    name = 'header'
+    color = 'PINK'
+    vars = ['INCLUDEDIR', 'HEADER_DEPS']
+
+    def run(self):
+        txt = self.inputs[0].read(self.env)
+
+        # hard-coded string, but only present in samba4 (I promise, you won't feel a thing)
+        txt = txt.replace('#if _SAMBA_BUILD_ == 4', '#if 1\n')
+
+        # use a regexp to substitute the #include lines in the files
+        map = self.generator.bld.hnodemap
+        dirnodes = self.generator.bld.hnodedirs
+        def repl(m):
+            if m.group(1):
+                s = m.group(1)
+
+                # pokemon headers: gotta catch'em all!
+                fin = s
+                if s.startswith('bin/default'):
+                    node = self.generator.bld.srcnode.find_resource(s.replace('bin/default/', ''))
+                    if not node:
+                        Logs.warn('could not find the public header for %r' % s)
+                    elif node.id in map:
+                        fin = map[node.id]
+                    else:
+                        Logs.warn('could not find the public header replacement for build header %r' % s)
+                else:
+                    # this part is more difficult since the path may be relative to anything
+                    for dirnode in dirnodes:
+                        node = dirnode.find_resource(s)
+                        if node:
+                             if node.id in map:
+                                 fin = map[node.id]
+                                 break
+                             else:
+                                 Logs.warn('could not find the public header replacement for source header %r %r' % (s, node))
+                    else:
+                        Logs.warn('-> could not find the public header for %r' % s)
+
+                return "#include <%s>" % fin
+            return ''
+
+        txt = re_header.sub(repl, txt)
+
+        # and write the output file
+        f = None
+        try:
+            f = open(self.outputs[0].abspath(self.env), 'w')
+            f.write(txt)
+        finally:
+            if f:
+                f.close()
+
+@TaskGen.feature('pubh')
+def make_public_headers(self):
+    """
+    collect the public headers to process and to install, then
+    create the substitutions (name and contents)
+    """
+
+    if not self.bld.is_install:
+        # install time only (lazy)
+        return
+
+    # keep two variables
+    #    hnodedirs: list of folders for searching the headers
+    #    hnodemap: node ids and replacement string (node objects are unique)
+    try:
+        self.bld.hnodedirs.append(self.path)
+    except AttributeError:
+        self.bld.hnodemap = {}
+        self.bld.hnodedirs = [self.bld.srcnode, self.path]
+
+        for k in 'source4 source4/include lib/talloc lib/tevent/ source4/lib/ldb/include/'.split():
+            node = self.bld.srcnode.find_dir(k)
+            if node:
+                self.bld.hnodedirs.append(node)
+
+    header_path = getattr(self, 'header_path', None) or ''
+
+    for x in self.to_list(self.headers):
+
+        # too complicated, but what was the original idea?
+        if isinstance(header_path, list):
+            add_dir = ''
+            for (p1, dir) in header_path:
+                lst = self.to_list(p1)
+                for p2 in lst:
+                    if fnmatch.fnmatch(x, p2):
+                        add_dir = dir
+                        break
+                else:
+                    continue
+                break
+            inst_path = add_dir
+        else:
+            inst_path = header_path
+
+        dest = ''
+        name = x
+        if x.find(':') != -1:
+            s = x.split(':')
+            name = s[0]
+            dest = s[1]
+
+        inn = self.path.find_resource(name)
+
+        if not inn:
+            raise ValueError("could not find the public header %r in %r" % (name, self.path))
+        out = inn.change_ext('.inst.h')
+        self.create_task('header', inn, out)
+
+        if not dest:
+            dest = inn.name
+
+        if inst_path:
+            inst_path = inst_path + '/'
+        inst_path = inst_path + dest
+
+        self.bld.install_as('${INCLUDEDIR}/%s' % inst_path, out, self.env)
+
+        self.bld.hnodemap[inn.id] = inst_path
+
+    # create a hash (not md5) to make sure the headers are re-created if something changes
+    val = 0
+    lst = list(self.bld.hnodemap.keys())
+    lst.sort()
+    for k in lst:
+        val = hash((val, k, self.bld.hnodemap[k]))
+    self.bld.env.HEADER_DEPS = val
+
 def PUBLIC_HEADERS(bld, public_headers, header_path=None):
     '''install some headers
 
@@ -719,27 +793,9 @@ def PUBLIC_HEADERS(bld, public_headers, header_path=None):
     or it can be a dictionary of wildcard patterns which map to destination
     directories relative to INCLUDEDIR
     '''
-    dest = '${INCLUDEDIR}'
-    if isinstance(header_path, str):
-        dest += '/' + header_path
-    for h in TO_LIST(public_headers):
-        hdest = dest
-        if isinstance(header_path, list):
-            for (p1, dir) in header_path:
-                found_match=False
-                lst = TO_LIST(p1)
-                for p2 in lst:
-                    if fnmatch.fnmatch(h, p2):
-                        if dir:
-                            hdest = os.path.join(hdest, dir)
-                        found_match=True
-                        break
-                if found_match: break
-        if h.find(':') != -1:
-            hs=h.split(':')
-            INSTALL_FILES(bld, hdest, hs[0], flat=True, destname=hs[1])
-        else:
-            INSTALL_FILES(bld, hdest, h, flat=True)
+    bld.SET_BUILD_GROUP('final')
+    ret = bld(features=['pubh'], headers=public_headers, header_path=header_path)
+    return ret
 Build.BuildContext.PUBLIC_HEADERS = PUBLIC_HEADERS
 
 
@@ -754,15 +810,27 @@ def subst_at_vars(task):
     # split on the vars
     a = re.split('(@\w+@)', s)
     out = []
+    done_var = {}
+    back_sub = [ ('PREFIX', '${prefix}'), ('EXEC_PREFIX', '${exec_prefix}')]
     for v in a:
         if re.match('@\w+@', v):
             vname = v[1:-1]
             if not vname in task.env and vname.upper() in task.env:
                 vname = vname.upper()
             if not vname in task.env:
-                print "Unknown substitution %s in %s" % (v, task.name)
-                raise
-            v = task.env[vname]
+                Logs.error("Unknown substitution %s in %s" % (v, task.name))
+                sys.exit(1)
+            v = SUBST_VARS_RECURSIVE(task.env[vname], task.env)
+            # now we back substitute the allowed pc vars
+            for (b, m) in back_sub:
+                s = task.env[b]
+                if s == v[0:len(s)]:
+                    if not b in done_var:
+                        # we don't want to substitute the first usage
+                        done_var[b] = True
+                    else:
+                        v = m + v[len(s):]
+                    break
         out.append(v)
     contents = ''.join(out)
     f = open(tgt, 'w')
@@ -788,6 +856,20 @@ def PKG_CONFIG_FILES(bld, pc_files, vnum=None):
 Build.BuildContext.PKG_CONFIG_FILES = PKG_CONFIG_FILES
 
 
+def MANPAGES(bld, manpages):
+    '''build and install manual pages'''
+    bld.env.MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
+    for m in manpages.split():
+        source = m + '.xml'
+        bld.SAMBA_GENERATOR(m,
+                            source=source,
+                            target=m,
+                            group='final',
+                            rule='${XSLTPROC} -o ${TGT} ${MAN_XSL} ${SRC}'
+                            )
+        bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
+Build.BuildContext.MANPAGES = MANPAGES
+
 
 #############################################################
 # give a nicer display when building different types of files
@@ -809,6 +891,16 @@ Task.TaskBase.classes['cc_link'].display = link_display
 def samba_display(self):
     if Options.options.progress_bar != 0:
         return Task.Task.old_display(self)
+
+    targets    = LOCAL_CACHE(self, 'TARGET_TYPE')
+    if self.name in targets:
+        target_type = targets[self.name]
+        type_map = { 'GENERATOR' : 'Generating',
+                     'PROTOTYPE' : 'Generating'
+                     }
+        if target_type in type_map:
+            return progress_display(self, type_map[target_type], self.name)
+
     fname = self.inputs[0].bldpath(self.env)
     if fname[0:3] == '../':
         fname = fname[3:]