[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  d950e9e... build: added --enable-auto-reconfigure
      from  3a8b67f... s4:netlogon RPC server - fix a counter variable type

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d950e9e6f31c8657aee951728ef5d63ca572b01c
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Apr 22 12:03:22 2010 +1000

    build: added --enable-auto-reconfigure
    
    this is off by default until some issues are resolved. See my mail to
    samba-technical for details.

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/wscript |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 76e9b1f..4b388cc 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)


-- 
Samba Shared Repository