[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  927792b s3-smbsharemodes: libsmbsharemodes does neither depend on krb5 or ldap.
       via  9154f0b nsswitch: make libwbclient a public library again.
       via  3c9703f s3-waf: we need to globally -Ilib/replace
       via  a2f4a17 s3-waf: fix popt support.
      from  1ad8e52 lib/util/charset Add back setlocale(), but only when called from binaries

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


- Log -----------------------------------------------------------------
commit 927792b21235bf8409ea04022b2912728f21d79e
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 18 15:54:51 2011 +0100

    s3-smbsharemodes: libsmbsharemodes does neither depend on krb5 or ldap.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Feb 18 16:46:35 CET 2011 on sn-devel-104

commit 9154f0b4510ec9e3c7916b5fd3f37c441bd8c490
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 18 15:40:59 2011 +0100

    nsswitch: make libwbclient a public library again.
    
    Guenther

commit 3c9703f4853f353b67314d9d6aac3f8c572a6fe8
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 18 15:39:28 2011 +0100

    s3-waf: we need to globally -Ilib/replace
    
    Guenther

commit a2f4a17b5e005afa1a8b15921e81c42cda6bcec0
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 18 15:33:25 2011 +0100

    s3-waf: fix popt support.
    
    Guenther

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

Summary of changes:
 buildtools/wafsamba/samba3.py         |    3 +++
 nsswitch/libwbclient/wscript_build    |    2 +-
 source3/pkgconfig/smbsharemodes.pc.in |    2 +-
 source3/wscript                       |    4 +++-
 4 files changed, 8 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index 6759450..9344e55 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -72,6 +72,9 @@ def s3_fix_kwargs(bld, kwargs):
     if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'):
         extra_includes += [ '../lib/talloc' ]
 
+    if not bld.CONFIG_SET('USING_SYSTEM_POPT'):
+        extra_includes += [ '../lib/popt' ]
+
     # s3 builds assume that they will have a bunch of extra include paths
     includes = []
     for d in extra_includes:
diff --git a/nsswitch/libwbclient/wscript_build b/nsswitch/libwbclient/wscript_build
index 896e17d..d925515 100644
--- a/nsswitch/libwbclient/wscript_build
+++ b/nsswitch/libwbclient/wscript_build
@@ -4,5 +4,5 @@ bld.SAMBA_LIBRARY('wbclient',
 	source='wbc_guid.c wbc_idmap.c wbclient.c wbc_pam.c wbc_pwd.c wbc_sid.c wbc_util.c',
 	deps='winbind-client',
 	public_headers='wbclient.h',
-	private_library=True
+	vnum='0'
 	)
diff --git a/source3/pkgconfig/smbsharemodes.pc.in b/source3/pkgconfig/smbsharemodes.pc.in
index dcb0d2e..1af7d4f 100644
--- a/source3/pkgconfig/smbsharemodes.pc.in
+++ b/source3/pkgconfig/smbsharemodes.pc.in
@@ -9,6 +9,6 @@ Version: 0
 URL: http://www.samba.org/
 #Libs: -L at libdir@ -lsmbsharemodes
 Libs: -lsmbsharemodes
-Libs.private: -lsmbsharemodes @KRB5_LIBS@ @LDAP_LIBS@ @LIBS@
+Libs.private: -lsmbsharemodes @LIBS@
 Cflags: -I at includedir@
 
diff --git a/source3/wscript b/source3/wscript
index 7c01e8f..9e5a8de 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -86,13 +86,15 @@ def configure(conf):
     conf.RECURSE('../libcli/smbreadline')
     conf.RECURSE('../lib/util')
 
-    conf.ADD_EXTRA_INCLUDES('''#source3 #source3/include''')
+    conf.ADD_EXTRA_INCLUDES('''#source3 #source3/include #lib/replace''')
     if not conf.env.USING_SYSTEM_TDB:
         conf.ADD_EXTRA_INCLUDES('#lib/tdb/include')
     if not conf.env.USING_SYSTEM_TEVENT:
         conf.ADD_EXTRA_INCLUDES('#lib/tevent')
     if not conf.env.USING_SYSTEM_TALLOC:
         conf.ADD_EXTRA_INCLUDES('#lib/talloc')
+    if not conf.env.USING_SYSTEM_POPT:
+        conf.ADD_EXTRA_INCLUDES('#lib/popt')
 
     conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
 


-- 
Samba Shared Repository