build: rename $(LIBDL) to $(DL_LIBS) and modify detection

4 files changed, 6 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index d82248e0ab..fd768a1c38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,8 +275,8 @@ LT_LIB_M
 dnl
 dnl Checks for libdl - on certain platforms its part of libc
 dnl
-AC_CHECK_LIB([dl], [dladdr], LIBDL="-ldl", LIBDL="")
-AC_SUBST(LIBDL)
+AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
+AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
 
 PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
 	[AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/tap-driver.sh')
diff --git a/libnm/Makefile.am b/libnm/Makefile.am
index 760682f0eb..ee64d4eb0c 100644
--- a/libnm/Makefile.am
+++ b/libnm/Makefile.am
@@ -137,7 +137,7 @@ GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\
 libnm_la_LIBADD = \
 	$(top_builddir)/libnm-core/libnm-core.la \
 	$(top_builddir)/introspection/libnmdbus.la \
-	$(LIBDL) \
+	$(DL_LIBS) \
 	$(GLIB_LIBS) \
 	$(UUID_LIBS) \
 	$(GUDEV_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index bc7ca33f3d..41c3169089 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -491,7 +491,7 @@ libNetworkManager_la_LIBADD = \
 	$(LIBNL_LIBS) \
 	$(SYSTEMD_LOGIN_LIBS) \
 	$(LIBNDP_LIBS) \
-	$(LIBDL) \
+	$(DL_LIBS) \
 	$(LIBM) \
 	$(SELINUX_LIBS) \
 	$(LIBAUDIT_LIBS)
@@ -597,7 +597,7 @@ libnm_iface_helper_la_LIBADD = \
 	$(GUDEV_LIBS) \
 	$(LIBNL_LIBS) \
 	$(LIBNDP_LIBS) \
-	$(LIBDL) \
+	$(DL_LIBS) \
 	$(LIBM)
 
 nm_iface_helper_SOURCES = \
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 1af3ea2ec8..3026dab442 100644
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -22,7 +22,7 @@ nm_pppd_plugin_la_LDFLAGS = -module -avoid-version
 
 nm_pppd_plugin_la_LIBADD = \
 	$(GLIB_LIBS) \
-	$(LIBDL) \
+	$(DL_LIBS) \
 	$(NULL)
 
 endif