Revert "s3/swat: don't link against zlib"
authorMichael Adam <obnox@samba.org>
Thu, 26 Mar 2009 00:30:00 +0000 (01:30 +0100)
committerMichael Adam <obnox@samba.org>
Thu, 26 Mar 2009 00:31:44 +0000 (01:31 +0100)
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

source3/Makefile.in

index bd17dcb629cae62e41156e6f2e6659045190474f..1c9c0c120484533cf22abf9e16370fecf41fd45a 100644 (file)
@@ -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 $@