Skip to content

Commit 275f31e

Browse files
committed
configury: fix PBS Pro support
recent versions of PBS Pro requires libcrypto.so, but libpbs.so does not (yet) depend on it, so manually add -lcrypto if -lpbs alone fails. Thanks Petr Hanousek for bringing this to our attention Refs openpbs/openpbs#331 Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent c18007d commit 275f31e

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

config/orte_check_tm.m4

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
1313
dnl Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
14-
dnl Copyright (c) 2015 Research Organization for Information Science
14+
dnl Copyright (c) 2015-2017 Research Organization for Information Science
1515
dnl and Technology (RIST). All rights reserved.
1616
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
1717
dnl reserved.
@@ -128,14 +128,21 @@ AC_DEFUN([ORTE_CHECK_TM],[
128128
[$orte_check_tm_dir],
129129
[$orte_check_tm_libdir],
130130
[orte_check_tm_found="yes"],
131-
[_OPAL_CHECK_PACKAGE_LIB([orte_check_tm],
132-
[torque],
133-
[tm_init],
134-
[],
135-
[$orte_check_tm_dir],
136-
[$orte_check_tm_libdir],
137-
[orte_check_tm_found="yes"],
138-
[orte_check_tm_found="no"])])])])
131+
[_OPAL_CHECK_PACKAGE_LIB([orte_check_tm],
132+
[pbs],
133+
[tm_init],
134+
[-lcrypto],
135+
[$orte_check_tm_dir],
136+
[$orte_check_tm_libdir],
137+
[orte_check_tm_found="yes"],
138+
[_OPAL_CHECK_PACKAGE_LIB([orte_check_tm],
139+
[torque],
140+
[tm_init],
141+
[],
142+
[$orte_check_tm_dir],
143+
[$orte_check_tm_libdir],
144+
[orte_check_tm_found="yes"],
145+
[orte_check_tm_found="no"])])])])])
139146

140147
CPPFLAGS="$orte_check_package_$1_save_CPPFLAGS"
141148
LDFLAGS="$orte_check_package_$1_save_LDFLAGS"

0 commit comments

Comments
 (0)