diff options
| -rw-r--r-- | buildtools/wafsamba/samba_python.py | 4 | ||||
| -rwxr-xr-x | ctdb/wscript | 3 | ||||
| -rw-r--r-- | wscript | 5 |
3 files changed, 4 insertions, 8 deletions
diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py index fb378ae071a..7546bbd6d2e 100644 --- a/buildtools/wafsamba/samba_python.py +++ b/buildtools/wafsamba/samba_python.py @@ -55,6 +55,10 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, mandatory=True): else: conf.msg("python headers", "using cache") + # we don't want PYTHONDIR in config.h, as otherwise changing + # --prefix causes a complete rebuild + del(conf.env.defines['PYTHONDIR']) + del(conf.env.defines['PYTHONARCHDIR']) def _check_python_headers(conf, mandatory): conf.check_python_headers(mandatory=mandatory) diff --git a/ctdb/wscript b/ctdb/wscript index b5c6087661e..956175070c7 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -212,9 +212,6 @@ def configure(conf): conf.ADD_EXTRA_INCLUDES('#ctdb') conf.ADD_EXTRA_INCLUDES('#lib #lib/replace') - del(conf.env.defines['PYTHONDIR']) - del(conf.env.defines['PYTHONARCHDIR']) - conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True) conf.DEFINE('SAMBA_UTIL_CORE_ONLY', 1, add_to_cflags=True) conf.SAMBA_CONFIG_H() @@ -172,11 +172,6 @@ def configure(conf): if not conf.CHECK_NEED_LC("-lc not needed"): conf.ADD_LDFLAGS('-lc', testflags=False) - # we don't want PYTHONDIR in config.h, as otherwise changing - # --prefix causes a complete rebuild - del(conf.env.defines['PYTHONDIR']) - del(conf.env.defines['PYTHONARCHDIR']) - if not conf.CHECK_CODE('#include "tests/summary.c"', define='SUMMARY_PASSES', addmain=False, |