[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  5b83923 s4-waf: Skip header-not-found cache if a library is specified, as it may provide additional C flags.
       via  57d1dce s4-waf: Only show minversion when there was a minimum version specified.
       via  4078b64 Show text output messages when interfacing with bzr.
       via  b763a27 remove unnecessary use of pass.
      from  39ea30d s3-build: remove source4 include path for autoconf build as well.

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


- Log -----------------------------------------------------------------
commit 5b839230e1475550f13ed642187913fd0c026445
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Jan 24 18:09:27 2011 -0800

    s4-waf: Skip header-not-found cache if a library is specified, as it may provide
    additional C flags.
    
    Tridge, please check.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Tue Jan 25 03:59:32 CET 2011 on sn-devel-104

commit 57d1dcef7ffeab086cf125431f5e03985ba0d0ce
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Jan 24 17:15:49 2011 -0800

    s4-waf: Only show minversion when there was a minimum version specified.

commit 4078b649f19adaba3218d8241455138981d0f3a2
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Jan 24 17:14:50 2011 -0800

    Show text output messages when interfacing with bzr.

commit b763a2735ee761ba614ca3868cd962847f9adda6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Jan 3 06:54:07 2011 +0100

    remove unnecessary use of pass.

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

Summary of changes:
 buildtools/wafsamba/samba_autoconf.py |    2 +-
 buildtools/wafsamba/samba_bundled.py  |    6 +++++-
 buildtools/wafsamba/samba_version.py  |    7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 91d8a56..ec0ed16 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -80,7 +80,7 @@ def nolink(self):
 
 def CHECK_HEADER(conf, h, add_headers=False, lib=None):
     '''check for a header'''
-    if h in missing_headers:
+    if h in missing_headers and lib is None:
         return False
     d = h.upper().replace('/', '_')
     d = d.replace('.', '_')
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 2e3e130..39edad0 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -122,10 +122,14 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
 
     minversion = minimum_library_version(conf, libname, minversion)
 
+    msg = 'Checking for system %s' % libname
+    if minversion != '0.0.0':
+        msg += ' >= %s' % minversion
+
     # try pkgconfig first
     if (conf.check_cfg(package=libname,
                       args='"%s >= %s" --cflags --libs' % (libname, minversion),
-                      msg='Checking for system %s >= %s' % (libname, minversion)) and
+                      msg=msg) and
         check_functions_headers()):
         conf.SET_TARGET_TYPE(libname, 'SYSLIB')
         conf.env[found] = True
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 8d1bd32..5069ea3 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -1,13 +1,18 @@
 import os
 import Utils
 import samba_utils
+import sys
 
 def bzr_version_summary(path):
     try:
-        from bzrlib import branch, osutils, workingtree
+        import bzrlib
     except ImportError:
         return ("BZR-UNKNOWN", {})
 
+    import bzrlib.ui
+    bzrlib.ui.ui_factory = bzrlib.ui.make_ui_for_terminal(
+        sys.stdin, sys.stdout, sys.stderr)
+    from bzrlib import branch, osutils, workingtree
     from bzrlib.plugin import load_plugins
     load_plugins()
 


-- 
Samba Shared Repository