File cfitsio-zlib.patch of Package cfitsio
---
Makefile.in | 8 +++-----
zlib/zcompress.c | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
Index: cfitsio-3.47/Makefile.in
===================================================================
--- cfitsio-3.47.orig/Makefile.in
+++ cfitsio-3.47/Makefile.in
@@ -68,9 +68,7 @@ CORE_SOURCES = buffers.c cfileio.c chec
pliocomp.c fits_hcompress.c fits_hdecompress.c \
simplerng.c @GSIFTP_SRC@
-ZLIB_SOURCES = zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \
- zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
- zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c
+ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c
SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
@@ -103,7 +101,7 @@ lib${PACKAGE}.a: ${OBJECTS}
shared: lib${PACKAGE}${SHLIB_SUFFIX}
lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS} -lz
@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
@@ -143,7 +141,7 @@ smem: smem.o lib${PACKAGE}.a ${OBJECTS}
${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
testprog: testprog.o lib${PACKAGE}.a ${OBJECTS}
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} -lz
fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
Index: cfitsio-3.47/zlib/zcompress.c
===================================================================
--- cfitsio-3.47.orig/zlib/zcompress.c
+++ cfitsio-3.47/zlib/zcompress.c
@@ -3,7 +3,7 @@
#include <stdlib.h>
#include <string.h>
#include <limits.h>
-#include "zlib.h"
+#include <zlib.h>
#define GZBUFSIZE 115200 /* 40 FITS blocks */
#define BUFFINCR 28800 /* 10 FITS blocks */