Merge pull request #3045 from asafkahlon/fix-configure-dladdr-check

configure.ac: serach for dladdr only on libunwind
This commit is contained in:
Luca Boccassi 2018-04-14 21:13:05 +01:00 committed by GitHub
commit c971445025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -175,11 +175,6 @@ case "${host_os}" in
AC_DEFINE(ZMQ_HAVE_LINUX, 1, [Have Linux OS])
libzmq_on_linux="yes"
# dladdr/dlopen is in libdl on glibc
AC_SEARCH_LIBS([dladdr], [dl dld], [], [
AC_MSG_ERROR([unable to find the dladdr() function])
])
if test "x$libzmq_tipc_support" = "xyes"; then
AC_DEFINE(ZMQ_HAVE_TIPC, 1, [Have TIPC support])
fi
@ -784,7 +779,7 @@ if test "x$enable_libunwind" != "xno"; then
AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
AC_SUBST([LIBUNWIND_CFLAGS])
AC_SUBST([LIBUNWIND_LIBS])
AC_CHECK_LIB([dl], [dladdr])
AC_SEARCH_LIBS([dladdr], [dl dld])
],
[
if test "x$enable_libunwind" = "xyes"; then