Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:pbleser:Development
cvs-stable
cvs-use_system_zlib.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File cvs-use_system_zlib.diff of Package cvs-stable
--- configure.in.orig 2008-05-07 22:10:34.000000000 +0200 +++ configure.in 2010-07-02 15:56:07.000000000 +0200 @@ -1152,8 +1152,7 @@ tools/Makefile \ vms/Makefile \ windows-NT/Makefile \ - windows-NT/SCC/Makefile \ - zlib/Makefile]) + windows-NT/SCC/Makefile]) dnl and we're done AC_OUTPUT --- Makefile.am.orig 2005-04-04 22:46:02.000000000 +0200 +++ Makefile.am 2010-07-02 15:56:07.000000000 +0200 @@ -17,7 +17,7 @@ ## Subdirectories to run make in for the primary targets. # Unix source subdirs, where we'll want to run lint and etags: # This is a legacy variable from b4 Automake -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 --- src/Makefile.am.orig 2005-04-04 22:46:07.000000000 +0200 +++ src/Makefile.am 2010-07-02 15:56:07.000000000 +0200 @@ -105,7 +105,7 @@ cvs_LDADD = \ ../diff/libdiff.a \ ../lib/libcvs.a \ - ../zlib/libz.a + -lz # extra clean targets # wish this could be distclean-hdr-local but it's not part of automake --- src/zlib.c.orig 2005-06-02 17:40:37.000000000 +0200 +++ src/zlib.c 2010-07-02 15:56:07.000000000 +0200 @@ -22,7 +22,7 @@ #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT) -#include "zlib.h" +#include <zlib.h> /* OS/2 doesn't have EIO. FIXME: this whole notion of turning a different error into EIO strikes me as pretty dubious. */ --- src/Makefile.in.orig 2008-05-07 22:12:32.000000000 +0200 +++ src/Makefile.in 2010-07-02 15:56:07.000000000 +0200 @@ -82,7 +82,7 @@ version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \ wrapper.$(OBJEXT) zlib.$(OBJEXT) cvs_OBJECTS = $(am_cvs_OBJECTS) -cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a +cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ @@ -206,7 +206,7 @@ # some namespace hackery going on that maybe shouldn't be. Long term fix is to # try and remove naming ocnflicts and fix Automake to allow particular includes # to be attached only to particular object files. Short term fix is either or. -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt) +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt) bin_SCRIPTS = cvsbug # The cvs executable @@ -285,7 +285,7 @@ cvs_LDADD = \ ../diff/libdiff.a \ ../lib/libcvs.a \ - ../zlib/libz.a + -lz # extra clean targets --- Makefile.in.orig 2008-05-07 22:12:33.000000000 +0200 +++ Makefile.in 2010-07-02 15:56:07.000000000 +0200 @@ -193,7 +193,7 @@ # Unix source subdirs, where we'll want to run lint and etags: # This is a legacy variable from b4 Automake -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
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor