summaryrefslogtreecommitdiff
path: root/source4/dynconfig/wscript
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-27 09:46:50 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:09 +1000
commit03998d097079397c6a58a9317964a30e9c2c5b26 (patch)
tree52a506428b30556a833873fcd367b8a4beb9c980 /source4/dynconfig/wscript
parent11ca0c7b9d49d7f6723119758262230fe4f568f2 (diff)
downloadsamba-03998d097079397c6a58a9317964a30e9c2c5b26.tar.gz
samba-03998d097079397c6a58a9317964a30e9c2c5b26.tar.bz2
samba-03998d097079397c6a58a9317964a30e9c2c5b26.zip
s4-waf: started adding auto-install of include files
Diffstat (limited to 'source4/dynconfig/wscript')
-rw-r--r--source4/dynconfig/wscript16
1 files changed, 10 insertions, 6 deletions
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 3b64503677..1f0c6c0372 100644
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -26,6 +26,7 @@ dyn_cflags = {
'PRIVATE_DIR' : '${PRIVATEDIR}',
'MODULESDIR' : '${PREFIX}/modules',
'SETUPDIR' : '${DATADIR}/setup',
+ 'INCLUDEDIR' : '${PREFIX}/include',
'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}',
'WINBINDD_SOCKET_DIR' : '${WINBINDD_SOCKET_DIR}',
'NTP_SIGND_SOCKET_DIR' : '${NTP_SIGND_SOCKET_DIR}',
@@ -61,16 +62,19 @@ def configure(conf):
conf.ASSERT(varname not in conf.env, "Variable %s already defined" % varname)
conf.env[varname] = value
+ for f in dyn_cflags.keys():
+ # substitute twice, as we could have substitutions containing variables
+ v = Utils.subst_vars(dyn_cflags[f], conf.env)
+ v = Utils.subst_vars(v, conf.env)
+ conf.ASSERT(v != '', "Empty dynconfig value for %s" % f)
+ conf.ASSERT(v.find('${') == -1, "Unsubstituted variable in %s : %s : %s" % (f, dyn_cflags[f], v))
+ conf.env[f] = v
+
def dynconfig_cflags(bld):
'''work out the extra CFLAGS for dynconfig.c'''
cflags = []
for f in dyn_cflags.keys():
- # substitute twice, as we could have substitutions containing variables
- v = Utils.subst_vars(dyn_cflags[f], bld.env)
- v = Utils.subst_vars(v, bld.env)
- bld.ASSERT(v != '', "Empty dynconfig value for %s" % f)
- bld.ASSERT(v.find('${') == -1, "Unsubstituted variable in %s : %s : %s" % (f, dyn_cflags[f], v))
- cflags.append('-D%s="%s"' % (f, v))
+ cflags.append('-D%s="%s"' % (f, bld.env[f]))
return cflags
def build(bld):