From 4c3d3fcb45d60653e475ab8ffd23240d7c3fcb4b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 22 Dec 2020 20:38:29 +0000
Subject: [PATCH] build-sys: Drop autoconf bits to find dbus service directory

We set it to the same value in both cases.  There's no reason
to require it at build time anyways.

Part of thinning out the Autotools side in prep for using Cargo.
---
 Makefile-daemon.am |  2 +-
 configure.ac       | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/Makefile-daemon.am b/Makefile-daemon.am
index eb6bc537..7050a751 100644
--- a/Makefile-daemon.am
+++ b/Makefile-daemon.am
@@ -87,7 +87,7 @@ rpm-ostreed: $(srcdir)/src/daemon/rpm-ostreed-stub.sh.in Makefile
 # We don't yet rename the DBus related items
 service_in_files = $(srcdir)/src/daemon/org.projectatomic.rpmostree1.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
-servicedir       = $(dbusservicedir)
+servicedir       = $(datadir)/dbus-1/system-services
 %.service: %.service.in Makefile
 	$(SED_SUBST) $@.in > $@.tmp && mv $@.tmp $@
 
diff --git a/configure.ac b/configure.ac
index 6a27c610..bd3e3d41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,19 +27,6 @@ dnl if not set, which we definitely want; cmake doesn't do that.
 AC_PROG_CXX
 AM_PROG_CC_C_O
 
-# dbus system dir
-AC_MSG_CHECKING(for dbus system services directory)
-if test "$enable_prefix_only" = "yes"; then
-  dbusservicedir='${datadir}/dbus-1/system-services'
-else
-  dbusservicedir='${datadir}/dbus-1/system-services'
-  if test "$dbusservicedir" = ""; then
-    AC_MSG_ERROR(Couldn't find dbus services directory. Try installing dbus-devel)
-  fi
-fi
-AC_SUBST([dbusservicedir], [$dbusservicedir])
-AC_MSG_RESULT(dbusservicedir)
-
 dnl Keep this in sync with the version in ostree
 AS_IF([echo "$CFLAGS" | grep -q -E -e '-Werror($| )'], [], [
 CC_CHECK_FLAGS_APPEND([WARN_CFLAGS], [CFLAGS], [\