diff --git a/configure.ac b/configure.ac index b0d5fcb8c..2836a500e 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 2e0ab958c..56526bde6 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)