sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4-dynconfig: use the build modules when running from build directory

Browse Source 
we need to use the newly built modules when running from the build
directory to ensure we don't run tests against a stale install

Pair-Programmed-With: Jelmer Vernooij <jelmer@samba.org>
This commit is contained in:
Andrew Tridgell 2010-10-13 10:37:22 +11:00
parent d95160ca2f
commit 72de3e698b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source4/dynconfig/wscript
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python
import string, Utils, Options, sys, Build
import string, Utils, Options, sys, Build, os
from samba_utils import EXPAND_VARIABLES
# list of directory options to offer in configure
@ -120,7 +120,12 @@ def dynconfig_cflags(bld):
'''work out the extra CFLAGS for dynconfig.c'''
cflags = []
for f in dyn_cflags.keys():
cflags.append('-D%s="%s"' % (f, bld.env[f]))
if not Options.is_install and f == 'MODULESDIR':
# we want binaries run from the source dir to use the current
# modules, not the installed ones
cflags.append('-DMODULESDIR="%s"' % os.path.join(os.getcwd(), 'bin/modules'))
else:
cflags.append('-D%s="%s"' % (f, bld.env[f]))
return cflags
Build.BuildContext.dynconfig_cflags = dynconfig_cflags
@ -132,4 +137,3 @@ def build(bld):
public_headers='../version.h',
header_path='samba',
cflags=cflags)