fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-23 10:50:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Thomas Haller 2016-08-15 17:23:41 +02:00
parent 2a163c1825
commit 1f2eeb85d8
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -275,8 +275,8 @@ LT_LIB_M
dnl dnl
dnl Checks for libdl - on certain platforms its part of libc dnl Checks for libdl - on certain platforms its part of libc
dnl dnl
AC_CHECK_LIB([dl], [dladdr], LIBDL="-ldl", LIBDL="") AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
AC_SUBST(LIBDL) AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], 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') [AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/tap-driver.sh')

2
libnm/Makefile.am
View file

@ -137,7 +137,7 @@ GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\
libnm_la_LIBADD = \ libnm_la_LIBADD = \
$(top_builddir)/libnm-core/libnm-core.la \ $(top_builddir)/libnm-core/libnm-core.la \
$(top_builddir)/introspection/libnmdbus.la \ $(top_builddir)/introspection/libnmdbus.la \
$(LIBDL) \ $(DL_LIBS) \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(UUID_LIBS) \ $(UUID_LIBS) \
$(GUDEV_LIBS) $(GUDEV_LIBS)

4
src/Makefile.am
View file

@ -491,7 +491,7 @@ libNetworkManager_la_LIBADD = \
$(LIBNL_LIBS) \ $(LIBNL_LIBS) \
$(SYSTEMD_LOGIN_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \
$(LIBNDP_LIBS) \ $(LIBNDP_LIBS) \
$(LIBDL) \ $(DL_LIBS) \
$(LIBM) \ $(LIBM) \
$(SELINUX_LIBS) \ $(SELINUX_LIBS) \
$(LIBAUDIT_LIBS) $(LIBAUDIT_LIBS)
@ -597,7 +597,7 @@ libnm_iface_helper_la_LIBADD = \
$(GUDEV_LIBS) \ $(GUDEV_LIBS) \
$(LIBNL_LIBS) \ $(LIBNL_LIBS) \
$(LIBNDP_LIBS) \ $(LIBNDP_LIBS) \
$(LIBDL) \ $(DL_LIBS) \
$(LIBM) $(LIBM)
nm_iface_helper_SOURCES = \ nm_iface_helper_SOURCES = \

2
src/ppp-manager/Makefile.am
View file

@ -22,7 +22,7 @@ nm_pppd_plugin_la_LDFLAGS = -module -avoid-version
nm_pppd_plugin_la_LIBADD = \ nm_pppd_plugin_la_LIBADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(LIBDL) \ $(DL_LIBS) \
$(NULL) $(NULL)
endif endif