[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  acc81f9... build: Add an always parameter to CHECK_DECLS
       via  c09fa85... s3-waf: Correctly create symlink if SAMBA_BINARY targets are not in the current diectory
       via  e683ac6... build: allow target upgrades from EMPTY to SYSLIB
       via  d70a7be... s4-waf: move the KRB5_DEPRECATED check into lib/replace
      from  33bb334... s4-waf: inline LIBREPLACE_NETWORK into 'replace'

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


- Log -----------------------------------------------------------------
commit acc81f96a45275b4bfe356fdc4dd3cc5f03775ff
Author: Kai Blin <kai at samba.org>
Date:   Tue Apr 6 00:28:05 2010 +0200

    build: Add an always parameter to CHECK_DECLS

commit c09fa85735b044028f9659e2db075918fdfd07c8
Author: Kai Blin <kai at samba.org>
Date:   Sun Apr 11 21:59:43 2010 +0200

    s3-waf: Correctly create symlink if SAMBA_BINARY targets are not in the current diectory
    
    Many thanks to ita for pointing out the fix.

commit e683ac6f81306a03d8fe6bedeb5ca1a6facd6f1f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 12 00:21:21 2010 -0600

    build: allow target upgrades from EMPTY to SYSLIB
    
    A library may be initially set as empty if it wasn't needed for a list
    of functions in CHECK_FUNCS_IN(). A later check may require the
    library.
    
    Pair-Programmed-With: Kai Blin <kai at samba.org>

commit d70a7befb6dd2168c31a657fc0c6ab3b5f69c91e
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 12 17:46:01 2010 +1000

    s4-waf: move the KRB5_DEPRECATED check into lib/replace
    
    this needs to be with the krb5.h check for the source3 build

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

Summary of changes:
 buildtools/wafsamba/samba_autoconf.py |    7 ++++---
 buildtools/wafsamba/samba_install.py  |    2 +-
 buildtools/wafsamba/samba_utils.py    |    2 +-
 lib/replace/wscript                   |    7 +++++++
 4 files changed, 13 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index fcd900d..d12fb9d 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -204,7 +204,7 @@ def CHECK_VARIABLE(conf, v, define=None, always=False,
 
 
 @conf
-def CHECK_DECLS(conf, vars, reverse=False, headers=None):
+def CHECK_DECLS(conf, vars, reverse=False, headers=None, always=False):
     '''check a list of variable declarations, using the HAVE_DECL_xxx form
        of define
 
@@ -219,7 +219,8 @@ def CHECK_DECLS(conf, vars, reverse=False, headers=None):
         if not CHECK_VARIABLE(conf, v,
                               define=define,
                               headers=headers,
-                              msg='Checking for declaration of %s' % v):
+                              msg='Checking for declaration of %s' % v,
+                              always=always):
             ret = False
     return ret
 
@@ -449,7 +450,7 @@ def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True):
     liblist  = TO_LIST(libs)
     ret = True
     for lib in liblist[:]:
-        if GET_TARGET_TYPE(conf, lib):
+        if GET_TARGET_TYPE(conf, lib) == 'SYSLIB':
             continue
 
         (ccflags, ldflags) = library_flags(conf, lib)
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index df65da1..6da4493 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -150,7 +150,7 @@ def symlink_bin(self):
 
     blddir = os.path.dirname(self.bld.srcnode.abspath(self.bld.env))
     binpath = self.link_task.outputs[0].abspath(self.env)
-    bldpath = os.path.join(self.bld.env.BUILD_DIRECTORY, self.target)
+    bldpath = os.path.join(self.bld.env.BUILD_DIRECTORY, self.link_task.outputs[0].name)
 
     if os.path.lexists(bldpath):
         old_link = os.readlink(bldpath)
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 8016da4..7ee1663 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -15,7 +15,7 @@ LIB_PATH="shared"
 def SET_TARGET_TYPE(ctx, target, value):
     '''set the target type of a target'''
     cache = LOCAL_CACHE(ctx, 'TARGET_TYPE')
-    if target in cache:
+    if target in cache and cache[target] != 'EMPTY':
         ASSERT(ctx, cache[target] == value,
                "Target '%s' re-defined as %s - was %s" % (target, value, cache[target]))
         debug("task_gen: Skipping duplicate target %s (curdir=%s)" % (target, ctx.curdir))
diff --git a/lib/replace/wscript b/lib/replace/wscript
index bfe9142..7276826 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -176,6 +176,13 @@ def configure(conf):
                            msg='Checking for working strptime'):
         conf.DEFINE('REPLACE_STRPTIME', 1)
 
+    if conf.CONFIG_SET('HAVE_KRB5_H'):
+        # Check for KRB5_DEPRECATED handling
+        conf.CHECK_CODE('''#define KRB5_DEPRECATED 1
+#include <krb5.h>''',
+                        'HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER', addmain=False,
+                        link=False,
+                        msg="Checking for KRB5_DEPRECATED define taking an identifier")
 
     conf.CHECK_CODE('gettimeofday(NULL, NULL)', 'HAVE_GETTIMEOFDAY_TZ', execute=False)
 


-- 
Samba Shared Repository