- more %%{__make} macros.

[packages/cvs.git] / cvs-zlib.patch

diff -uNr cvs-1.10.8/Makefile.in cvs-1.10.8-zlib/Makefile.in
--- cvs-1.10.8/Makefile.in	Mon Apr 26 17:05:11 1999
+++ cvs-1.10.8-zlib/Makefile.in	Wed May 10 10:20:51 2000
@@ -94,7 +94,7 @@
 
 ### Subdirectories to run make in for the primary targets.
 # Unix source subdirs, where we'll want to run lint and etags:
-USOURCE_SUBDIRS = lib zlib diff src
+USOURCE_SUBDIRS = lib diff src
 # All other subdirs:
 SUBDIRS = ${USOURCE_SUBDIRS} man doc contrib tools \
 	windows-NT os2 emx vms
@@ -187,21 +187,18 @@
 .PHONY: check
 check:
 	cd lib ; $(MAKE) $(FLAGS_TO_PASS)
-	cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
 	cd diff ; $(MAKE) $(FLAGS_TO_PASS)
 	cd src ; $(MAKE) $(FLAGS_TO_PASS) check
 
 .PHONY: remotecheck
 remotecheck:
 	cd lib ; $(MAKE) $(FLAGS_TO_PASS)
-	cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
 	cd diff ; $(MAKE) $(FLAGS_TO_PASS)
 	cd src ; $(MAKE) $(FLAGS_TO_PASS) remotecheck
 
 .PHONY: installcheck
 installcheck:
 	cd lib ; $(MAKE) $(FLAGS_TO_PASS)
-	cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
 	cd diff ; $(MAKE) $(FLAGS_TO_PASS)
 	cd src ; $(MAKE) $(FLAGS_TO_PASS) installcheck
 
diff -uNr cvs-1.10.8/configure.in cvs-1.10.8-zlib/configure.in
--- cvs-1.10.8/configure.in	Wed May 10 10:24:21 2000
+++ cvs-1.10.8-zlib/configure.in	Wed May 10 10:23:51 2000
@@ -258,6 +258,7 @@
   enable_server=yes
 fi])
 
+AC_CHECK_LIB(z, zlibVersion)
 dnl The auth server needs to be able to check passwords against passwd
 dnl file entries, so we only #define AUTH_SERVER_SUPPORT if we can
 dnl find the crypt function. 
@@ -302,7 +303,7 @@
   cp ./src/options.h ./src/options.h-SAVED
 )
 
-AC_OUTPUT(Makefile lib/Makefile src/Makefile zlib/Makefile diff/Makefile doc/Makefile \
+AC_OUTPUT(Makefile lib/Makefile src/Makefile diff/Makefile doc/Makefile \
 	  man/Makefile tools/Makefile \
 	  contrib/Makefile \
 	  windows-NT/Makefile windows-NT/SCC/Makefile \
diff -uNr cvs-1.10.8/src/Makefile.in cvs-1.10.8-zlib/src/Makefile.in
--- cvs-1.10.8/src/Makefile.in	Tue Oct  6 19:04:30 1998
+++ cvs-1.10.8-zlib/src/Makefile.in	Wed May 10 10:21:36 2000
@@ -140,10 +140,10 @@
 
 # Linking rules.
 
-$(PROGS): ../lib/libcvs.a ../zlib/libz.a ../diff/libdiff.a
+$(PROGS): ../lib/libcvs.a ../diff/libdiff.a
 
 cvs: $(OBJECTS)
-	$(CC) $(OBJECTS) ../lib/libcvs.a ../zlib/libz.a ../diff/libdiff.a $(LIBS) $(LDFLAGS) -o $@ 
+	$(CC) $(OBJECTS) ../lib/libcvs.a ../diff/libdiff.a $(LIBS) $(LDFLAGS) -o $@ 
 
 xlint: $(SOURCES)
 	files= ; \