summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-22 12:03:22 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-22 12:03:36 +1000
commitd950e9e6f31c8657aee951728ef5d63ca572b01c (patch)
tree165cfe2fa645bfffcecf92339d46a48632505a52 /buildtools
parent3a8b67fd3604ed4f129df42543824d04b7197089 (diff)
downloadsamba-d950e9e6f31c8657aee951728ef5d63ca572b01c.tar.gz
samba-d950e9e6f31c8657aee951728ef5d63ca572b01c.tar.bz2
samba-d950e9e6f31c8657aee951728ef5d63ca572b01c.zip
build: added --enable-auto-reconfigure
this is off by default until some issues are resolved. See my mail to samba-technical for details.
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/wscript14
1 files changed, 13 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 76e9b1f357..4b388cc267 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -2,11 +2,20 @@
# this is a base set of waf rules that everything else pulls in first
-import sys, wafsamba
+import sys, wafsamba, Configure
import Options, os, preproc
from samba_utils import *
from optparse import SUPPRESS_HELP
+# this forces configure to be re-run if any of the configure
+# sections of the build scripts change. We have to check
+# for this in sys.argv as options have not yet been parsed when
+# we need to set this. This is off by default until some issues
+# are resolved related to WAFCACHE. It will need a lot of testing
+# before it is enabled by default.
+if '--enable-auto-reconfigure' in sys.argv:
+ Configure.autoconfig = True
+
def set_options(opt):
opt.tool_options('compiler_cc')
@@ -59,6 +68,9 @@ def set_options(opt):
gr.add_option('-C',
help='enable configure cacheing',
action='store_true', dest='enable_configure_cache')
+ gr.add_option('--enable-auto-reconfigure',
+ help='enable automatic reconfigure on build',
+ action='store_true', dest='enable_auto_reconfigure')
gr.add_option('--enable-developer',
help=("Turn on developer warnings and debugging"),
action="store_true", dest='developer', default=False)