[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  ab73692... s4-tevent: up tevent version number
       via  0ca484f... build: check the type of implied dependencies
      from  b7ffc6e... build: fixed a typo that prevented --bundled-libraries from working correctly

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


- Log -----------------------------------------------------------------
commit ab73692bd348057bfd218b67c3414eec8afcc18b
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Apr 13 11:45:38 2010 +1000

    s4-tevent: up tevent version number
    
    tevent now has tevent_re_initialise() which is needed for the s4 build

commit 0ca484f4573275808a209ccb0a94a30e89b336d2
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Apr 13 11:41:13 2010 +1000

    build: check the type of implied dependencies
    
    an implied dependency needs to be a library or module

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

Summary of changes:
 buildtools/wafsamba/samba_deps.py |   13 ++++++++++++-
 lib/tevent/configure.ac           |    2 +-
 lib/tevent/wscript                |    2 +-
 source4/min_versions.m4           |    4 ++--
 4 files changed, 16 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index cca2feb..fbc3223 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -339,8 +339,14 @@ def build_direct_deps(bld, tgt_list):
                     for implied in TO_LIST(syslib_deps[d]):
                         if BUILTIN_LIBRARY(bld, implied):
                             t.direct_objects.add(implied)
-                        else:
+                        elif targets[implied] == 'SYSLIB':
+                            t.direct_syslibs.add(implied)
+                        elif targets[implied] in ['LIBRARY', 'MODULE']:
                             t.direct_libs.add(implied)
+                        else:
+                            Logs.error('Implied dependency %s in %s is of type %s' % (
+                                implied, t.sname, targets[implied]))
+                            sys.exit(1)
                 continue
             t2 = bld.name_to_obj(d, bld.env)
             if t2 is None:
@@ -486,6 +492,11 @@ def includes_objects(bld, t, chain, inc_loops):
             continue
         chain.add(lib)
         t2 = bld.name_to_obj(lib, bld.env)
+        if t2 is None:
+            targets = LOCAL_CACHE(bld, 'TARGET_TYPE')
+            Logs.error('Target %s of type %s not found in direct_libs for %s' % (
+                lib, targets[lib], t.sname))
+            sys.exit(1)
         r2 = includes_objects(bld, t2, chain, inc_loops)
         chain.remove(lib)
         ret = ret.union(t2.direct_objects)
diff --git a/lib/tevent/configure.ac b/lib/tevent/configure.ac
index c759b83..b77a4ab 100644
--- a/lib/tevent/configure.ac
+++ b/lib/tevent/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT(tevent, 0.9.8)
+AC_INIT(tevent, 0.9.9)
 AC_CONFIG_SRCDIR([tevent.c])
 AC_CONFIG_HEADER(config.h)
 
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index ee15b95..4244db1 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'tevent'
-VERSION = '0.9.8'
+VERSION = '0.9.9'
 
 blddir = 'bin'
 
diff --git a/source4/min_versions.m4 b/source4/min_versions.m4
index c134c69..82e7eb4 100644
--- a/source4/min_versions.m4
+++ b/source4/min_versions.m4
@@ -1,6 +1,6 @@
 # Minimum and exact required versions for various libraries 
 # if we use the ones installed in the system.
 define(TDB_MIN_VERSION,1.2.1)
-define(TALLOC_MIN_VERSION,2.0.1)
+define(TALLOC_MIN_VERSION,2.0.2)
 define(LDB_REQUIRED_VERSION,0.9.10)
-define(TEVENT_REQUIRED_VERSION,0.9.8)
+define(TEVENT_REQUIRED_VERSION,0.9.9)


-- 
Samba Shared Repository