[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  875d9b8 lib/util: LIBCRYPTO is in common already, so add it to samba-util-common.
      from  ba77274 s3-includes: remove global include of system/readline.h.

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


- Log -----------------------------------------------------------------
commit 875d9b8098884c196dc1ec95ca70a772aece6610
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 3 17:02:55 2011 +0100

    lib/util: LIBCRYPTO is in common already, so add it to samba-util-common.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Mar  3 18:08:30 CET 2011 on sn-devel-104

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

Summary of changes:
 lib/util/wscript_build |    4 ++--
 source3/wscript_build  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 0468b74..e8883a3 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('samba-util-common',
                   genrand.c fsusage.c blocking.c become_daemon.c
                   data_blob.c signal.c system.c params.c util.c util_id.c util_net.c
                   util_strlist.c idtree.c debug.c''',
-                  public_deps='talloc pthread',
+                  public_deps='talloc pthread LIBCRYPTO',
                   # until we get all the dependencies in this library in common
                   # we need to allow this library to be built with unresolved symbols
                   allow_undefined_symbols=True,
@@ -24,7 +24,7 @@ if bld.env._SAMBA_BUILD_ == 4:
                       ms_fnmatch.c parmlist.c substitute.c util_str.c
                       ''',
                       deps='samba-util-common',
-                      public_deps='talloc LIBCRYPTO CHARSET execinfo uid_wrapper',
+                      public_deps='talloc CHARSET execinfo uid_wrapper',
                       public_headers='attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h',
                       header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
                       local_include=False,
diff --git a/source3/wscript_build b/source3/wscript_build
index e4511da..71670e9 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -946,7 +946,7 @@ bld.SAMBA3_SUBSYSTEM('CHARSET3',
 
 bld.SAMBA3_SUBSYSTEM('samba-util3',
                     source='',
-                    deps='talloc CHARSET3 LIBCRYPTO samba-util-common')
+                    deps='talloc CHARSET3 samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('ldb3',
                     source='lib/ldb_compat.c')


-- 
Samba Shared Repository