fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 20:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: don't install nm-dhcp-helper dbus permissions if we don't need to

Browse source 
The DHCP helper uses a private socket when building with dbus-glib >= 0.100,
which means we don't need to install a D-Bus permissions file.
This commit is contained in:
Dan Williams 2013-05-14 10:14:43 -05:00
parent 408cafc889
commit b9ea3ed1b1
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -208,6 +208,7 @@ if (test "${have_dbus_glib_100}" = "yes"); then
else
AC_DEFINE(HAVE_DBUS_GLIB_100, 0, [Define if you have dbus-glib >= 0.100])
fi
AM_CONDITIONAL(HAVE_DBUS_GLIB_100, test "${have_dbus_glib_100}" = "yes")
PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.32 gmodule-2.0)

8
src/dhcp-manager/Makefile.am
View file

@ -8,8 +8,12 @@ nm_dhcp_helper_LDADD = $(DBUS_LIBS)
# FIXME: remove when dbus-glib >= 0.100 is required
dhcp_helper_conf = nm-dhcp-helper.conf
if !HAVE_DBUS_GLIB_100
dbusservicedir = $(DBUS_SYS_DIR)
dbusservice_DATA = nm-dhcp-helper.conf
dbusservice_DATA = $(dhcp_helper_conf)
endif
EXTRA_DIST = $(dbusservice_DATA)
EXTRA_DIST = $(dhcp_helper_conf)