sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s4-waf: cope with systems with zlib versions that are too old

Browse Source
This commit is contained in:
Andrew Tridgell
2010-03-26 14:29:45 +11:00
parent 9ddd9de59b
commit 42bad41ced
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/zlib/wscript
View File

@ -9,3 +9,14 @@ def configure(conf):
#endif #endif
''', ''',
define='HAVE_ZLIB') define='HAVE_ZLIB')
def build(bld):
if bld.CONFIG_SET('HAVE_ZLIB'):
bld.TARGET_ALIAS('z', 'ZLIB')
else:
bld.SAMBA_LIBRARY('ZLIB',
source='''adler32.c compress.c crc32.c gzio.c
uncompr.c deflate.c trees.c zutil.c
inflate.c infback.c inftrees.c inffast.c''')

2
source4/wscript_build
View File

@ -15,7 +15,6 @@ bld.SAMBA_MKVERSION('version.h')
# this sets up some aliases # this sets up some aliases
bld.TARGET_ALIAS('attr', 'XATTR') bld.TARGET_ALIAS('attr', 'XATTR')
bld.TARGET_ALIAS('tevent', 'LIBTEVENT_EXT') bld.TARGET_ALIAS('tevent', 'LIBTEVENT_EXT')
bld.TARGET_ALIAS('z', 'ZLIB')
bld.TARGET_ALIAS('sasl2', 'SASL') bld.TARGET_ALIAS('sasl2', 'SASL')
bld.TARGET_ALIAS('RPC_NDR_SRVSVC', 'NDR_SRVSVC') bld.TARGET_ALIAS('RPC_NDR_SRVSVC', 'NDR_SRVSVC')
bld.TARGET_ALIAS('RPC_NDR_MGMT', 'dcerpc_mgmt') bld.TARGET_ALIAS('RPC_NDR_MGMT', 'dcerpc_mgmt')
@ -78,6 +77,7 @@ bld.BUILD_SUBDIR('../lib/tdr')
bld.BUILD_SUBDIR('../lib/tsocket') bld.BUILD_SUBDIR('../lib/tsocket')
bld.BUILD_SUBDIR('../lib/crypto') bld.BUILD_SUBDIR('../lib/crypto')
bld.BUILD_SUBDIR('../lib/torture') bld.BUILD_SUBDIR('../lib/torture')
bld.BUILD_SUBDIR('../lib/zlib')
bld.BUILD_SUBDIR('lib') bld.BUILD_SUBDIR('lib')
bld.BUILD_SUBDIR('lib/com') bld.BUILD_SUBDIR('lib/com')
bld.BUILD_SUBDIR('smb_server') bld.BUILD_SUBDIR('smb_server')