From b9ea3ed1b1214942b99306bfb804722e06173ee4 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Tue, 14 May 2013 10:14:43 -0500
Subject: [PATCH] build: don't install nm-dhcp-helper dbus permissions if we
 don't need to

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.
---
 configure.ac                 | 1 +
 src/dhcp-manager/Makefile.am | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 61fe58e2d7..43e420faf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
 
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index 000e5ca58c..6844140df1 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -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)