[SCM] Samba Shared Repository - branch master updated

Amitay Isaacs amitay at samba.org
Fri Jan 27 00:34:01 MST 2012


The branch, master has been updated
       via  5bdadd1 build: Add missing dependencies on popt
      from  a9e0333 Finally remove all malloc()'s from the substitute code. Now totally talloc() based.

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


- Log -----------------------------------------------------------------
commit 5bdadd15013e69b6e8869386301628611268bf30
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Jan 27 16:57:46 2012 +1100

    build: Add missing dependencies on popt
    
    This fixes compilation issues on freebsd where system popt is installed
    under /usr/local.
    
    Autobuild-User: Amitay Isaacs <amitay at samba.org>
    Autobuild-Date: Fri Jan 27 08:33:52 CET 2012 on sn-devel-104

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

Summary of changes:
 examples/libsmbclient/wscript_build |    2 +-
 source3/wscript_build               |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/libsmbclient/wscript_build b/examples/libsmbclient/wscript_build
index 84e03f3..aa39965 100644
--- a/examples/libsmbclient/wscript_build
+++ b/examples/libsmbclient/wscript_build
@@ -21,5 +21,5 @@ names = ['testsmbc',
 for name in names:
     bld.SAMBA_BINARY(name,
                      source='%s.c' % name,
-                     deps='smbclient',
+                     deps='popt smbclient',
                      install=False)
diff --git a/source3/wscript_build b/source3/wscript_build
index 5adc2a1..7ae60be 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -643,6 +643,7 @@ bld.SAMBA3_LIBRARY('netapi',
                     source=LIBNETAPI_SRC,
                     public_deps='''
                     talloc
+                    popt
                     msrpc3
                     ads
                     NDR_LIBNETAPI
@@ -1414,6 +1415,7 @@ bld.SAMBA3_BINARY('smbget',
                  source=SMBGET_SRC,
                  deps='''
                  talloc
+                 popt
                  smbclient''',
                  vars=locals())
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list