summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-03-26 01:30:00 +0100
committerMichael Adam <obnox@samba.org>2009-03-26 01:31:44 +0100
commit5adeaea664b016225518a465e3fc2ed4b8cce098 (patch)
treeb34b73637d2bda8190002a58f9dff5065300c989
parent04eeae74e63f2831d87a5e4e3c16d152e924c8dd (diff)
downloadsamba-5adeaea664b016225518a465e3fc2ed4b8cce098.tar.gz
samba-5adeaea664b016225518a465e3fc2ed4b8cce098.tar.bz2
samba-5adeaea664b016225518a465e3fc2ed4b8cce098.zip
Revert "s3/swat: don't link against zlib"
This reverts commit 8532faffd08bbbcfaac60fd866fa5ab255913d4a. swat needs zlib through ../librpc/ndr/ndr_compression.c, function ndr_pull_compression_mszip_chunk(). This fails to link at least on our build farm bsd boxes. Michael
-rw-r--r--source3/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index bd17dcb629..1c9c0c1204 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1408,7 +1408,7 @@ bin/swat@EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
@echo Linking $@
@$(CC) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
$(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) $(POPT_LIBS) $(KRB5LIBS) \
- $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
+ $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(ZLIB_LIBS)
bin/rpcclient@EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@