diff --git a/configure.in b/configure.in index 74439433..7272a651 100644 --- a/configure.in +++ b/configure.in @@ -23,6 +23,15 @@ AM_PROG_CC_C_O dnl Checks for libraries. AC_CHECK_LIB(uca, __uc_get_grs) +AC_CHECK_LIB(util, kinfo_getvmmap) +OLD_LIBS=${LIBS} +AC_SEARCH_LIBS(dl, dlopen) +LIBS=${OLD_LIBS} +case "$ac_cv_search_dlopen" in + -l*) DLLIB=$ac_cv_search_dlopen;; + *) DLLIB="";; +esac + CHECK_ATOMIC_OPS dnl Checks for header files. @@ -241,6 +250,7 @@ AC_SUBST(PKG_MINOR) AC_SUBST(PKG_EXTRA) AC_SUBST(PKG_MAINTAINER) AC_SUBST(enable_cxx_exceptions) +AC_SUBST(DLLIB) AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh doc/Makefile doc/common.tex include/libunwind-common.h) diff --git a/tests/Makefile.am b/tests/Makefile.am index 401a6ec9..1dd331c1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -101,6 +101,6 @@ Gtest_concurrent_LDADD = $(LIBUNWIND) -lpthread test_async_sig_LDADD = $(LIBUNWIND) -lpthread rs_race_LDADD = $(LIBUNWIND) -lpthread -LDADD += -ldl +LDADD += @DLLIB@ Ltest_nomalloc_SOURCES = Ltest-nomalloc.c