waf: restore libsmbclient handling.

This is a temporary solution to get libsmbclient installed properly as a library
(including symlinks and proper symbols). I was not able to make the old internal
library name 'libsmb/smbclient' work together with "realname" and/or "link_name".
Maybe one of the waf gurus has more ideas here.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Sep 15 15:31:59 CEST 2011 on sn-devel-104

diff --git a/source3/wscript_build b/source3/wscript_build
index bca1cdf8a3b2381726b7ec175f924b7dc540ce55..4bedbfe0321b5f104f239ea1f9604e0e0be564f3 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -675,7 +675,7 @@ bld.SAMBA3_LIBRARY('netapi',
                     vnum='0',
                     vars=locals())
 
                     vnum='0',
                     vars=locals())
 

-bld.SAMBA3_LIBRARY('libsmb/smbclient',
+bld.SAMBA3_LIBRARY('smbclient',

                     source=LIBSMBCLIENT_SRC,
                     public_deps='''talloc tdb_compat wbclient cap param  smbd_shim libsmb KRBCLIENT pdb SMBLDAP
                     LIBMSRPC_GEN msrpc3 libcli_lsa3 RPC_NDR_SRVSVC popt_samba3''',
                     source=LIBSMBCLIENT_SRC,
                     public_deps='''talloc tdb_compat wbclient cap param  smbd_shim libsmb KRBCLIENT pdb SMBLDAP
                     LIBMSRPC_GEN msrpc3 libcli_lsa3 RPC_NDR_SRVSVC popt_samba3''',


@@ -1175,7 +1175,7 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3,
                  source=CLIENT_SRC,
                  deps='''talloc tdb_compat cap popt_samba3 pdb libsmb smbd_shim
                  param wbclient param KRBCLIENT LIBMSRPC_GEN
                  source=CLIENT_SRC,
                  deps='''talloc tdb_compat cap popt_samba3 pdb libsmb smbd_shim
                  param wbclient param KRBCLIENT LIBMSRPC_GEN

-                 msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA
+                 msrpc3 SMBREADLINE smbclient RPC_NDR_SRVSVC INIT_LSA

                  cli_smb_common''',
                  vars=locals())
 
                  cli_smb_common''',
                  vars=locals())
 


@@ -1252,7 +1252,7 @@ bld.SAMBA3_BINARY('pdbedit',
 
 bld.SAMBA3_BINARY('smbget',
                  source=SMBGET_SRC,
 
 bld.SAMBA3_BINARY('smbget',
                  source=SMBGET_SRC,

-                 deps='''talloc tdb_compat libsmb/smbclient popt_samba3''',
+                 deps='''talloc tdb_compat smbclient popt_samba3''',

                  vars=locals())
 
 bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,
                  vars=locals())
 
 bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,

diff --git a/source4/torture/libsmbclient/wscript_build b/source4/torture/libsmbclient/wscript_build
index 8b2c516dbfcdc74eef1c7764f83dd7fb5bc788b8..40c7932a208be187b035f89e57642309b56a0d2d 100644 (file)
--- a/source4/torture/libsmbclient/wscript_build
+++ b/source4/torture/libsmbclient/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_MODULE('TORTURE_LIBSMBCLIENT',
        autoproto='proto.h',
        subsystem='smbtorture',
        init_function='torture_libsmbclient_init',
        autoproto='proto.h',
        subsystem='smbtorture',
        init_function='torture_libsmbclient_init',

-       deps='POPT_CREDENTIALS libsmb/smbclient',
+       deps='POPT_CREDENTIALS smbclient',

        internal_module=True
        )
 
        internal_module=True
        )
 

diff --git a/source4/client/wscript_build b/source4/wscript_build
similarity index 61%
rename from source4/client/wscript_build
rename to source4/wscript_build
index d1622b3d1d07584199bdc4cd7a3fce39159ba2e1..06b9e487e3de2eb5e13f14ef9ed5732fc0b25e93 100644 (file)
--- a/source4/client/wscript_build
+++ b/source4/wscript_build
@@ -1,13 +1,12 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 

-bld.SAMBA_BINARY('smbclient',
-       source='client.c',
+bld.SAMBA_BINARY('client/smbclient',
+       source='client/client.c',

        deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw'
        )
 
 
        deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw'
        )
 
 

-bld.SAMBA_BINARY('cifsdd',
-       source='cifsdd.c cifsddio.c',
+bld.SAMBA_BINARY('client/cifsdd',
+       source='client/cifsdd.c client/cifsddio.c',

        deps='samba-hostconfig LIBCLI_SMB popt POPT_SAMBA POPT_CREDENTIALS'
        )
        deps='samba-hostconfig LIBCLI_SMB popt POPT_SAMBA POPT_CREDENTIALS'
        )

-

diff --git a/wscript_build b/wscript_build
index 1b6fb31e412c3a1a462fccd09771465a918c7645..4f61820224436c68bbd43710de68c370f7c9ce98 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -90,7 +90,7 @@ bld.RECURSE('source4/ntvfs')
 bld.RECURSE('source4/ntptr')
 bld.RECURSE('source4/torture')
 bld.RECURSE('librpc')
 bld.RECURSE('source4/ntptr')
 bld.RECURSE('source4/torture')
 bld.RECURSE('librpc')

-bld.RECURSE('source4/client')
+bld.RECURSE('source4')

 bld.RECURSE('source4/libcli')
 bld.RECURSE('libcli/smb')
 bld.RECURSE('libcli/util')
 bld.RECURSE('source4/libcli')
 bld.RECURSE('libcli/smb')
 bld.RECURSE('libcli/util')