From 429bb32763f89c4a4e7e6e7c911900b2a78019ce Mon Sep 17 00:00:00 2001
From: Chris Lamberson <clamberson@gmail.com>
Date: Thu, 18 Feb 2016 13:13:36 -0800
Subject: [PATCH] changes D-BUS probe style

---
 Makefile.am      |  2 +-
 configure.ac     | 21 ++++++++++++++++++---
 data/Makefile.am |  6 +++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 58e7777..b54cb06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 AM_MAKEFLAGS = --no-print-directory
-DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) --with-sessionbusservicesdir=$$dc_install_base/$(sessionbusservicesdir)
 SUBDIRS = gst-sdr-j-fm src data
 EXTRA_DIST = Doxyfile
 
diff --git a/configure.ac b/configure.ac
index 1c963d0..7a7a759 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,8 +27,9 @@ PKG_CHECK_MODULES([SNDFILE], [sndfile])
 PKG_CHECK_MODULES([USB], [libusb-1.0])
 
 PKG_PROG_PKG_CONFIG
+
 AC_ARG_WITH([systemdsystemunitdir],
-  [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],
+  [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd unit files])],
   [],
   [with_systemdsystemunitdir=auto])
 AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"],
@@ -39,10 +40,24 @@ AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitd
     with_systemdsystemunitdir=no],
    [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
 AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
-  [AC_SUBST([unitdir], [$with_systemdsystemunitdir])
-   AC_SUBST([servicedir], [`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`])])
+  [AC_SUBST([unitdir], [$with_systemdsystemunitdir])])
 AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
 
+AC_ARG_WITH([sessionbusservicesdir],
+  [AS_HELP_STRING([--with-sessionbusservicesdir=DIR], [Directory for D-BUS service files])],
+  [],
+  [with_sessionbusservicesdir=auto])
+AS_IF([test "x$with_sessionbusservicesdir" = "xyes" -o "x$with_sessionbusservicesdir" = "xauto"],
+  [def_sessionbusservicesdir=$($PKG_CONFIG --variable=session_bus_services_dir systemd)
+   AS_IF([test "x$def_sessionbusservicesdir" = "x"],
+   [AS_IF([test "x$with_sessionbusservicesdir" = "xyes"],
+          [AC_MSG_ERROR([D-BUS support requested but pkg-config unable to query dbus-1 package])])
+    with_sessionbusservicesdir=no],
+   [with_sessionbusservicesdir="$def_sessionbusservicesdir"])])
+AS_IF([test "x$with_sessionbusservicesdir" != "xno"],
+  [AC_SUBST([servicedir], [$with_sessionbusservicesdir])])
+AM_CONDITIONAL([HAVE_DBUS], [test "x$with_sessionbusservicesdir" != "xno"])
+
 ## -------------------- ##
 ## Weird Collabra stuff ##
 ## -------------------- ##
diff --git a/data/Makefile.am b/data/Makefile.am
index a6f8ae4..7b4a734 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,8 +3,12 @@ CLEANFILES =
 
 if HAVE_SYSTEMD
 unit_DATA = fmradioservice.service
+CLEANFILES += $(unit_DATA)
+endif
+
+if HAVE_DBUS
 service_DATA = com.jlr.fmradioservice.service
-CLEANFILES += $(unit_DATA) $(service_DATA)
+CLEANFILES += $(service_DATA)
 endif
 
 fmradioservice.service: fmradioservice.service.in