diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dynconfig/wscript | 16 | ||||
| -rw-r--r-- | source4/libcli/wscript_build | 2 | ||||
| -rw-r--r-- | source4/librpc/wscript_build | 5 | ||||
| -rw-r--r-- | source4/wscript_build | 4 |
4 files changed, 16 insertions, 11 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): diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index bded7da4ca..537faf5950 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -4,7 +4,7 @@ bld.BUILD_SUBDIR('wbclient') bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS', source='../../libcli/util/doserr.c util/errormap.c util/nterr.c', - public_headers='../../libcli/util/error.h ../../testprogs/win32/spoolss/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h', + public_headers='../../libcli/util/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h', deps='talloc' ) diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 48bdecd3b3..f85f95ff4f 100644 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -5,7 +5,8 @@ bld.SAMBA_LIBRARY('LIBNDR', source='ndr/ndr_string.c ../../librpc/ndr/ndr_basic.c ../../librpc/ndr/uuid.c ../../librpc/ndr/ndr.c ../../librpc/ndr/ndr_misc.c ../../librpc/gen_ndr/ndr_misc.c', # PC_FILES='../librpc/ndr.pc', public_deps='LIBSAMBA-ERRORS talloc LIBSAMBA-UTIL CHARSET LIBSAMBA-HOSTCONFIG', - public_headers='../../librpc/ndr/libndr.h PIDL_COMMON/misc.h PIDL_COMMON/ndr_misc.h', + public_headers='../../librpc/gen_ndr/misc.h ../../librpc/gen_ndr/ndr_misc.h', + header_path='gen_ndr', depends_on='PIDL_MISC', vnum='0.0.1' ) @@ -327,7 +328,7 @@ bld.SAMBA_LIBRARY('NDR_STANDARD', # PC_FILES='../librpc/ndr_standard.pc', deps='NDR_SECURITY', public_deps='LIBNDR', - public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../rpc_server/lsa/lsa.h ../torture/rpc/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/ndr/ndr_svcctl.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h' + public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../rpc_server/lsa/lsa.h ../torture/rpc/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h' ) diff --git a/source4/wscript_build b/source4/wscript_build index 5d46ca48b8..e0b942b274 100644 --- a/source4/wscript_build +++ b/source4/wscript_build @@ -113,5 +113,5 @@ bld.BUILD_SUBDIR('../libcli/named_pipe_auth') bld.BUILD_SUBDIR('heimdal_build') bld.BUILD_SUBDIR('lib/smbreadline') bld.BUILD_SUBDIR('../codepages') - - +bld.BUILD_SUBDIR('setup') +bld.BUILD_SUBDIR('scripting') |