From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 30 Jan 2023 18:51:34 +0000 (+0000)
Subject: configure: Tidy up dbus path detection
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ca8914ef2c65a669aa05e37f2dbe232f54ecbf1;p=network.git

configure: Tidy up dbus path detection

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/configure.ac b/configure.ac
index e612ff82..ba5967dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,17 +147,16 @@ AC_ARG_WITH(
 )
 AC_SUBST(dbuspolicydir)
 
-AC_ARG_WITH([dbussystembusdir], AS_HELP_STRING([--with-dbussystembusdir=DIR],
-		[path to D-Bus system bus services directory]), [with_dbussystembusdir=${withval}])
-if test -z "${with_dbussystembusdir}"; then
-	AC_MSG_CHECKING([D-Bus system bus services dir])
-	with_dbussystembusdir="$($PKG_CONFIG --variable=system_bus_services_dir dbus-1)"
-	if test -z "${with_dbussystembusdir}"; then
-		AC_MSG_ERROR([D-Bus system bus services directory is required])
-	fi
-	AC_MSG_RESULT([${with_dbussystembusdir}])
-fi
-AC_SUBST(dbussystembusdir, [${with_dbussystembusdir}])
+AC_ARG_WITH(
+	[dbussystembusdir],
+	AS_HELP_STRING(
+		[--with-dbussystembusdir=arg],
+		[path to D-Bus system bus services directory]
+	),
+	[dbussystembusdir="$withval"],
+	[PKG_CHECK_VAR([dbussystembusdir], [dbus-1], [system_bus_services_dir],, [dbussystembusdir="${datarootdir}"])]
+)
+AC_SUBST(dbuspolicydir)
 
 # ------------------------------------------------------------------------------
 AC_ARG_WITH([systemdsystemunitdir],
@@ -202,6 +201,7 @@ AC_MSG_RESULT([
 
 	prefix:               $prefix
 
+	dbuspolicydir:        ${dbuspolicydir}
 	dbussystembusdir:     ${dbussystembusdir}
 	systemdsystemunitdir: $systemdsystemunitdir
 	udevdir:              $udevdir