From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 13 Feb 2020 16:53:17 +0000 (+0100)
Subject: charon-nm: Use better default directory for D-Bus policy file
X-Git-Tag: 5.8.3dr1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfed3a87ee2072c772b0a18b2aac865590d1df4e;p=thirdparty%2Fstrongswan.git

charon-nm: Use better default directory for D-Bus policy file

Also makes it configurable via configure script.  Depending on `$datadir` is
not ideal as package maintainers might set that to a custom value.  Depending
on `$datarootdir` might have been better, the default if pkg-config fails is
now based on that.

References #3339.
---

diff --git a/configure.ac b/configure.ac
index b0d5fcb8c7..2836a500e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,15 @@ fi
 ARG_WITH_SET([systemdsystemunitdir], [$systemdsystemunitdir_default], [directory for systemd service files])
 AC_SUBST(systemdsystemunitdir)
 
+AC_ARG_WITH(
+	[dbuspolicydir],
+	AS_HELP_STRING([--with-dbuspolicydir=arg],[directory for D-Bus policies (default: ${dbusdatadir|datarootdir}/dbus-1/system.d)]),
+	[dbuspolicydir="$withval"],
+	[PKG_CHECK_VAR([dbusdatadir], [dbus-1], [datadir], , [dbusdatadir="${datarootdir}"])
+	 dbuspolicydir="${dbusdatadir}/dbus-1/system.d"]
+)
+AC_SUBST(dbuspolicydir)
+
 AC_ARG_WITH(
 	[user],
 	AS_HELP_STRING([--with-user=user],[change user of the daemons to "user" after startup (default is "root").]),
@@ -1192,6 +1201,13 @@ if test x$nm = xtrue; then
 	PKG_CHECK_MODULES(nm, [gthread-2.0 libnm])
 	AC_SUBST(nm_CFLAGS)
 	AC_SUBST(nm_LIBS)
+
+	AC_MSG_CHECKING([for D-Bus policy directory])
+	if test -n "$dbuspolicydir" -a "x$dbuspolicydir" != xno; then
+		AC_MSG_RESULT([$dbuspolicydir])
+	else
+		AC_MSG_ERROR([not found (try --with-dbuspolicydir)])
+	fi
 fi
 
 if test x$xauth_pam = xtrue; then
diff --git a/src/charon-nm/Makefile.am b/src/charon-nm/Makefile.am
index 2e0ab958cc..56526bde66 100644
--- a/src/charon-nm/Makefile.am
+++ b/src/charon-nm/Makefile.am
@@ -23,7 +23,6 @@ charon_nm_LDADD = \
 	$(top_builddir)/src/libcharon/libcharon.la \
 	-lm $(PTHREADLIB) $(ATOMICLIB) $(DLLIB) ${nm_LIBS}
 
-dbusservicedir = $(datadir)/dbus-1/system.d
-dbusservice_DATA = nm-strongswan-service.conf
+dbuspolicy_DATA = nm-strongswan-service.conf
 
-EXTRA_DIST = $(dbusservice_DATA)
+EXTRA_DIST = $(dbuspolicy_DATA)