Define and use DLOPEN_LIBS

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 380ad49d8ec55b2bcf67de97412108d8720c2d09..db30c0ef296d831cf3a8d789216d54d0f62eecbc 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -66,7 +66,7 @@ rpz_dnsrps_CPPFLAGS =         \
 rpz_dnsrps_LDADD =             \
        $(LDADD)                \
        $(LIBDNS_LIBS)          \
-       -ldl
+       $(DLOPEN_LIBS)
 
 TESTS =
 

diff --git a/bin/tests/system/rpz/testlib/Makefile.am b/bin/tests/system/rpz/testlib/Makefile.am
index ac66f688fabd10aef8fdd7885069629552c02e4a..6e32f9cf9835d16ca38244ac3c2486be6f372bd7 100644 (file)
--- a/bin/tests/system/rpz/testlib/Makefile.am
+++ b/bin/tests/system/rpz/testlib/Makefile.am
@@ -9,4 +9,4 @@ AM_CFLAGS += -Wall -pedantic
 check_LTLIBRARIES = libdummyrpz.la
 libdummyrpz_la_SOURCES= dummylib.c test-data.c trpz.h test-data.h
 libdummyrpz_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -rpath $(abs_builddir)
-LDADD += -lpthread -ldl
+LDADD += -lpthread $(DLOPEN_LIBS)

diff --git a/configure.ac b/configure.ac
index 255dfe10ddb57d9a5ad6dd5ff410d99135d2dc98..ab9d9f57da6a81a78537d779c564c21a8e1e47bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -108,9 +108,13 @@ AC_PROG_MKDIR_P
 # Initialize libtool
 LT_INIT([disable-static dlopen pic-only])
 
+DLOPEN_LIBS="$lt_cv_dlopen_libs"
+AC_SUBST(DLOPEN_LIBS)
+
 AS_IF([test "$enable_static" != "no" && test "$enable_developer" != "yes"],
       [AC_MSG_ERROR([Static linking is not supported as it disables dlopen() and certain security features (e.g. RELRO, ASLR)])])
 
+
 #
 # Set the default CFLAGS, CPPFLAGS, and LDFLAGS
 #