Skip to content
Snippets Groups Projects
Commit ddc761fc authored by Utz-Uwe Haus's avatar Utz-Uwe Haus
Browse files

fix --with-libfabric configure option to override pkg-config detected version

parent 9e6079e5
No related branches found
No related tags found
No related merge requests found
...@@ -450,6 +450,11 @@ AS_IF([test "x$enable_ofi_pool_manager" = "xyes"], [ ...@@ -450,6 +450,11 @@ AS_IF([test "x$enable_ofi_pool_manager" = "xyes"], [
SAVED_LDFLAGS="$LDFLAGS" SAVED_LDFLAGS="$LDFLAGS"
SAVED_LIBS="$LIBS" SAVED_LIBS="$LIBS"
AX_USE_LIBRARY([fabric])
AS_IF([test "${with_fabric+set}" = set -o "${with_fabric_lib+set}" = set -o "${with_fabric_include+set}" = set -o "${with_fabric_name+set}" = set],
[AC_MSG_NOTICE([-with-fabric related argument given, skipping pkg-config search for libfabric])],
[
dnl If libfabric is installed in a nonstandard place but can be found by pkg-config, add whatever that tells us before trying to find it dnl If libfabric is installed in a nonstandard place but can be found by pkg-config, add whatever that tells us before trying to find it
dnl (notable example: Cray Shasta systems) dnl (notable example: Cray Shasta systems)
if pkg-config libfabric; then if pkg-config libfabric; then
...@@ -459,9 +464,7 @@ AS_IF([test "x$enable_ofi_pool_manager" = "xyes"], [ ...@@ -459,9 +464,7 @@ AS_IF([test "x$enable_ofi_pool_manager" = "xyes"], [
LIBS=" `pkg-config --libs-only-l libfabric` $LIBS" LIBS=" `pkg-config --libs-only-l libfabric` $LIBS"
else else
AC_MSG_NOTICE([pkg-config does not know about a libfabric installation, fine]) AC_MSG_NOTICE([pkg-config does not know about a libfabric installation, fine])
fi fi])
AX_USE_LIBRARY([fabric])
dnl Sanity check for libfabric library dnl Sanity check for libfabric library
AC_SEARCH_LIBS(fi_getinfo, $fabric_library_name, AC_SEARCH_LIBS(fi_getinfo, $fabric_library_name,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment