1 diff -urN cvs-nserver-1.11.1.4.org/Makefile.am cvs-nserver-1.11.1.4/Makefile.am
2 --- cvs-nserver-1.11.1.4.org/Makefile.am Sun May 19 11:15:31 2002
3 +++ cvs-nserver-1.11.1.4/Makefile.am Sun May 19 11:16:39 2002
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 -urN cvs-nserver-1.11.1.4.org/configure.in cvs-nserver-1.11.1.4/configure.in
14 --- cvs-nserver-1.11.1.4.org/configure.in Sun May 19 11:15:31 2002
15 +++ cvs-nserver-1.11.1.4/configure.in Sun May 19 11:16:23 2002
17 AC_DEFINE(HAVE_SETMODE)
20 +AC_CHECK_LIB(z, zlibVersion)
22 test -f src/options.h && (
23 AC_MSG_WARN(saving ./src/options.h in ./src/options.h-SAVED)
24 AC_MSG_WARN(You may wish to check that local options have not been lost.)
29 - windows-NT/SCC/Makefile \
31 + windows-NT/SCC/Makefile],
35 diff -urN cvs-nserver-1.11.1.4.org/src/Makefile.am cvs-nserver-1.11.1.4/src/Makefile.am
36 --- cvs-nserver-1.11.1.4.org/src/Makefile.am Sun May 19 11:15:31 2002
37 +++ cvs-nserver-1.11.1.4/src/Makefile.am Sun May 19 11:17:19 2002
39 # try and remove naming conflicts 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)
45 bin_PROGRAMS = cvs cvs-nserver cvs-pserver cvschkpw
53 cvs_EXTRA_DIST = version.c