r19671: Fix remaining unresolved symbols in shared library build.

Fix starting tests in shared library build.
(This used to be commit 3b65a0d6e491a57ed216dc0cd9c31d46e0cb6a35)

diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
index f8502596fad60c85f85f209832a9a6c96d9a684d..8f2591bad659142d0f9a9b3564afd4326d62f400 100644 (file)
--- a/source4/lib/cmdline/config.mk
+++ b/source4/lib/cmdline/config.mk
@@ -12,4 +12,4 @@ PUBLIC_DEPENDENCIES = LIBPOPT
 PRIVATE_PROTO_HEADER = popt_credentials.h
 OBJ_FILES = popt_credentials.o
 PUBLIC_DEPENDENCIES = CREDENTIALS_KRB5 LIBCMDLINE_CREDENTIALS LIBPOPT
-
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL

diff --git a/source4/lib/compression/mszip.c b/source4/lib/compression/mszip.c
index 7a6371528c8863b9d8bb6bf4801f0fc579d770ff..c25fb99b7fe6fb4137930bc358aaf9f9d869d241 100644 (file)
--- a/source4/lib/compression/mszip.c
+++ b/source4/lib/compression/mszip.c
@@ -641,7 +641,7 @@ static int32_t Zipinflate_block(struct decomp_state *decomp_state, int32_t *e)
   return 2;
 }
 
-struct decomp_state *ZIPdecomp_state(TALLOC_CTX *mem_ctx)
+_PUBLIC_ struct decomp_state *ZIPdecomp_state(TALLOC_CTX *mem_ctx)
 {
        return talloc_zero(mem_ctx, struct decomp_state);
 }

diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 5d3e2cc4cacacf6af8918f9e4d3bf32c1081ded8..4f3a17d50527422e89ec9dd8502604191ab3cee4 100644 (file)
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -29,7 +29,8 @@ OBJ_FILES = xfile.o \
                module.o
 PUBLIC_DEPENDENCIES = \
                LIBTALLOC LIBCRYPTO \
-               SOCKET_WRAPPER EXT_NSL
+               SOCKET_WRAPPER EXT_NSL \
+               CHARSET
 
 [SUBSYSTEM::UNIX_PRIVS]
 PRIVATE_PROTO_HEADER = unix_privs.h

diff --git a/source4/ntptr/config.mk b/source4/ntptr/config.mk
index a80002662e53904ce933d5d1f8e7c45de8be2ab4..696f2ea10f09fe8624aa2e2f40e6dfcae2a1c427 100644 (file)
--- a/source4/ntptr/config.mk
+++ b/source4/ntptr/config.mk
@@ -8,7 +8,7 @@ SUBSYSTEM = ntptr
 OBJ_FILES = \
                simple_ldb/ntptr_simple_ldb.o
 PUBLIC_DEPENDENCIES = \
-               ldb NDR_SPOOLSS
+               ldb NDR_SPOOLSS DCERPC_COMMON
 # End MODULE ntptr_simple_ldb
 ################################################
 

diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index 2d7a4dc928679eb0a26bb53b62c393b3faa691d8..7845b21662bfd67884ace09b3ea07e2aa5533d2e 100644 (file)
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -5,7 +5,7 @@ INIT_FUNCTION = pvfs_acl_xattr_init
 SUBSYSTEM = ntvfs
 OBJ_FILES = \
                pvfs_acl_xattr.o
-PRIVATE_DEPENDENCIES = NDR_XATTR
+PRIVATE_DEPENDENCIES = NDR_XATTR ntvfs_posix
 # End MODULE pvfs_acl_xattr
 ################################################
 
@@ -16,6 +16,7 @@ INIT_FUNCTION = pvfs_acl_nfs4_init
 SUBSYSTEM = ntvfs
 OBJ_FILES = \
                pvfs_acl_nfs4.o
+PRIVATE_DEPENDENCIES = NDR_NFS4ACL SAMDB ntvfs_posix
 # End MODULE pvfs_acl_nfs4
 ################################################
 
@@ -23,6 +24,7 @@ OBJ_FILES = \
 # Start MODULE ntvfs_posix
 [MODULE::ntvfs_posix]
 SUBSYSTEM = ntvfs
+OUTPUT_TYPE = INTEGRATED
 INIT_FUNCTION = ntvfs_posix_init 
 PRIVATE_PROTO_HEADER = vfs_posix_proto.h
 OBJ_FILES = \

diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index 6d9976699591d9aba858b2e91d71615cb91fc6e4..a1483f48d629d603e70b0e1190c9cee453ebd11e 100755 (executable)
--- a/source4/script/tests/selftest.sh
+++ b/source4/script/tests/selftest.sh
@@ -44,7 +44,7 @@ export LD_LDB_MODULE_PATH
 LD_SAMBA_MODULE_PATH=$OLD_PWD/bin/modules
 export LD_SAMBA_MODULE_PATH
 
-LD_LIBRARY_PATH=$OLD_PWD/bin:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=$OLD_PWD/bin/shared:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 
 incdir=`dirname $ARG0`