nm: Move the D-Bus policy to charon-nm

It's needed for useful use of charon-nm, unlike the GUI.

diff --git a/src/charon-nm/Makefile.am b/src/charon-nm/Makefile.am
index 6ab7f27c576bab58a22c68a9f81972517cb0664d..5c1591bab77662d4ae3f3392a597def03287c5f1 100644 (file)
--- a/src/charon-nm/Makefile.am
+++ b/src/charon-nm/Makefile.am
@@ -22,3 +22,6 @@ charon_nm_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
        $(top_builddir)/src/libcharon/libcharon.la \
        -lm $(PTHREADLIB) $(ATOMICLIB) $(DLLIB) ${nm_LIBS}
+
+dbusservicedir = $(sysconfdir)/dbus-1/system.d
+dbusservice_DATA = nm-strongswan-service.conf

diff --git a/src/frontends/gnome/nm-strongswan-service.conf b/src/charon-nm/nm-strongswan-service.conf
similarity index 100%
rename from src/frontends/gnome/nm-strongswan-service.conf
rename to src/charon-nm/nm-strongswan-service.conf

diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
index 6ea29e0b495f0733f7447a3a73609f7b444fc524..a101995b20a4c611e77e17fc97a0d0ea76dcafb9 100644 (file)
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -2,9 +2,6 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = properties auth-dialog po
 
-dbusservicedir = $(sysconfdir)/dbus-1/system.d
-dbusservice_DATA = nm-strongswan-service.conf
-
 nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
 nmvpnservice_DATA = nm-strongswan-service.name
 
@@ -20,8 +17,8 @@ nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
        sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \
            -e 's|[@]CHARON[@]|$(charon)|' $< >$@
 
-EXTRA_DIST = nm-strongswan-service.name.in \
-    $(dbusservice_DATA)  \
+EXTRA_DIST = \
+    nm-strongswan-service.name.in  \
     $(appdata_in_files)  \
     $(appdata_DATA)      \
     intltool-extract.in  \