From 228803cd015e54362e988e168a9976f6b7a27f85 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 30 Oct 2010 11:37:42 +1100
Subject: 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.
---
 lib/zlib/wscript | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/zlib')

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
-- 
cgit