summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-03-26 01:25:40 +0100
committerMichael Adam <obnox@samba.org>2009-03-26 01:30:42 +0100
commit04eeae74e63f2831d87a5e4e3c16d152e924c8dd (patch)
treefc62a69391c06569a1f3e256abe798290058c90c
parentb574a09cf54b4ea5a7e0575848725bd6452d2b4d (diff)
downloadsamba-04eeae74e63f2831d87a5e4e3c16d152e924c8dd.tar.gz
samba-04eeae74e63f2831d87a5e4e3c16d152e924c8dd.tar.bz2
samba-04eeae74e63f2831d87a5e4e3c16d152e924c8dd.zip
Revert "s3/smbd: don't link against zlib"
This reverts commit 1f265548e7d17a4ed83705149dd944fcdd31134d. smbd 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 4ea043a046..bd17dcb629 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1396,7 +1396,7 @@ bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARE
$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- $(WINBIND_LIBS)
+ $(WINBIND_LIBS) $(ZLIB_LIBS)
bin/nmbd@EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@