nm: Automatically determine path to the auth dialog

diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
index a101995b20a4c611e77e17fc97a0d0ea76dcafb9..2fc793ebe7d17bf784b492f84c9eb674ccdd5757 100644 (file)
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -14,7 +14,7 @@ appdata_in_files = NetworkManager-strongswan.appdata.xml.in
 
 nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
        $(AM_V_GEN) \
-       sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \
+       sed -e 's|[@]NM_LIBEXECDIR[@]|$(nm_libexecdir)|' \
            -e 's|[@]CHARON[@]|$(charon)|' $< >$@
 
 EXTRA_DIST = \

diff --git a/src/frontends/gnome/auth-dialog/Makefile.am b/src/frontends/gnome/auth-dialog/Makefile.am
index c91c6249c43a2823b2f807a80bfc72982ac376c8..9e30652065d81460e759e8f5ece1f37d260d3dd5 100644 (file)
--- a/src/frontends/gnome/auth-dialog/Makefile.am
+++ b/src/frontends/gnome/auth-dialog/Makefile.am
@@ -1,4 +1,4 @@
-libexec_PROGRAMS = nm-strongswan-auth-dialog
+nm_libexec_PROGRAMS = nm-strongswan-auth-dialog
 
 nm_strongswan_auth_dialog_CPPFLAGS = \
        $(GTHREAD_CFLAGS) \

diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac
index 047772d948251be7f1867c4ab1784a03c97348c6..13c3579110a053a748ec1b43c847e510b96b8ec0 100644 (file)
--- a/src/frontends/gnome/configure.ac
+++ b/src/frontends/gnome/configure.ac
@@ -14,6 +14,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
 
 dnl
 dnl Required headers
@@ -75,6 +76,8 @@ AC_ARG_WITH(
        [AC_SUBST(charon, "$withval")],
        [AC_SUBST(charon, "${libexecdir}/ipsec/charon-nm")]
 )
+nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager)
+AC_SUBST(nm_libexecdir)
 
 NM_COMPILER_WARNINGS
 

diff --git a/src/frontends/gnome/nm-strongswan-service.name.in b/src/frontends/gnome/nm-strongswan-service.name.in
index 4120e55ae780c635198fec783ffb78738042794a..ccba0b7b90942a717e7a64b34ca9722c278ed543 100644 (file)
--- a/src/frontends/gnome/nm-strongswan-service.name.in
+++ b/src/frontends/gnome/nm-strongswan-service.name.in
@@ -4,5 +4,5 @@ service=org.freedesktop.NetworkManager.strongswan
 program=@CHARON@
 
 [GNOME]
-auth-dialog=@LIBEXECDIR@/nm-strongswan-auth-dialog
+auth-dialog=@NM_LIBEXECDIR@/nm-strongswan-auth-dialog
 properties=libnm-strongswan-properties