s3-waf: use SAMBA3_*() build rules in source3/build

[kamenim/samba-autobuild/.git] / source3 / build / wscript

diff --git a/source3/build/wscript b/source3/build/wscript
index 2cbcbe6de1c00537d1f26b062d26ce22dec41c4d..70219bc10a6bef17d91f065e442b81d1b550cd99 100644 (file)
--- a/source3/build/wscript
+++ b/source3/build/wscript
@@ -23,6 +23,7 @@ def configure(conf):
     for option in dir_options.keys():
         varname = get_varname(option)
         value = getattr(Options.options, varname, None)
+        value = Utils.subst_vars(value, conf.env)
         conf.ASSERT(value is not None, "Missing configure option %s" % varname)
         conf.ASSERT(varname not in conf.env, "Variable %s already defined" % varname)
         conf.env[varname] = value
@@ -33,19 +34,21 @@ def configure(conf):
         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
+        if f not in conf.env:
+            conf.env[f] = v
         if f in cflags_vars:
             conf.DEFINE(f, v, quote=True)
 
 def build(bld):
     cflags = dynconfig_cflags(bld)
-    bld.SAMBA_SUBSYSTEM('DYNCONFIG',
+    bld.SAMBA3_SUBSYSTEM('DYNCONFIG',
                         '../dynconfig.c',
                         deps='replace talloc tdb popt',
                         cflags=cflags)
-    bld.SAMBA_SUBSYSTEM('LOCALE_DIR',
+    bld.SAMBA3_SUBSYSTEM('LOCALE_DIR',
                         '../localedir.c',
-                        cflags=cflags)
+                        cflags='-DLOCALEDIR=\"%s\"' % bld.env.LOCALEDIR)
+
 
 def dynconfig_cflags(bld):
     '''work out the extra CFLAGS for dynconfig.c'''