From 91ea4e2fb43ad6f833a20ddeeb18b2166281d7c2 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@043a8217-7a68-40fe-abfd-36aa7d4fa6a8>
Date: Mon, 8 Apr 2013 15:21:20 +0000
Subject: Correct configure script

Ensure no shell command fails


git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/MPI/trunk@24 043a8217-7a68-40fe-abfd-36aa7d4fa6a8
---
 configure.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure.sh b/configure.sh
index e13ac8a..107e7f3 100755
--- a/configure.sh
+++ b/configure.sh
@@ -194,12 +194,11 @@ fi
 
 # use mpic++ if available
 if [ -x ${MPI_DIR}/bin/mpic++ ]; then
-  ${MPI_DIR}/bin/mpic++ --showme:libs > /dev/null 2>&1
-  if [ $? == 0 ]; then
-    : ${MPI_INC_DIRS="$(echo '' $(${MPI_DIR}/bin/mpic++ --showme:incdirs) '' | sed -e 's+\( \|^\)/include\( \|$\)++g;s+\( \|^\)/use/include\( \|$\)++g;s+\( \|^\)/usr/local/include\( \|$\)++g')"}
-    : ${MPI_LIB_DIRS="$(echo '' $(${MPI_DIR}/bin/mpic++ --showme:libdirs) '' | sed -e 's+\( \|^\)/lib\( \|$\)++g;s+\( \|^\)/lib64\( \|$\)++g;s+\( \|^\)/usr/lib\( \|$\)++g;s+\( \|^\)/usr/lib64\( \|$\)++g;s+\( \|^\)/usr/local/lib\( \|$\)++g;s+\( \|^\)/usr/local/lib64\( \|$\)++g')"}
-    : ${MPI_LIBS="$(echo '' $(${MPI_DIR}/bin/mpic++ --showme:libs) '')"}
-  fi
+    if ${MPI_DIR}/bin/mpic++ --showme:libs > /dev/null 2>&1; then
+        : ${MPI_INC_DIRS="$(echo '' $(${MPI_DIR}/bin/mpic++ --showme:incdirs) '' | sed -e 's+\( \|^\)/include\( \|$\)++g;s+\( \|^\)/use/include\( \|$\)++g;s+\( \|^\)/usr/local/include\( \|$\)++g')"}
+        : ${MPI_LIB_DIRS="$(echo '' $(${MPI_DIR}/bin/mpic++ --showme:libdirs) '' | sed -e 's+\( \|^\)/lib\( \|$\)++g;s+\( \|^\)/lib64\( \|$\)++g;s+\( \|^\)/usr/lib\( \|$\)++g;s+\( \|^\)/usr/lib64\( \|$\)++g;s+\( \|^\)/usr/local/lib\( \|$\)++g;s+\( \|^\)/usr/local/lib64\( \|$\)++g')"}
+        : ${MPI_LIBS="$(echo '' $(${MPI_DIR}/bin/mpic++ --showme:libs) '')"}
+    fi
 fi
 
 if [ "${MPI_DIR}" != '/usr' -a "${MPI_DIR}" != '/usr/local' ]; then
-- 
cgit v1.2.3