From d6530b0e9991bcd9ffe54a41f51ba39218d99d11 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 9 Mar 2015 08:15:38 -0700 Subject: [PATCH] opal_check_package: use AC_SEARCH_LIBS instead of AC_CHECK_LIB Per discussion on devel (http://www.open-mpi.org/community/lists/devel/2015/02/17030.php), and per Autoconf 2.69 docs, use the recommended AC_SEARCH_LIBS instead of AC_CHECK_LIB (e.g., for functions that appear in libc on some platforms and in a specific library on other platforms). --- config/opal_check_package.m4 | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/config/opal_check_package.m4 b/config/opal_check_package.m4 index e1016fa20f..bde47b57c7 100644 --- a/config/opal_check_package.m4 +++ b/config/opal_check_package.m4 @@ -67,8 +67,8 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_LIB], [ # cache variable for the library check. one should not copy this # code into other places unless you want much pain and suffering AS_LITERAL_IF([$2], - [AS_VAR_PUSHDEF([opal_Lib], [ac_cv_lib_$2_$3])], - [AS_VAR_PUSHDEF([opal_Lib], [ac_cv_lib_$2''_$3])])dnl + [AS_VAR_PUSHDEF([opal_Lib], [ac_cv_search_$2_$3])], + [AS_VAR_PUSHDEF([opal_Lib], [ac_cv_search_$2''_$3])])dnl # see comment above unset opal_Lib @@ -77,7 +77,7 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_LIB], [ [ # libdir was specified - search only there $1_LDFLAGS="$$1_LDFLAGS -L$6" LDFLAGS="$LDFLAGS -L$6" - AC_CHECK_LIB([$2], [$3], + AC_SEARCH_LIBS([$3], [$2], [opal_check_package_lib_happy="yes"], [opal_check_package_lib_happy="no"], [$4]) AS_IF([test "$opal_check_package_lib_happy" = "no"], @@ -91,7 +91,7 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_LIB], [ test "$opal_check_package_libdir" = "/usr/local"], [ # try as is... AC_VERBOSE([looking for library without search path]) - AC_CHECK_LIB([$2], [$3], + AC_SEARCH_LIBS([$3], [$2], [opal_check_package_lib_happy="yes"], [opal_check_package_lib_happy="no"], [$4]) AS_IF([test "$opal_check_package_lib_happy" = "no"], @@ -105,7 +105,7 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_LIB], [ [$1_LDFLAGS="$$1_LDFLAGS -L$opal_check_package_libdir/lib" LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib" AC_VERBOSE([looking for library in lib]) - AC_CHECK_LIB([$2], [$3], + AC_SEARCH_LIBS([$3], [$2], [opal_check_package_lib_happy="yes"], [opal_check_package_lib_happy="no"], [$4]) AS_IF([test "$opal_check_package_lib_happy" = "no"], @@ -119,7 +119,7 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_LIB], [ [$1_LDFLAGS="$$1_LDFLAGS -L$opal_check_package_libdir/lib64" LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib64" AC_VERBOSE([looking for library in lib64]) - AC_CHECK_LIB([$2], [$3], + AC_SEARCH_LIBS([$3], [$2], [opal_check_package_lib_happy="yes"], [opal_check_package_lib_happy="no"], [$4]) AS_IF([test "$opal_check_package_lib_happy" = "no"], @@ -129,8 +129,13 @@ AC_DEFUN([_OPAL_CHECK_PACKAGE_LIB], [ unset opal_Lib])])])]) AS_IF([test "$opal_check_package_lib_happy" = "yes"], - [$1_LIBS="-l$2 $4" - $7], [$8]) + [ # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function] + AS_IF([test "$ac_cv_search_$3" != "no" && + test "$ac_cv_search_$3" != "none required"], + [$1_LIBS="$ac_cv_search_$3 $4"], + [$1_LIBS="$4"]) + $7], + [$8]) AS_VAR_POPDEF([opal_Lib])dnl ])