@@ -24,7 +24,7 @@ dnl cannot assume is always present) or we need to look in a
2424dnl particular directory for the right libnl3 include files. For
2525dnl now, just hard code the special path into this logic.
2626dnl
27- dnl _OPAL_CHECK_PACKAGE_LIB () invokes OPAL_LIBNL_SANITY_CHECK () in order
27+ dnl OAC_CHEC_PACKAGE () invokes OPAL_LIBNL_CHECK_PACKAGE_CALLBACK () in order
2828dnl to keep track of which libraries depend on libnl and which libraries
2929dnl depend on libnl3.
3030dnl Open MPI will not be able to build a component vs a given version of libnl
@@ -92,36 +92,6 @@ AC_DEFUN([OPAL_LIBNL_CHECK_PACKAGE_CALLBACK], [
9292 OPAL_VAR_SCOPE_POP([opal_libnl_sane])
9393])
9494
95- dnl OPAL_LIBNL_SANITY_CHECK(lib, function, LIBS, libnl_check_ok)
96- dnl
97- dnl This macro is invoked from CHECK_PACKAGE to make sure that
98- dnl new libraries that are added to LIBS do not pull in conflicting
99- dnl versions of libnl. E.g., if we already have a library in LIBS
100- dnl that pulls in libnl v3, if CHECK_PACKAGE is later called that
101- dnl pulls in a library that pulls in libnl v1, this macro will detect
102- dnl the conflict and will abort configure.
103- dnl
104- dnl We abort rather than silently ignore this library simply because
105- dnl we are now multiple levels deep in the M4 " call stack" , and this
106- dnl layer does not know the intent of the user. Hence, all we can do
107- dnl is abort with a hopefully helpful error message (that we aborted
108- dnl because Open MPI would have been built in a configuration that is
109- dnl known to crash).
110- dnl
111- dnl --------------------------------------------------------------------
112- AC_DEFUN([OPAL_LIBNL_SANITY_CHECK], [
113- OPAL_VAR_SCOPE_PUSH([opal_libnl_sane])
114- opal_libnl_sane= 1
115- case $host in
116- * linux* )
117- OPAL_LIBNL_SANITY_CHECK_LINUX([$1 ], [$2 ], [-l$1 $3 ], [opal_libnl_sane])
118- ;;
119- esac
120-
121- $4 = $opal_libnl_sane
122- OPAL_VAR_SCOPE_POP([opal_libnl_sane])
123- ])
124-
12595dnl
12696dnl Simple helper for OPAL_LIBNL_SANITY_CHECK
12797dnl $1 : package name
0 commit comments