1 --- cvs-1.11.4/configure.in.orig Sat Dec 28 19:02:11 2002
2 +++ cvs-1.11.4/configure.in Fri Jan 17 19:30:29 2003
7 +AC_CHECK_LIB(z, zlibVersion)
9 dnl For the moment we will assume that all systems which have
10 dnl the unixyness to run configure are unixy enough to do the
15 - windows-NT/SCC/Makefile \
17 + windows-NT/SCC/Makefile])
21 diff -ur cvs-1.11.1/src/Makefile.am cvs-1.11.1.zlib/src/Makefile.am
22 --- cvs-1.11.1/src/Makefile.am Tue Apr 24 20:14:53 2001
23 +++ cvs-1.11.1.zlib/src/Makefile.am Wed May 30 21:47:19 2001
25 # try and remove naming ocnflicts and fix Automake to allow particular includes
26 # to be attached only to particular object files. Short term fix is either or.
27 ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
28 -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
29 +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
42 # wish this could be distclean-hdr-local but it's not part of automake
43 --- cvs-1.11.2/Makefile.am~ Thu Sep 13 21:08:15 2001
44 +++ cvs-1.11.2/Makefile.am Sat May 11 01:30:51 2002
46 ## Subdirectories to run make in for the primary targets.
47 # Unix source subdirs, where we'll want to run lint and etags:
48 # This is a legacy variable from b4 Automake
49 -USOURCE_SUBDIRS = lib zlib diff src
50 +USOURCE_SUBDIRS = lib diff src
52 SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
53 windows-NT os2 emx vms