projects / packages / cvs.git / blame
| Commit | Line | Data |
|---|---|---|
| a95ed2ee | 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 | |
| 4 | @@ -300,6 +300,8 @@ | |
| 82bf0169 | 5 | enable_server=yes |
| 6 | fi]) | |
| 7 | ||
| 8 | +AC_CHECK_LIB(z, zlibVersion) | |
| 6b6d6207 | 9 | + |
| 82bf0169 | 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. | |
| a95ed2ee | 13 | @@ -410,8 +410,7 @@ |
| 6b6d6207 JR |
14 | tools/Makefile \ |
| 15 | vms/Makefile \ | |
| 16 | windows-NT/Makefile \ | |
| 17 | - windows-NT/SCC/Makefile \ | |
| 18 | - zlib/Makefile], | |
| a95ed2ee | 19 | + windows-NT/SCC/Makefile] |
| 12ed934c | 20 | [chmod +x \ |
| 6b6d6207 JR |
21 | contrib/clmerge \ |
| 22 | contrib/cln_hist \ | |
| a95ed2ee | 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 | |
| 6b6d6207 JR |
26 | @@ -20,7 +20,7 @@ |
| 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) | |
| 32 | ||
| 33 | bin_PROGRAMS = cvs | |
| 34 | bin_SCRIPTS = cvsbug | |
| 12ed934c | 35 | @@ -100,8 +100,7 @@ |
| 36 | ||
| 6b6d6207 JR |
37 | cvs_LDADD = \ |
| 38 | ../diff/libdiff.a \ | |
| 12ed934c | 39 | - ../lib/libcvs.a \ |
| 40 | - ../zlib/libz.a | |
| 41 | + ../lib/libcvs.a | |
| 82bf0169 | 42 | |
| 12ed934c | 43 | # extra clean targets |
| 44 | # wish this could be distclean-hdr-local but it's not part of automake | |
| a95ed2ee | 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 | |
| 47 | @@ -17,7 +17,7 @@ | |
| 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 | |
| 53 | # All other subdirs: | |
| 54 | SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \ | |
| 55 | windows-NT os2 emx vms |