From 56db9c9f274d414ad435bd7cd3f522f11257458e Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 28 Jun 2011 11:31:02 +0200 Subject: s3-waf: remove s3-waf specific dynconfig. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This merge finally makes --with-logfilebase=foo and friends work appropriately. Andrews, Andreas, please check. Guenther Autobuild-User: Günther Deschner Autobuild-Date: Tue Jun 28 17:54:42 CEST 2011 on sn-devel-104 --- dynconfig/wscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'dynconfig') diff --git a/dynconfig/wscript b/dynconfig/wscript index 35af13db7e..d6b07efb5d 100755 --- a/dynconfig/wscript +++ b/dynconfig/wscript @@ -107,9 +107,12 @@ Build.BuildContext.dynconfig_cflags = dynconfig_cflags def build(bld): cflags = bld.dynconfig_cflags() + version_header = 'version.h' + if not os.getenv('TOPLEVEL_BUILD'): + version_header = 'include/version.h' bld.SAMBA_SUBSYSTEM('DYNCONFIG', 'dynconfig.c', deps='replace talloc', - public_headers=os_path_relpath(os.path.join(Options.launch_dir, 'version.h'), bld.curdir), + public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir), header_path='samba', cflags=cflags) -- cgit