diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-30 11:37:42 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-30 23:49:01 +1100 |
| commit | 228803cd015e54362e988e168a9976f6b7a27f85 (patch) | |
| tree | 39e2d47b63bb663d54cf73cd3098e1216f4cafdc /lib | |
| parent | 0563c5bacf96d1b6759acd78377c417715f30fff (diff) | |
| download | samba-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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/zlib/wscript | 6 |
1 files changed, 2 insertions, 4 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 |