s4-heimdal_build fix up build after heimdal import

[nivanova/samba-autobuild/.git] / source4 / dynconfig / wscript

diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 5be688c72e60f4760e9f58093b8dcc5b068493e9..722940f28e3712bc8e38da33c6cb1528b3acd39e 100644 (file)
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import string, Utils, Options, sys
+import string, Utils, Options, sys, Build
 from samba_utils import EXPAND_VARIABLES
 
 # list of directory options to offer in configure
@@ -37,6 +37,7 @@ dyn_cflags = {
     'SWATDIR'                        : '${DATADIR}/swat',
     'CODEPAGEDIR'                    : '${LIBDIR}/samba',
     'LIBDIR'                         : '${LIBDIR}',
+    'LIBEXECDIR'                     : '${MODULESDIR}',
     'STATEDIR'                       : '${LOCALSTATEDIR}',
     'CACHEDIR'                       : '${LOCKDIR}',
     'SMB_PASSWD_FILE'                : '${PRIVATEDIR}/smbpasswd',
@@ -61,6 +62,7 @@ dyn_cflags_fhs = {
     'NCALRPCDIR'                     : '${LOCALSTATEDIR}/ncalrpc',
     'PYTHONDIR'                      : '${PYTHONDIR}',
     'MODULESDIR'                     : '${LIBDIR}/samba',
+    'LIBEXECDIR'                     : '${MODULESDIR}',
     'INCLUDEDIR'                     : '${INCLUDEDIR}/samba-4.0',
     'PKGCONFIGDIR'                   : '${LIBDIR}/pkgconfig',
     'SWATDIR'                        : '${DATADIR}/swat',
@@ -120,9 +122,10 @@ def dynconfig_cflags(bld):
     for f in dyn_cflags.keys():
         cflags.append('-D%s="%s"' % (f, bld.env[f]))
     return cflags
+Build.BuildContext.dynconfig_cflags = dynconfig_cflags
 
 def build(bld):
-    cflags = dynconfig_cflags(bld)
+    cflags = bld.dynconfig_cflags()
     bld.SAMBA_SUBSYSTEM('DYNCONFIG',
                         'dynconfig.c',
                         deps='replace talloc',