diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-19 19:50:21 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:54 +1000 |
| commit | 3254003956d069df3860cba3f58d11f1055e06b0 (patch) | |
| tree | 4abca888aea3dd8dbea277a8c48ff42b22b41986 /buildtools/wafsamba | |
| parent | 19b6e8b4082e4c4d77eb2515f9f9d8caf20922ae (diff) | |
| download | samba-3254003956d069df3860cba3f58d11f1055e06b0.tar.gz samba-3254003956d069df3860cba3f58d11f1055e06b0.tar.bz2 samba-3254003956d069df3860cba3f58d11f1055e06b0.zip | |
build: fixed includes paths for CHECK_CODE()
Diffstat (limited to 'buildtools/wafsamba')
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index cb8ee180bd..4d6ac26a6c 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -173,7 +173,7 @@ def CHECK_SIZEOF(conf, vars, headers=None, define=None): @conf def CHECK_CODE(conf, code, define, always=False, execute=False, addmain=True, mandatory=False, - headers=None, msg=None, cflags='', includes='# . ../default', + headers=None, msg=None, cflags='', includes='# .', local_include=True): '''check if some code compiles and/or runs''' hdrs='' @@ -199,8 +199,11 @@ def CHECK_CODE(conf, code, define, if msg is None: msg="Checking for %s" % define + # include the directory containing __confdefs.h + cflags += ' -I../../default' + if local_include: - cflags = cflags + ' -I%s' % conf.curdir + cflags += ' -I%s' % conf.curdir if conf.check(fragment=fragment, execute=execute, |