From f7daa9a42bf5a54a774aa081c0f7695097a3044a Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@4054007a-4839-4648-a056-eb81e030d849>
Date: Tue, 12 Jun 2012 18:28:29 +0000
Subject: Rename configuration script

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/OpenCL/trunk@15 4054007a-4839-4648-a056-eb81e030d849
---
 OpenCL.sh         | 47 -----------------------------------------------
 configuration.ccl |  2 +-
 configure.sh      | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 OpenCL.sh
 create mode 100644 configure.sh

diff --git a/OpenCL.sh b/OpenCL.sh
deleted file mode 100644
index 86f564b..0000000
--- a/OpenCL.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/bash
-
-################################################################################
-# Prepare
-################################################################################
-
-# Set up shell
-set -x                          # Output commands
-set -e                          # Abort on errors
-
-
-
-################################################################################
-# Configure Cactus
-################################################################################
-
-if [ -z "${OPENCL_DIR}" ]; then
-    if [ -r /System/Library/Frameworks/OpenCL.framework ]; then
-        OPENCL_DIR=/System/Library/Frameworks/OpenCL.framework
-        OPENCL_INC_DIRS=/System/Library/Frameworks/OpenCL.framework/Headers
-        OPENCL_LIB_DIRS=/System/Library/Frameworks/OpenCL.framework/Libraries
-        OPENCL_LIBS="-Wl,-framework -Wl,OpenCL"
-    else
-        echo "BEGIN ERROR"
-        echo "OpenCL selected, but OPENCL_DIR not set."
-        echo "END ERROR"
-        exit 1
-    fi
-fi
-
-# Set options
-
-: ${OPENCL_INC_DIRS:=${OPENCL_DIR}/include}
-: ${OPENCL_LIB_DIRS:=${OPENCL_DIR}/lib}
-: ${OPENCL_LIBS:=OpenCL}
-
-echo "BEGIN MAKE_DEFINITION"
-echo "HAVE_OPENCL     = 1"
-echo "OPENCL_DIR      = ${OPENCL_DIR}"
-echo "OPENCL_INC_DIRS = ${OPENCL_INC_DIRS}"
-echo "OPENCL_LIB_DIRS = ${OPENCL_LIB_DIRS}"
-echo "OPENCL_LIBS     = ${OPENCL_LIBS}"
-echo "END MAKE_DEFINITION"
-
-echo 'INCLUDE_DIRECTORY $(OPENCL_INC_DIRS)'
-echo 'LIBRARY_DIRECTORY $(OPENCL_LIB_DIRS)'
-echo 'LIBRARY           $(OPENCL_LIBS)'
diff --git a/configuration.ccl b/configuration.ccl
index 44d9e14..99e3774 100644
--- a/configuration.ccl
+++ b/configuration.ccl
@@ -4,7 +4,7 @@ REQUIRES OpenCL
 
 PROVIDES OpenCL
 {
-  SCRIPT OpenCL.sh
+  SCRIPT configure.sh
   LANG bash
   OPTIONS OPENCL_DIR OPENCL_INC_DIRS OPENCL_LIB_DIRS OPENCL_LIBS
 }
diff --git a/configure.sh b/configure.sh
new file mode 100644
index 0000000..86f564b
--- /dev/null
+++ b/configure.sh
@@ -0,0 +1,47 @@
+#! /bin/bash
+
+################################################################################
+# Prepare
+################################################################################
+
+# Set up shell
+set -x                          # Output commands
+set -e                          # Abort on errors
+
+
+
+################################################################################
+# Configure Cactus
+################################################################################
+
+if [ -z "${OPENCL_DIR}" ]; then
+    if [ -r /System/Library/Frameworks/OpenCL.framework ]; then
+        OPENCL_DIR=/System/Library/Frameworks/OpenCL.framework
+        OPENCL_INC_DIRS=/System/Library/Frameworks/OpenCL.framework/Headers
+        OPENCL_LIB_DIRS=/System/Library/Frameworks/OpenCL.framework/Libraries
+        OPENCL_LIBS="-Wl,-framework -Wl,OpenCL"
+    else
+        echo "BEGIN ERROR"
+        echo "OpenCL selected, but OPENCL_DIR not set."
+        echo "END ERROR"
+        exit 1
+    fi
+fi
+
+# Set options
+
+: ${OPENCL_INC_DIRS:=${OPENCL_DIR}/include}
+: ${OPENCL_LIB_DIRS:=${OPENCL_DIR}/lib}
+: ${OPENCL_LIBS:=OpenCL}
+
+echo "BEGIN MAKE_DEFINITION"
+echo "HAVE_OPENCL     = 1"
+echo "OPENCL_DIR      = ${OPENCL_DIR}"
+echo "OPENCL_INC_DIRS = ${OPENCL_INC_DIRS}"
+echo "OPENCL_LIB_DIRS = ${OPENCL_LIB_DIRS}"
+echo "OPENCL_LIBS     = ${OPENCL_LIBS}"
+echo "END MAKE_DEFINITION"
+
+echo 'INCLUDE_DIRECTORY $(OPENCL_INC_DIRS)'
+echo 'LIBRARY_DIRECTORY $(OPENCL_LIB_DIRS)'
+echo 'LIBRARY           $(OPENCL_LIBS)'
-- 
cgit v1.2.3