cvs/trunk/cvs-1.11.19-extzlib.patch

   1 --- cvs-1.11.19/configure.in.old.old4   2005-02-01 00:10:49.000000000 +0100
   2 +++ cvs-1.11.19/configure.in    2005-02-28 13:27:10.000000000 +0100
   3 @@ -1040,8 +1040,8 @@
   4           tools/Makefile \
   5           vms/Makefile \
   6           windows-NT/Makefile \
   7 -         windows-NT/SCC/Makefile \
   8 -         zlib/Makefile])
   9 +         windows-NT/SCC/Makefile
  10 +         ])
  11
  12  dnl and we're done
  13  AC_OUTPUT
  14 --- cvs-1.11.19/Makefile.am.old.old4    2004-11-11 23:30:36.000000000 +0100
  15 +++ cvs-1.11.19/Makefile.am     2005-02-28 13:25:32.000000000 +0100
  16 @@ -17,7 +17,7 @@
  17  ## Subdirectories to run make in for the primary targets.
  18  # Unix source subdirs, where we'll want to run lint and etags:
  19  # This is a legacy variable from b4 Automake
  20 -USOURCE_SUBDIRS = lib zlib diff src
  21 +USOURCE_SUBDIRS = lib diff src
  22  # All other subdirs:
  23  SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
  24         windows-NT os2 emx vms
  25 --- cvs-1.11.19/src/Makefile.am.old.old4        2005-01-31 23:07:35.000000000 +0100
  26 +++ cvs-1.11.19/src/Makefile.am 2005-02-28 13:24:26.000000000 +0100
  27 @@ -24,7 +24,7 @@
  28  # try and remove naming ocnflicts and fix Automake to allow particular includes
  29  # to be attached only to particular object files.  Short term fix is either or.
  30  ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
  31 -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
  32 +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
  33
  34  bin_PROGRAMS = cvs
  35  bin_SCRIPTS = cvsbug
  36 @@ -105,7 +105,7 @@
  37  cvs_LDADD = \
  38         ../diff/libdiff.a \
  39         ../lib/libcvs.a \
  40 -       ../zlib/libz.a
  41 +       -lz
  42
  43  # extra clean targets
  44  # wish this could be distclean-hdr-local but it's not part of automake