[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  c61f4dc... build: added a reconfigure target
      from  049416c... s3-spoolss: make several notify functions static.

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


- Log -----------------------------------------------------------------
commit c61f4dcc0f9611448e726e203d65c674e4d74427
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu May 6 14:51:28 2010 +0200

    build: added a reconfigure target
    
    this is meant to be used by the s3 build, to allow jelmers work on
    smbtorture4 in s3 to avoid re-running configure unless its needed

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

Summary of changes:
 buildtools/scripts/Makefile.waf    |    3 +++
 buildtools/wafsamba/samba_utils.py |   10 ++++++++++
 source4/wscript                    |    4 ++++
 3 files changed, 17 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf
index 1345f19..5af4fd4 100644
--- a/buildtools/scripts/Makefile.waf
+++ b/buildtools/scripts/Makefile.waf
@@ -29,6 +29,9 @@ clean:
 distclean:
 	$(WAF) distclean
 
+reconfigure: configure
+	$(WAF) reconfigure
+
 # some compatibility make targets
 everything: all
 
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 335313e..f036068 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -507,3 +507,13 @@ def load_file(filename):
     except:
         return None
     return r
+
+
+def reconfigure(ctx):
+    '''rerun configure if necessary'''
+    import Configure, samba_wildcard, Scripting
+    if not os.path.exists(".lock-wscript"):
+        raise Utils.WafError('configure has not been run')
+    bld = samba_wildcard.fake_build_environment()
+    Configure.autoconfig = True
+    Scripting.check_configured(bld)
diff --git a/source4/wscript b/source4/wscript
index 880069e..05bee1a 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -157,3 +157,7 @@ def main():
     wildcard_main(wildcard_cmd)
 Scripting.main = main
 
+def reconfigure(ctx):
+    '''reconfigure if config scripts have changed'''
+    import samba_utils
+    samba_utils.reconfigure(ctx)


-- 
Samba Shared Repository