From eee265287a9fd5652bf5a6dcf96955688d583ea0 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@d47fded2-66c1-406f-af09-4fc0800f9c6b>
Date: Wed, 10 Oct 2012 17:21:08 +0000
Subject: Update to FFTW zlib 1.2.7

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/zlib/trunk@16 d47fded2-66c1-406f-af09-4fc0800f9c6b
---
 configure.sh           |   4 ++--
 dist/zlib-1.2.5.tar.gz | Bin 544640 -> 0 bytes
 dist/zlib-1.2.7.tar.gz | Bin 0 -> 560351 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 dist/zlib-1.2.5.tar.gz
 create mode 100644 dist/zlib-1.2.7.tar.gz

diff --git a/configure.sh b/configure.sh
index a2d0c60..687bce6 100644
--- a/configure.sh
+++ b/configure.sh
@@ -80,7 +80,7 @@ then
     
     # Set locations
     THORN=zlib
-    NAME=zlib-1.2.5
+    NAME=zlib-1.2.7
     SRCDIR=$(dirname $0)
     BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
     if [ -z "${ZLIB_INSTALL_DIR}" ]; then
@@ -134,7 +134,7 @@ then
         echo "zlib: Unpacking archive..."
         pushd ${BUILD_DIR}
         ${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz
-        ${PATCH?} -p0 < ${SRCDIR}/dist/install.diff
+        #${PATCH?} -p0 < ${SRCDIR}/dist/install.diff
         
         echo "zlib: Configuring..."
         cd ${NAME}
diff --git a/dist/zlib-1.2.5.tar.gz b/dist/zlib-1.2.5.tar.gz
deleted file mode 100644
index 16a637b..0000000
Binary files a/dist/zlib-1.2.5.tar.gz and /dev/null differ
diff --git a/dist/zlib-1.2.7.tar.gz b/dist/zlib-1.2.7.tar.gz
new file mode 100644
index 0000000..833e888
Binary files /dev/null and b/dist/zlib-1.2.7.tar.gz differ
-- 
cgit v1.2.3