- updated cvs-acl.patch

[packages/cvs.git] / cvs-zlib.patch

--- cvs-1.11.4/configure.in.orig	Sat Dec 28 19:02:11 2002
+++ cvs-1.11.4/configure.in	Fri Jan 17 19:30:29 2003
@@ -848,6 +848,7 @@
 dnl end --enable-*
 dnl
 
+AC_CHECK_LIB(z, zlibVersion)
 
 dnl For the moment we will assume that all systems which have
 dnl the unixyness to run configure are unixy enough to do the
@@ -916,8 +917,7 @@
 	  tools/Makefile \
 	  vms/Makefile \
 	  windows-NT/Makefile \
-	  windows-NT/SCC/Makefile \
-	  zlib/Makefile])
+	  windows-NT/SCC/Makefile])
 
 dnl and we're done
 AC_OUTPUT
diff -ur cvs-1.11.1/src/Makefile.am cvs-1.11.1.zlib/src/Makefile.am
--- cvs-1.11.1/src/Makefile.am	Tue Apr 24 20:14:53 2001
+++ cvs-1.11.1.zlib/src/Makefile.am	Wed May 30 21:47:19 2001
@@ -20,7 +20,7 @@
 # try and remove naming ocnflicts and fix Automake to allow particular includes
 # to be attached only to particular object files.  Short term fix is either or.
 ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
 
 bin_PROGRAMS = cvs
 bin_SCRIPTS = cvsbug
@@ -100,8 +100,7 @@
 
 cvs_LDADD = \
 	../diff/libdiff.a \
-	../lib/libcvs.a \
-	../zlib/libz.a
+	../lib/libcvs.a
 
 # extra clean targets
 # wish this could be distclean-hdr-local but it's not part of automake
--- cvs-1.11.2/Makefile.am~	Thu Sep 13 21:08:15 2001
+++ cvs-1.11.2/Makefile.am	Sat May 11 01:30:51 2002
@@ -17,7 +17,7 @@
 ## Subdirectories to run make in for the primary targets.
 # Unix source subdirs, where we'll want to run lint and etags:
 # This is a legacy variable from b4 Automake
-USOURCE_SUBDIRS = lib zlib diff src
+USOURCE_SUBDIRS = lib diff src
 # All other subdirs:
 SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
 	windows-NT os2 emx vms