]>
Commit | Line | Data |
---|---|---|
6b6d6207 JR |
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 | |
4 | @@ -17,7 +17,7 @@ | |
5 | ## Subdirectories to run make in for the primary targets. | |
82bf0169 | 6 | # Unix source subdirs, where we'll want to run lint and etags: |
6b6d6207 | 7 | # This is a legacy variable from b4 Automake |
82bf0169 | 8 | -USOURCE_SUBDIRS = lib zlib diff src |
9 | +USOURCE_SUBDIRS = lib diff src | |
10 | # All other subdirs: | |
6b6d6207 | 11 | SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \ |
82bf0169 | 12 | windows-NT os2 emx vms |
12ed934c | 13 | --- cvs-1.11.2/configure.in.orig Thu Apr 18 17:31:39 2002 |
14 | +++ cvs-1.11.2/configure.in Sat Apr 20 00:05:04 2002 | |
15 | @@ -336,6 +336,8 @@ | |
82bf0169 | 16 | enable_server=yes |
17 | fi]) | |
18 | ||
19 | +AC_CHECK_LIB(z, zlibVersion) | |
6b6d6207 | 20 | + |
82bf0169 | 21 | dnl The auth server needs to be able to check passwords against passwd |
22 | dnl file entries, so we only #define AUTH_SERVER_SUPPORT if we can | |
23 | dnl find the crypt function. | |
12ed934c | 24 | @@ -410,8 +412,7 @@ |
6b6d6207 JR |
25 | tools/Makefile \ |
26 | vms/Makefile \ | |
27 | windows-NT/Makefile \ | |
28 | - windows-NT/SCC/Makefile \ | |
29 | - zlib/Makefile], | |
30 | + windows-NT/SCC/Makefile], | |
12ed934c | 31 | [chmod +x \ |
6b6d6207 JR |
32 | contrib/clmerge \ |
33 | contrib/cln_hist \ | |
12ed934c | 34 | --- cvs-1.11.2/src/Makefile.am.orig Mon Aug 20 19:52:53 2001 |
35 | +++ cvs-1.11.2/src/Makefile.am Sat Apr 20 00:06:59 2002 | |
6b6d6207 JR |
36 | @@ -20,7 +20,7 @@ |
37 | # try and remove naming ocnflicts and fix Automake to allow particular includes | |
38 | # to be attached only to particular object files. Short term fix is either or. | |
39 | ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib | |
40 | -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt) | |
41 | +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt) | |
42 | ||
43 | bin_PROGRAMS = cvs | |
44 | bin_SCRIPTS = cvsbug | |
12ed934c | 45 | @@ -100,8 +100,7 @@ |
46 | ||
6b6d6207 JR |
47 | cvs_LDADD = \ |
48 | ../diff/libdiff.a \ | |
12ed934c | 49 | - ../lib/libcvs.a \ |
50 | - ../zlib/libz.a | |
51 | + ../lib/libcvs.a | |
82bf0169 | 52 | |
12ed934c | 53 | # extra clean targets |
54 | # wish this could be distclean-hdr-local but it's not part of automake |