From cc660fa57ad13875575c89299df857593cec68d0 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Wed, 20 Jul 2011 23:28:17 +0000 Subject: [PATCH] Rather than looking for any path, look for any non-absolute path starting in contrib/platform, in addition to cwd This commit was SVN r24905. --- config/ompi_load_platform.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ompi_load_platform.m4 b/config/ompi_load_platform.m4 index a12ade3017..c39f398675 100644 --- a/config/ompi_load_platform.m4 +++ b/config/ompi_load_platform.m4 @@ -35,8 +35,8 @@ AC_DEFUN([OMPI_LOAD_PLATFORM], [ elif test "$with_platform" = "no" ; then AC_MSG_ERROR([--without-platform is not a valid argument]) elif test "$with_platform" != "" ; then - # if no path part, check in contrib/platform - if test "`basename $with_platform`" = "$with_platform" ; then + # if not an absolute path, check in contrib/platform + if test ! "`echo $with_platform | cut -c1`" = "/" -a ! "`echo $with_platform | cut -c2`" = ".." ; then if test -r "${srcdir}/contrib/platform/$with_platform" ; then with_platform="${srcdir}/contrib/platform/$with_platform" fi