From cd0818dd555c4c2694d23c52f1ea0b66ac25c09f Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 8 Mar 2011 02:24:20 +0000
Subject: [PATCH] select/cray: update for patch 09, which tests for Cray
binaries 'apbasil' and 'apkill'
Just a suggestion, also updates comment text.
---
auxdir/x_ac_cray.m4 | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/auxdir/x_ac_cray.m4 b/auxdir/x_ac_cray.m4
index 0cf1926f2a2..522851b676a 100644
--- a/auxdir/x_ac_cray.m4
+++ b/auxdir/x_ac_cray.m4
@@ -61,18 +61,17 @@ AC_DEFUN([X_AC_CRAY],
fi
# Check that all Cray binaries called by SLURM are in their expected places.
- # On a standard XT/XE installation, both these have always been in /usr/bin.
+ # On a standard XT/XE installation, apbasil and apkill are normally in /usr/bin.
for dir in $_x_ac_alps_dirs; do
- test -d "$dir" || continue
test -d "$dir/bin" || continue
- test -f "$dir/bin/apbasil" || continue
- test -f "$dir/bin/apkill" || continue
+ test -x "$dir/bin/apbasil" || continue
+ test -x "$dir/bin/apkill" || continue
_x_ac_alps_install_dir="$dir"
AC_DEFINE_UNQUOTED(HAVE_ALPS_DIR, "$dir", [Directory in which ALPS has been installed])
break
done
if test -z "$_x_ac_alps_install_dir"; then
- AC_MSG_ERROR([Could not locate apbasil and apikill executables on Cray system. See --with-alps-dir option.])
+ AC_MSG_ERROR([Could not locate apbasil and apkill executables on Cray system. See --with-alps-dir option.])
fi
AC_DEFINE(HAVE_3D, 1, [Define to 1 if 3-dimensional architecture])
--
GitLab