1 diff -ur cvs-1.11.1/configure.in cvs-1.11.1.zlib/configure.in
2 --- cvs-1.11.1/configure.in Wed Apr 25 23:51:25 2001
3 +++ cvs-1.11.1.zlib/configure.in Wed May 30 21:48:59 2001
8 +AC_CHECK_LIB(z, zlibVersion)
10 dnl The auth server needs to be able to check passwords against passwd
11 dnl file entries, so we only #define AUTH_SERVER_SUPPORT if we can
12 dnl find the crypt function.
17 - windows-NT/SCC/Makefile \
19 + windows-NT/SCC/Makefile]
23 diff -ur cvs-1.11.1/src/Makefile.am cvs-1.11.1.zlib/src/Makefile.am
24 --- cvs-1.11.1/src/Makefile.am Tue Apr 24 20:14:53 2001
25 +++ cvs-1.11.1.zlib/src/Makefile.am Wed May 30 21:47:19 2001
27 # try and remove naming ocnflicts and fix Automake to allow particular includes
28 # to be attached only to particular object files. Short term fix is either or.
29 ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
30 -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
31 +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
44 # wish this could be distclean-hdr-local but it's not part of automake
45 --- cvs-1.11.2/Makefile.am~ Thu Sep 13 21:08:15 2001
46 +++ cvs-1.11.2/Makefile.am Sat May 11 01:30:51 2002
48 ## Subdirectories to run make in for the primary targets.
49 # Unix source subdirs, where we'll want to run lint and etags:
50 # This is a legacy variable from b4 Automake
51 -USOURCE_SUBDIRS = lib zlib diff src
52 +USOURCE_SUBDIRS = lib diff src
54 SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
55 windows-NT os2 emx vms