[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  b7ffc6e... build: fixed a typo that prevented --bundled-libraries from working correctly
      from  9c67812... build: cope with existing binaries in bin/ left over from the old build

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


- Log -----------------------------------------------------------------
commit b7ffc6e5b228d21f547bec77f378f0fdc88b6dd2
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Apr 13 11:27:24 2010 +1000

    build: fixed a typo that prevented --bundled-libraries from working correctly
    
    Jelmer noticed that --minimum-library-version=talloc:2.0.1 --bundled-libraries=!tevent
    didn't do the right thing.

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

Summary of changes:
 buildtools/wafsamba/samba_bundled.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index f87ff80..6a393eb 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -92,7 +92,7 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
     # versions
     if onlyif:
         for syslib in TO_LIST(onlyif):
-            f = 'FOUND_SYSTEM_%s' % syslib
+            f = 'FOUND_SYSTEMLIB_%s' % syslib
             if not f in conf.env:
                 if 'NONE' in conf.env.BUNDLED_LIBS or '!'+libname in conf.env.BUNDLED_LIBS:
                     Logs.error('ERROR: Use of system library %s depends on missing system library %s' % (libname, syslib))


-- 
Samba Shared Repository