Skip to content

Commit 2cc391d

Browse files
committed
ompi_check_lustre.m4: ensure --with-lustre isn't harmful
Make sure the default Autoconf "yes" value for $with_lustre when the user specifies --with-lustre on the command line (without a value) does not propagate down into the directory logic. Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit 8604273) Signed-off-by: Jeff Squyres <[email protected]>
1 parent a46f07b commit 2cc391d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

config/ompi_check_lustre.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
1010
dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2006 The Regents of the University of California.
1212
dnl All rights reserved.
13-
dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
13+
dnl Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved
1414
dnl Copyright (c) 2008-2012 University of Houston. All rights reserved.
1515
dnl Copyright (c) 2015 Research Organization for Information Science
1616
dnl and Technology (RIST). All rights reserved.
@@ -46,7 +46,7 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
4646
[Build Lustre support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
4747
OPAL_CHECK_WITHDIR([lustre], [$with_lustre], [include/lustre/liblustreapi.h])
4848

49-
AS_IF([test -z "$with_lustre"],
49+
AS_IF([test -z "$with_lustre" || test "$with_lustre" = "yes"],
5050
[ompi_check_lustre_dir="/usr"],
5151
[ompi_check_lustre_dir="$with_lustre"])
5252

0 commit comments

Comments
 (0)