diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-19 09:39:58 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:53 +1000 |
| commit | 9799356082958103b51d9f7216a77a31d90d9937 (patch) | |
| tree | fe84cd9e507d6a71f5aa053f61ce09912a743416 /buildtools | |
| parent | dae33b53a545217f432c7b1c650b9a6650a96f9a (diff) | |
| download | samba-9799356082958103b51d9f7216a77a31d90d9937.tar.gz samba-9799356082958103b51d9f7216a77a31d90d9937.tar.bz2 samba-9799356082958103b51d9f7216a77a31d90d9937.zip | |
build: fixed config.h generation when we have source -> source4 symlink
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 0ce08ee1b9..cb8ee180bd 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -1,6 +1,6 @@ # a waf tool to add autoconf-like macros to the configure section -import Build, os +import Build, os, Options import string from Configure import conf from samba_utils import * @@ -317,7 +317,9 @@ def CHECK_FUNCS_IN(conf, list, library, mandatory=False, checklibc=False): # write out config.h in the right directory @conf def SAMBA_CONFIG_H(conf, path=None): - if os.path.normpath(conf.curdir) != os.path.normpath(os.environ.get('PWD')): + # we don't want to produce a config.h in places like lib/replace + # when we are building projects that depend on lib/replace + if os.path.realpath(conf.curdir) != os.path.realpath(Options.launch_dir): return if path is None: conf.write_config_header('config.h', top=True) |