s3:pdb_samba_dsdb: add pdb_samba_dsdb_get_trusteddom_creds

[obnox/samba/samba-obnox.git] / dynconfig / wscript

diff --git a/dynconfig/wscript b/dynconfig/wscript
index 2a60a2a2e4fdb9d223a7ed2c107a68da5bfec570..6410c38afa4cb4b08c5c7269679da6c5a667ca5f 100755 (executable)
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -111,6 +111,16 @@ dynconfig = {
          'FHS-PATH':  '${PYTHONARCHDIR}',
          'OVERWRITE': True,
     },
+    'PERL_LIB_INSTALL_DIR' : {
+         'STD-PATH':  '${PERL_LIB_INSTALL_DIR}',
+         'FHS-PATH':  '${PERL_LIB_INSTALL_DIR}',
+         'OVERWRITE': True,
+    },
+    'PERL_ARCH_INSTALL_DIR' : {
+         'STD-PATH':  '${PERL_ARCH_INSTALL_DIR}',
+         'FHS-PATH':  '${PERL_ARCH_INSTALL_DIR}',
+         'OVERWRITE': True,
+    },
     'INCLUDEDIR' : {
          'STD-PATH':  '${INCLUDEDIR}',
          'FHS-PATH':  '${INCLUDEDIR}/samba-4.0',
@@ -128,10 +138,6 @@ dynconfig = {
          'STD-PATH':  '${LIBDIR}/pkgconfig',
          'FHS-PATH':  '${LIBDIR}/pkgconfig',
     },
-    'SWATDIR' : {
-         'STD-PATH':  '${DATADIR}/swat',
-         'FHS-PATH':  '${DATADIR}/samba/swat',
-    },
     'CODEPAGEDIR' : {
          'STD-PATH':  '${DATADIR}/codepages',
          'FHS-PATH':  '${DATADIR}/samba/codepages',
@@ -226,8 +232,8 @@ dynconfig = {
          'DELAY':     True,
     },
     'NTP_SIGND_SOCKET_DIR' : {
-         'STD-PATH':  '${SOCKET_DIR}/ntp_signd',
-         'FHS-PATH':  '${SOCKET_DIR}/ntp_signd',
+         'STD-PATH':  '${PRIVILEGED_SOCKET_DIR}/ntp_signd',
+         'FHS-PATH':  '${PRIVILEGED_SOCKET_DIR}/ntp_signd',
          'DELAY':     True,
     },
     'NCALRPCDIR' : {
@@ -269,7 +275,7 @@ def set_options(opt):
 
     fhs_help  = "Use FHS-compliant paths (default no)\n"
     fhs_help += "You should consider using this together with:\n"
-    fhs_help += "--prefix=/usr --sysconfdir=/etc --locatestatedir=/var"
+    fhs_help += "--prefix=/usr --sysconfdir=/etc --localstatedir=/var"
     opt_group.add_option('--enable-fhs', help=fhs_help,
                    action="store_true", dest='ENABLE_FHS', default=False)
 
@@ -349,29 +355,58 @@ def configure(conf):
         conf.start_msg("Dynconfig[%s]: " % (varname))
         conf.end_msg("'%s'" % (value), 'GREEN')
 
-def dynconfig_cflags(bld, list=None):
-    '''work out the extra CFLAGS for dynconfig.c'''
-    cflags = []
-    # override some paths when running from the build directory
+def get_override(bld):
     override = { 'MODULESDIR'    : 'bin/modules',
                  'PYTHONDIR'     : 'bin/python',
                  'PYTHONARCHDIR' : 'bin/python',
                  'BINDIR'        : 'bin',
                  'SBINDIR'       : 'bin',
-                 'CODEPAGEDIR'   : os.path.join(bld.env.srcdir, 'codepages'),
-                 'SCRIPTSBINDIR' : os.path.join(bld.env.srcdir, 'source4/scripting/bin'),
-                 'SETUPDIR'      : os.path.join(bld.env.srcdir, 'source4/setup') }
+                 'CODEPAGEDIR'   : 'codepages',
+                 'SCRIPTSBINDIR' : 'source4/scripting/bin',
+                 'SETUPDIR'      : 'source4/setup'
+                 }
+    return override
+
+def dynconfig_cflags(bld, list=None):
+    '''work out the extra CFLAGS for dynconfig.c'''
+    cflags = []
     for varname in dynconfig.keys():
         if list and not varname in list:
             continue
         value = bld.env[varname]
         if not Options.is_install:
+            override = get_override(bld)
             if varname in override:
-                value = os.path.join(os.getcwd(), override[varname])
+                value = os.path.join(bld.env.srcdir, override[varname])
         cflags.append('-D%s="%s"' % (varname, value))
     return cflags
 Build.BuildContext.dynconfig_cflags = dynconfig_cflags
 
+def dynconfig_varnames(bld, list=None):
+    '''work out the dynconfig variables'''
+    varnames = []
+    for varname in dynconfig.keys():
+        if list and not varname in list:
+            continue
+        varnames.append(varname)
+    return varnames
+Build.BuildContext.dynconfig_varnames = dynconfig_varnames
+
+def pathconfig_entities(bld, list=None):
+    '''work out the extra entities for the docs'''
+    entities = []
+    for varname in dynconfig.keys():
+        if list and not varname in list:
+            continue
+        value = bld.env[varname]
+        if not Options.is_install:
+            override = get_override(bld)
+            if varname in override:
+                value = os.path.join(bld.env.srcdir, override[varname])
+        entities.append("<!ENTITY pathconfig.%s   '%s'>" % (varname, value))
+    return entities
+Build.BuildContext.pathconfig_entities = pathconfig_entities
+
 def build(bld):
     cflags = bld.dynconfig_cflags()
     version_header = 'version.h'