Sophie

Sophie

distrib > Fedora > 18 > i386 > by-pkgid > c253f2eb5d642dc0d1cba57897e63f40 > files > 2

R-Rcompression-0.93.2-8.fc18.src.rpm

diff -up Rcompression/Rcompression/configure.in.system-minizip Rcompression/Rcompression/configure.in
--- Rcompression/Rcompression/configure.in.system-minizip	2011-01-24 16:54:15.000000000 -0500
+++ Rcompression/Rcompression/configure.in	2011-11-11 11:53:08.156679020 -0500
@@ -1,6 +1,6 @@
 AC_INIT(DESCRIPTION)
 
-echo "Checking configuration for Rcompression to find libz and libbz2"
+echo "Checking configuration for Rcompression to find libz, libbz2, and minizip"
 
 AC_PROG_CC
 
@@ -22,6 +22,8 @@ else
                     echo "Download and build it and specify the location of the source using the environment variable BZIP2_DIR"; exit 1])
 fi
 
+PKG_CHECK_MODULES(MINIZIP, minizip)
+
 # We have a piece of C code that will give us the version information.
 
 $CC -o zlibVersion  libVersion.c  -I$ZLIB_INCLUDE_DIR  -L$ZLIB_LIBS -lz
diff -up Rcompression/Rcompression/src/Makevars.in.system-minizip Rcompression/Rcompression/src/Makevars.in
--- Rcompression/Rcompression/src/Makevars.in.system-minizip	2011-04-06 17:58:14.000000000 -0400
+++ Rcompression/Rcompression/src/Makevars.in	2011-11-11 11:53:08.156679020 -0500
@@ -1,8 +1,8 @@
 # Have to use the version I have in my home directory.
 # otherwise get Z_STREAM_ERROR (-2) when calling deflateInit2().
 
-PKG_CPPFLAGS= -I${HOME}/zlib-1.2.3 -I${HOME}/bzip2-1.0.3 -Dunix
-PKG_LIBS=-L${HOME}/zlib-1.2.3  -lz -L${HOME}/bzip2-1.0.3 -lbz2
+PKG_CPPFLAGS= -I${HOME}/zlib-1.2.3 -I${HOME}/bzip2-1.0.3 -Dunix @MINIZIP_CFLAGS@
+PKG_LIBS=-L${HOME}/zlib-1.2.3  -lz -L${HOME}/bzip2-1.0.3 -lbz2 @MINIZIP_LIBS@
 
 #PKG_LIBS=${HOME}/zlib-1.2.3/libz.a -L${HOME}/bzip2-1.0.3 -lbz2
 
diff -up Rcompression/Rcompression/src/Runzip.c.system-minizip Rcompression/Rcompression/src/Runzip.c
--- Rcompression/Rcompression/src/Runzip.c.system-minizip	2011-04-06 17:58:14.000000000 -0400
+++ Rcompression/Rcompression/src/Runzip.c	2011-11-11 11:53:08.156679020 -0500
@@ -1,4 +1,4 @@
-#include "miniunzip.h"
+#include <unzip.h>
 
 #include <Rinternals.h>
 #include <Rdefines.h>
diff -up Rcompression/Rcompression/src/Runzip_man.c.system-minizip Rcompression/Rcompression/src/Runzip_man.c
--- Rcompression/Rcompression/src/Runzip_man.c.system-minizip	2011-04-06 17:58:14.000000000 -0400
+++ Rcompression/Rcompression/src/Runzip_man.c	2011-11-11 11:55:04.776197785 -0500
@@ -1,4 +1,4 @@
-#include "miniunzip.h"
+#include <unzip.h>
 
 #include <Rinternals.h>
 #include <Rdefines.h>
diff -up Rcompression/Rcompression/src/Rzip.c.system-minizip Rcompression/Rcompression/src/Rzip.c
--- Rcompression/Rcompression/src/Rzip.c.system-minizip	2011-04-06 17:58:14.000000000 -0400
+++ Rcompression/Rcompression/src/Rzip.c	2011-11-11 11:53:08.157679007 -0500
@@ -1,4 +1,4 @@
-#include "miniunzip.h"
+#include <unzip.h>
 #include <Rinternals.h>
 #include <Rdefines.h>
 #include "RConverters.h"
diff -up Rcompression/Rcompression/src/unzipMemory.c.system-minizip Rcompression/Rcompression/src/unzipMemory.c
--- Rcompression/Rcompression/src/unzipMemory.c.system-minizip	2011-04-06 17:58:14.000000000 -0400
+++ Rcompression/Rcompression/src/unzipMemory.c	2011-11-11 11:53:08.157679007 -0500
@@ -1,4 +1,4 @@
-#include "miniunzip.h"
+#include <unzip.h>
 #include <stdlib.h>
 
 #include "RConverters.h"