build: libdl is needed only for libnss_resolve

Not everything needs to link to libdl. dlopen+dlsym are used only by
libnss_resolve.

diff --git a/Makefile.am b/Makefile.am
index 8646e55450fb89005974226ed159707b2ec20732..c22394f0bf8df6922f79661d2a2e39c00ba1e1bd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -919,7 +919,6 @@ libbasic_la_CFLAGS = \
 libbasic_la_LIBADD = \
        $(SELINUX_LIBS) \
        $(CAP_LIBS) \
-       -ldl \
        -lrt \
        -lm
 
@@ -5148,7 +5147,8 @@ libnss_resolve_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
 
 libnss_resolve_la_LIBADD = \
-       libshared.la
+       libshared.la \
+        -ldl
 
 lib_LTLIBRARIES += \
        libnss_resolve.la

diff --git a/configure.ac b/configure.ac
index 4984c56f67e76a4d0822efc99ffb24ce0ddd72ed..903eedff142cfd84fe123720ba39ae53df03250e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -281,7 +281,6 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
 
 # ------------------------------------------------------------------------------
 
-AC_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([*** Dynamic linking loader library not found])])
 AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
 AC_CHECK_HEADERS([linux/btrfs.h], [], [])
 AC_CHECK_HEADERS([linux/memfd.h], [], [])
@@ -1099,10 +1098,12 @@ AM_CONDITIONAL(ENABLE_POLKIT, [test "x$have_polkit" = "xyes"])
 # ------------------------------------------------------------------------------
 have_resolved=no
 AC_ARG_ENABLE(resolved, AS_HELP_STRING([--disable-resolved], [disable resolve daemon]))
-if test "x$enable_resolved" != "xno"; then
+AS_IF([test "x$enable_resolved" != "xno"], [
+        AC_CHECK_LIB([dl], [dlsym], [true], [AC_MSG_ERROR([*** Dynamic linking loader library not found])])
+
         have_resolved=yes
         M4_DEFINES="$M4_DEFINES -DENABLE_RESOLVED"
-fi
+])
 AM_CONDITIONAL(ENABLE_RESOLVED, [test "$have_resolved" = "yes"])
 
 AC_ARG_WITH(dns-servers,