diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-09-25 14:58:09 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-10-03 01:15:04 +0000 |
| commit | 3ca886b83510c52d665dadb480b314c330029a0e (patch) | |
| tree | 72132cf34437f096b5fa7cc5f2306f4e179ccc70 /source4/dynconfig | |
| parent | ab6e3fce040f9ad27cbce44e9038a24f15b601c8 (diff) | |
| download | samba-3ca886b83510c52d665dadb480b314c330029a0e.tar.gz samba-3ca886b83510c52d665dadb480b314c330029a0e.tar.bz2 samba-3ca886b83510c52d665dadb480b314c330029a0e.zip | |
s4-heimdal_build fix up build after heimdal import
Heimdal has it's own dynconfig like system, and so we need the
LIBDIR etc in the CFLAGS here.
We also need to define build rules for the new files imported in
the merge commit, and fix up some header files.
This includes the work by Matthieu Patou <mat@matws.net>
Andrew Bartlett
Diffstat (limited to 'source4/dynconfig')
| -rw-r--r-- | source4/dynconfig/wscript | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript index 5be688c72e..722940f28e 100644 --- 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', |