summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-02-23 08:30:28 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:35 +1000
commitb1d24c7a8ffcdc3e7041a7e89474b9327bc8a26c (patch)
tree2e0b5c482a60efe7220f8adb652052dfe2d3ab74
parent1cfc330156fd3afb6972f6461939817f56e9d435 (diff)
downloadsamba-b1d24c7a8ffcdc3e7041a7e89474b9327bc8a26c.tar.gz
samba-b1d24c7a8ffcdc3e7041a7e89474b9327bc8a26c.tar.bz2
samba-b1d24c7a8ffcdc3e7041a7e89474b9327bc8a26c.zip
build: put config.h in top dir by default
-rw-r--r--lib/replace/wafsamba.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/replace/wafsamba.py b/lib/replace/wafsamba.py
index 96e8e7645d..7796dc25bf 100644
--- a/lib/replace/wafsamba.py
+++ b/lib/replace/wafsamba.py
@@ -51,8 +51,12 @@ def CHECK_FUNCS_IN(conf, list, library):
#################################################
# write out config.h in the right directory
@conf
-def SAMBA_CONFIG_H(conf, path='config.h'):
- if os.path.normpath(conf.curdir) == os.path.normpath(os.environ.get('PWD')):
+def SAMBA_CONFIG_H(conf, path=None):
+ if os.path.normpath(conf.curdir) != os.path.normpath(os.environ.get('PWD')):
+ return
+ if path is None:
+ conf.write_config_header('config.h', top=True)
+ else:
conf.write_config_header(path)