summaryrefslogtreecommitdiff
path: root/dynconfig
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-06-28 11:31:02 +0200
committerGünther Deschner <gd@samba.org>2011-06-28 17:54:41 +0200
commit56db9c9f274d414ad435bd7cd3f522f11257458e (patch)
tree95115bc8ec947df3bb0c81e43445ab1c8f265821 /dynconfig
parent8bc3f957bc098ee9310b468ce463a75090873bc6 (diff)
downloadsamba-56db9c9f274d414ad435bd7cd3f522f11257458e.tar.gz
samba-56db9c9f274d414ad435bd7cd3f522f11257458e.tar.bz2
samba-56db9c9f274d414ad435bd7cd3f522f11257458e.zip
s3-waf: remove s3-waf specific dynconfig.
This merge finally makes --with-logfilebase=foo and friends work appropriately. Andrews, Andreas, please check. Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Tue Jun 28 17:54:42 CEST 2011 on sn-devel-104
Diffstat (limited to 'dynconfig')
-rwxr-xr-xdynconfig/wscript5
1 files changed, 4 insertions, 1 deletions
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)