diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-04-23 10:51:43 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-09-05 15:28:54 +0200 |
| commit | 97939530e028cae15b723b3fe023a16208788173 (patch) | |
| tree | d932247662dcb4d6c6508416c8352c427cefd002 | |
| parent | 15797791199a325977fb6b6108175c6bb086c7da (diff) | |
| download | strongswan-97939530e028cae15b723b3fe023a16208788173.tar.bz2 strongswan-97939530e028cae15b723b3fe023a16208788173.tar.xz | |
nm: Automatically determine path to the auth dialog
| -rw-r--r-- | src/frontends/gnome/Makefile.am | 2 | ||||
| -rw-r--r-- | src/frontends/gnome/auth-dialog/Makefile.am | 2 | ||||
| -rw-r--r-- | src/frontends/gnome/configure.ac | 3 | ||||
| -rw-r--r-- | src/frontends/gnome/nm-strongswan-service.name.in | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am index a101995b2..2fc793ebe 100644 --- 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 c91c6249c..9e3065206 100644 --- 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 047772d94..13c357911 100644 --- 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 4120e55ae..ccba0b7b9 100644 --- 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 |