[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  bc058b7 heimdal: Don't depend on compile_asn1 and et_compile when using system versions.
      from  2036d64 s3: Remove a #define used just once

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


- Log -----------------------------------------------------------------
commit bc058b79bc5ae4ce5261334c31005dedf9db4417
Author: Arnaud Faucher <arnaud.faucher at gmail.com>
Date:   Sat Nov 20 15:58:30 2010 +0100

    heimdal: Don't depend on compile_asn1 and et_compile when using system versions.
    
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sat Nov 20 16:43:47 CET 2010 on sn-devel-104

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

Summary of changes:
 source4/heimdal_build/wscript_build |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 0ebb339..3ce70a2 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -56,7 +56,6 @@ def HEIMDAL_ASN1(name, source,
     asn1_rule = cd_rule + ' && ${BLDBIN}/asn1_compile ${OPTION_FILE} ${ASN1OPTIONS} --one-code-file ${SRC[0].abspath(env)} ${ASN1NAME}'
 
     source = to_list(source)
-    source.append('asn1_compile')
 
     if option_file is not None:
         source.append(option_file)
@@ -68,6 +67,7 @@ def HEIMDAL_ASN1(name, source,
             shell = True,
             source = source,
             target = out_files,
+            depends_on = 'asn1_compile',
             name=name + '_ASN1')
 
     t.env.ASN1NAME     = asn1name
@@ -144,8 +144,9 @@ def HEIMDAL_ERRTABLE(name, source):
 
     sources = [source, 'et_compile_wrapper.sh']
 
+    deps = ''
     if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
-        sources.append('compile_et')
+        deps = 'compile_et'
 
     t = bld(rule='${SRC[1].abspath(env)} ${TGT[0].parent.abspath(env)} ${COMPILE_ET} ${SRC[0].abspath(env)} ${TGT[0].bldpath(env)}',
             ext_out = '.c',
@@ -154,6 +155,7 @@ def HEIMDAL_ERRTABLE(name, source):
             shell   = True,
             source  = sources,
             target  = out_files,
+            depends_on = deps,
             name    = name)
 
 def HEIMDAL_AUTOPROTO(header, source, options=None, group='prototypes'):
@@ -824,7 +826,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_COM_ERR'):
     HEIMDAL_LIBRARY('com_err',
         'lib/com_err/com_err.c lib/com_err/error.c',
         includes='../heimdal/lib/com_err',
-        deps='roken',
+        deps='roken intl',
         vnum='0.25',
         )
 


-- 
Samba Shared Repository