1 diff -ur cvs-1.11.1/Makefile.am cvs-1.11.1.zlib/Makefile.am
2 --- cvs-1.11.1/Makefile.am Wed Jan 3 16:50:41 2001
3 +++ cvs-1.11.1.zlib/Makefile.am Wed May 30 21:46:41 2001
5 ## Subdirectories to run make in for the primary targets.
6 # Unix source subdirs, where we'll want to run lint and etags:
7 # This is a legacy variable from b4 Automake
8 -USOURCE_SUBDIRS = lib zlib diff src
9 +USOURCE_SUBDIRS = lib diff src
11 SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
12 windows-NT os2 emx vms
13 diff -ur cvs-1.11.1/configure.in cvs-1.11.1.zlib/configure.in
14 --- cvs-1.11.1/configure.in Wed Apr 25 23:51:25 2001
15 +++ cvs-1.11.1.zlib/configure.in Wed May 30 21:48:59 2001
20 +AC_CHECK_LIB(z, zlibVersion)
22 dnl The auth server needs to be able to check passwords against passwd
23 dnl file entries, so we only #define AUTH_SERVER_SUPPORT if we can
24 dnl find the crypt function.
29 - windows-NT/SCC/Makefile \
31 + windows-NT/SCC/Makefile],
35 diff -ur cvs-1.11.1/src/Makefile.am cvs-1.11.1.zlib/src/Makefile.am
36 --- cvs-1.11.1/src/Makefile.am Tue Apr 24 20:14:53 2001
37 +++ cvs-1.11.1.zlib/src/Makefile.am Wed May 30 21:47:19 2001
39 # try and remove naming ocnflicts and fix Automake to allow particular includes
40 # to be attached only to particular object files. Short term fix is either or.
41 ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
42 -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
43 +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
53 cvs_EXTRA_DIST = version.c