summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-30 11:37:42 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-30 23:49:01 +1100
commit228803cd015e54362e988e168a9976f6b7a27f85 (patch)
tree39e2d47b63bb663d54cf73cd3098e1216f4cafdc
parent0563c5bacf96d1b6759acd78377c417715f30fff (diff)
downloadsamba-228803cd015e54362e988e168a9976f6b7a27f85.tar.gz
samba-228803cd015e54362e988e168a9976f6b7a27f85.tar.bz2
samba-228803cd015e54362e988e168a9976f6b7a27f85.zip
zlib: use the real library name 'z' instead of ZLIB
using subsystem aliases has a lot of potential for confusion. Better to use the real name of the library.
-rw-r--r--lib/zlib/wscript6
-rw-r--r--librpc/wscript_build2
-rw-r--r--source3/wscript_build10
3 files changed, 7 insertions, 11 deletions
diff --git a/lib/zlib/wscript b/lib/zlib/wscript
index c16dc4c029..bc6de34611 100644
--- a/lib/zlib/wscript
+++ b/lib/zlib/wscript
@@ -16,10 +16,8 @@ def configure(conf):
define='HAVE_ZLIB')
def build(bld):
- if bld.CONFIG_SET('HAVE_ZLIB'):
- bld.TARGET_ALIAS('z', 'ZLIB')
- else:
- bld.SAMBA_LIBRARY('ZLIB',
+ if not bld.CONFIG_SET('HAVE_ZLIB'):
+ bld.SAMBA_LIBRARY('z',
private_library=True,
deps='replace',
source='''adler32.c compress.c crc32.c gzio.c
diff --git a/librpc/wscript_build b/librpc/wscript_build
index e322443d73..83db7e7ebc 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -250,7 +250,7 @@ bld.SAMBA_SUBSYSTEM('NDR_INITSHUTDOWN',
bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
source='../librpc/ndr/ndr_compression.c',
public_deps='errors ndr',
- deps='ZLIB LZXPRESS'
+ deps='z LZXPRESS'
)
bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI',
diff --git a/source3/wscript_build b/source3/wscript_build
index 2ae29b03c2..308fae1a1d 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -137,8 +137,6 @@ PTHREADPOOL_SRC = ''
LIBREPLACE_SRCS = ''
-ZLIB_SRCS = ''
-
LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
lib/messages.c lib/messages_local.c
lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
@@ -1039,7 +1037,7 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA',
bld.SAMBA_SUBSYSTEM('LIBSMB',
source=LIBSMB_SRC,
- deps='LIBSAMBA ZLIB LZXPRESS CLDAP',
+ deps='LIBSAMBA z LZXPRESS CLDAP',
vars=locals())
bld.SAMBA_SUBSYSTEM('CLDAP',
@@ -1087,7 +1085,7 @@ bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
bld.SAMBA_SUBSYSTEM('SMBD_BASE',
source=SMBD_SRC_BASE,
deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
- DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB
+ DYNCONFIG libwbclient crypt nsl cups cap resolv z PASSDB
PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
@@ -1223,7 +1221,7 @@ bld.SAMBA_BINARY('smbd/smbd',
bld.SAMBA_BINARY('nmbd/nmbd',
source=NMBD_SRC,
- deps='''talloc tdb tevent ZLIB cap resolv libwbclient dl
+ deps='''talloc tdb tevent z cap resolv libwbclient dl
PASSDB PARAM ldap LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSA''',
install_path='${SBINDIR}',
@@ -1231,7 +1229,7 @@ bld.SAMBA_BINARY('nmbd/nmbd',
bld.SAMBA_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
- deps='''talloc tdb tevent cap dl ZLIB
+ deps='''talloc tdb tevent cap dl z
libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS