The branch, master has been updated
via 5adeaea664b016225518a465e3fc2ed4b8cce098 (commit)
via 04eeae74e63f2831d87a5e4e3c16d152e924c8dd (commit)
from b574a09cf54b4ea5a7e0575848725bd6452d2b4d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5adeaea664b016225518a465e3fc2ed4b8cce098
Author: Michael Adam <[email protected]>
Date: Thu Mar 26 01:30:00 2009 +0100
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
commit 04eeae74e63f2831d87a5e4e3c16d152e924c8dd
Author: Michael Adam <[email protected]>
Date: Thu Mar 26 01:25:40 2009 +0100
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
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4ea043a..1c9c0c1 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1396,7 +1396,7 @@ bin/s...@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/n...@exeext@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@
@LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@echo Linking $@
@@ -1408,7 +1408,7 @@ bin/s...@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/rpccli...@exeext@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@
@LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking $@
--
Samba Shared Repository
