Annotation of /trunk/ghostscript-gpl/patches/ghostscript-gpl-9.16-zlib.patch
Parent Directory
| 
Revision Log
Revision 2597 -
(hide annotations)
(download)
Wed Jun 24 12:02:26 2015 UTC (8 years, 11 months ago) by niro
File size: 1020 byte(s)
Wed Jun 24 12:02:26 2015 UTC (8 years, 11 months ago) by niro
File size: 1020 byte(s)
-fixed build against system zlib
| 1 | niro | 2597 | diff -up ghostscript-9.12/configure.ac.sys-zlib ghostscript-9.12/configure.ac |
| 2 | --- ghostscript-9.12/configure.ac.sys-zlib 2014-03-26 11:48:54.983972222 +0000 | ||
| 3 | +++ ghostscript-9.12/configure.ac 2014-03-26 11:49:36.807230531 +0000 | ||
| 4 | @@ -854,7 +854,7 @@ AC_MSG_CHECKING([for local zlib source]) | ||
| 5 | dnl zlib is needed for language level 3, and libpng | ||
| 6 | # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) | ||
| 7 | # this seems a harmless default | ||
| 8 | -ZLIBDIR=src | ||
| 9 | +ZLIBDIR=$includedir | ||
| 10 | AUX_SHARED_ZLIB= | ||
| 11 | |||
| 12 | if test -d $srcdir/zlib; then | ||
| 13 | diff -up ghostscript-9.12/configure.sys-zlib ghostscript-9.12/configure | ||
| 14 | --- ghostscript-9.12/configure.sys-zlib 2014-03-26 11:49:45.547284521 +0000 | ||
| 15 | +++ ghostscript-9.12/configure 2014-03-26 11:49:56.171350127 +0000 | ||
| 16 | @@ -6254,7 +6254,7 @@ fi | ||
| 17 | $as_echo_n "checking for local zlib source... " >&6; } | ||
| 18 | # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR) | ||
| 19 | # this seems a harmless default | ||
| 20 | -ZLIBDIR=src | ||
| 21 | +ZLIBDIR=$includedir | ||
| 22 | AUX_SHARED_ZLIB= | ||
| 23 | |||
| 24 | if test -d $srcdir/zlib; then | ||
| 25 |