[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  e3dac4b replace: Only add bsd dependency when bsd library was found.
      from  b3fb115 tdb2: add --disable-tdb2

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


- Log -----------------------------------------------------------------
commit e3dac4b61aadeced427001f823377c79e457b8dd
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Feb 2 02:48:35 2012 +0100

    replace: Only add bsd dependency when bsd library was found.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Thu Feb  2 05:18:45 CET 2012 on sn-devel-104

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

Summary of changes:
 lib/replace/wscript |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 4b4f0a8..5bafc1f 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -452,6 +452,9 @@ def build(bld):
     if not bld.CONFIG_SET('HAVE_INET_NTOP'):     REPLACE_SOURCE += ' inet_ntop.c'
     if not bld.CONFIG_SET('HAVE_INET_PTON'):     REPLACE_SOURCE += ' inet_pton.c'
 
+    extra_libs = ''
+    if bld.CONFIG_SET('HAVE_LIBBSD'): extra_libs += ' bsd'
+
     bld.SAMBA_LIBRARY('replace',
                       source=REPLACE_SOURCE,
                       group='base_libraries',
@@ -461,7 +464,7 @@ def build(bld):
                       # at the moment:
                       # hide_symbols=bld.BUILTIN_LIBRARY('replace'),
                       private_library=True,
-                      deps='crypt dl nsl socket rt bsd')
+                      deps='crypt dl nsl socket rt' + extra_libs)
 
     bld.SAMBA_SUBSYSTEM('replace-test',
                       source='''test/testsuite.c test/strptime.c


-- 
Samba Shared Repository