1
1

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 PBSPro/pbspro#331

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
Этот коммит содержится в:
Gilles Gouaillardet 2017-07-12 10:01:56 +09:00
родитель c18007d095
Коммит 275f31e6aa

Просмотреть файл

@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved. dnl All rights reserved.
dnl Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science dnl Copyright (c) 2015-2017 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved. dnl and Technology (RIST). All rights reserved.
dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights dnl Copyright (c) 2016 Los Alamos National Security, LLC. All rights
dnl reserved. dnl reserved.
@ -128,14 +128,21 @@ AC_DEFUN([ORTE_CHECK_TM],[
[$orte_check_tm_dir], [$orte_check_tm_dir],
[$orte_check_tm_libdir], [$orte_check_tm_libdir],
[orte_check_tm_found="yes"], [orte_check_tm_found="yes"],
[_OPAL_CHECK_PACKAGE_LIB([orte_check_tm], [_OPAL_CHECK_PACKAGE_LIB([orte_check_tm],
[torque], [pbs],
[tm_init], [tm_init],
[], [-lcrypto],
[$orte_check_tm_dir], [$orte_check_tm_dir],
[$orte_check_tm_libdir], [$orte_check_tm_libdir],
[orte_check_tm_found="yes"], [orte_check_tm_found="yes"],
[orte_check_tm_found="no"])])])]) [_OPAL_CHECK_PACKAGE_LIB([orte_check_tm],
[torque],
[tm_init],
[],
[$orte_check_tm_dir],
[$orte_check_tm_libdir],
[orte_check_tm_found="yes"],
[orte_check_tm_found="no"])])])])])
CPPFLAGS="$orte_check_package_$1_save_CPPFLAGS" CPPFLAGS="$orte_check_package_$1_save_CPPFLAGS"
LDFLAGS="$orte_check_package_$1_save_LDFLAGS" LDFLAGS="$orte_check_package_$1_save_LDFLAGS"