From 7285bd8fdf8fec60fe84dfbd00e4f7ecfe33d838 Mon Sep 17 00:00:00 2001
From: Roland Kaufmann <roland.kaufmann@uni.no>
Date: Tue, 10 Sep 2013 08:55:25 +0200
Subject: [PATCH] Test for executable and preserve erroneous path for messages

If an alternate compiler is specified, then check if this is actually
executable before assigning it so that we don't end up with specifying
an empty name to CMake. If the path does not exist, it will be preserved
so that CMake will complain with an easily identifiable error message.
---
 cmake/Scripts/configure | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cmake/Scripts/configure b/cmake/Scripts/configure
index 21acc02a..cd1f4ed4 100755
--- a/cmake/Scripts/configure
+++ b/cmake/Scripts/configure
@@ -145,7 +145,7 @@ VARS=()
 
 # command that launches cmake; look for 2.8 if available
 if [ "${CMAKE_COMMAND}" = "" ]; then
-  if test -n "$(command -v cmake28)"; then
+  if [ -x "$(command -v cmake28)" ]; then
     CMAKE_COMMAND=cmake28
   else
     CMAKE_COMMAND=cmake
@@ -453,11 +453,13 @@ for a in "${VARS[@]}"; do
       ;;
     CC=*)
       # special processing for compiler options
-      a=$(command -v ${a#CC=})
+      a=${a#CC=}
+      [ -x "$(command -v $a)" ] && a=$(command -v "$a")
       c_compiler=" -DCMAKE_C_COMPILER=\"${a/\"/\\\"}\""
       ;;
     CXX=*)
-      a=$(command -v ${a#CXX=})
+      a=${a#CXX=}
+      [ -x "$(command -v $a)" ] && a=$(command -v "$a")
       cxx_compiler=" -DCMAKE_CXX_COMPILER=\"${a/\"/\\\"}\""
       ;;
     CFLAGS=*)
@@ -469,7 +471,8 @@ for a in "${VARS[@]}"; do
       cxx_opts=" -DCMAKE_CXX_FLAGS=\"${a/\"/\\\"}\""
       ;;
     FC=*)
-      a=$(command -v  ${a#FC=})
+      a=${a#FC=}
+      [ -x "$(command -v $a)" ] && a=$(command -v "$a")
       fort_compiler=" -DCMAKE_Fortran_COMPILER=\"${a/\"/\\\"}\""
       ;;
     FFLAGS=*)