diff -uprk.orig cvs-1.11.10.orig/configure.in cvs-1.11.10/configure.in

--- cvs-1.11.10.orig/configure.in	2003-12-04 03:26:40 +0300

+++ cvs-1.11.10/configure.in	2003-12-13 20:18:33 +0300

@@ -1028,16 +1028,11 @@ AC_CONFIG_FILES([Makefile \

 	  cvs.spec \

 	  diff/Makefile \

 	  doc/Makefile \

-	  emx/Makefile \

 	  lib/Makefile \

 	  man/Makefile \

-	  os2/Makefile \

 	  src/Makefile \

 	  tools/Makefile \

-	  vms/Makefile \

-	  windows-NT/Makefile \

-	  windows-NT/SCC/Makefile \

-	  zlib/Makefile])

+	  ])

 dnl and we're done

 AC_OUTPUT

diff -uprk.orig cvs-1.11.10.orig/Makefile.am cvs-1.11.10/Makefile.am

--- cvs-1.11.10.orig/Makefile.am	2003-08-07 19:30:13 +0400

+++ cvs-1.11.10/Makefile.am	2003-12-13 20:15:39 +0300

@@ -17,10 +17,9 @@

 ## 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

+SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools

 EXTRA_DIST = \

 	.cvsignore \

diff -uprk.orig cvs-1.11.10.orig/src/Makefile.am cvs-1.11.10/src/Makefile.am

--- cvs-1.11.10.orig/src/Makefile.am	2003-10-08 23:50:57 +0400

+++ cvs-1.11.10/src/Makefile.am	2003-12-13 20:15:39 +0300

@@ -22,7 +22,7 @@ SHELL = /bin/sh

 # 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

@@ -101,7 +101,7 @@ cvs_SOURCES = \

 cvs_LDADD = \

 	../diff/libdiff.a \

 	../lib/libcvs.a \

-	../zlib/libz.a

+	-lz

 # extra clean targets

 # wish this could be distclean-hdr-local but it's not part of automake

diff -uprk.orig cvs-1.11.10.orig/src/zlib.c cvs-1.11.10/src/zlib.c

--- cvs-1.11.10.orig/src/zlib.c	2003-01-31 23:15:13 +0300

+++ cvs-1.11.10/src/zlib.c	2003-12-13 20:15:39 +0300

@@ -22,7 +22,7 @@

 #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)

-#include "zlib.h"

+#include <zlib.h>

 /* OS/2 doesn't have EIO.  FIXME: this whole notion of turning

    a different error into EIO strikes me as pretty dubious.  */