File cfitsio-zlib.patch of Package cfitsio
diff -Naur cfitsio/Makefile.in cfitsio-zlib/Makefile.in
--- cfitsio/Makefile.in 2012-07-17 23:38:34.000000000 +0300
+++ cfitsio-zlib/Makefile.in 2012-07-31 18:40:04.455338700 +0300
@@ -52,9 +52,7 @@
putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \
putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
- pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c \
- adler32.c crc32.c inffast.c inftrees.c trees.c zutil.c \
- deflate.c infback.c inflate.c uncompr.c \
+ pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c
SOURCES = ${CORE_SOURCES} @F77_WRAPPERS@
@@ -87,7 +85,7 @@
shared: libcfitsio${SHLIB_SUFFIX}
libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
- ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm ${LIBS}
+ ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm ${LIBS} -lz
install: libcfitsio.a $(INSTALL_DIRS)
@if [ -f libcfitsio.a ]; then \
@@ -109,13 +107,13 @@
${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
testprog: testprog.o libcfitsio.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS} -lz
fpack: fpack.o fpackutil.o libcfitsio.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o -L. -lcfitsio -lm ${LIBS}
funpack: funpack.o fpackutil.o libcfitsio.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o -L. -lcfitsio -lm ${LIBS}
fitscopy: fitscopy.o libcfitsio.a ${OBJECTS}
${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS}
diff -Naur cfitsio/zcompress.c cfitsio-zlib/zcompress.c
--- cfitsio/zcompress.c 2011-01-03 23:17:38.000000000 +0200
+++ cfitsio-zlib/zcompress.c 2012-07-31 18:23:13.819473443 +0300
@@ -2,7 +2,7 @@
#include <errno.h>
#include <stdlib.h>
#include <string.h>
-#include "zlib.h"
+#include <zlib.h>
unsigned int GZBUFSIZE = 115200; /* 40 FITS blocks */
int BUFFINCR = 28800; /* 10 FITS blocks */