From 2ab7811ba1e2d08a45ec24c8cac5254e2965bad1 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@9e23cc15-e5c8-4d65-9080-beda90ea645b>
Date: Wed, 9 Nov 2011 21:56:57 +0000
Subject: Update from upstream

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/GSL/trunk@23 9e23cc15-e5c8-4d65-9080-beda90ea645b
---
 GSL.sh               |   7 +------
 dist/gsl-1.14.tar.gz | Bin 3128269 -> 0 bytes
 dist/gsl-1.15.tar.gz | Bin 0 -> 3281134 bytes
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 dist/gsl-1.14.tar.gz
 create mode 100644 dist/gsl-1.15.tar.gz

diff --git a/GSL.sh b/GSL.sh
index 1bee624..85a4631 100644
--- a/GSL.sh
+++ b/GSL.sh
@@ -58,7 +58,7 @@ if [ -z "${GSL_DIR}" -o "${GSL_DIR}" = 'BUILD' ]; then
     
     # Set locations
     THORN=GSL
-    NAME=gsl-1.14
+    NAME=gsl-1.15
     SRCDIR=$(dirname $0)
     BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
     if [ -z "${GSL_INSTALL_DIR}" ]; then
@@ -87,11 +87,6 @@ if [ -z "${GSL_DIR}" -o "${GSL_DIR}" = 'BUILD' ]; then
     else
         echo "GSL: Building enclosed GSL library"
         
-        # Should we use gmake or make?
-        MAKE=$(gmake --help > /dev/null 2>&1 && echo gmake || echo make)
-        # Should we use gtar or tar?
-        TAR=$(gtar --help > /dev/null 2> /dev/null && echo gtar || echo tar)
-        
         # Set up environment
         unset LIBS
         if echo '' ${ARFLAGS} | grep 64 > /dev/null 2>&1; then
diff --git a/dist/gsl-1.14.tar.gz b/dist/gsl-1.14.tar.gz
deleted file mode 100644
index 062c9fd..0000000
Binary files a/dist/gsl-1.14.tar.gz and /dev/null differ
diff --git a/dist/gsl-1.15.tar.gz b/dist/gsl-1.15.tar.gz
new file mode 100644
index 0000000..a6d6d43
Binary files /dev/null and b/dist/gsl-1.15.tar.gz differ
-- 
cgit v1.2.3