denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm: Automatically determine path to the auth dialog

Browse Source
This commit is contained in:
Lubomir Rintel
2016-09-05 15:28:54 +02:00
committed by Tobias Brunner
parent 1579779119
commit 97939530e0
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/gnome/Makefile.am
+1 -1
View File
@@ -14,7 +14,7 @@ appdata_in_files = NetworkManager-strongswan.appdata.xml.in
nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
$(AM_V_GEN) \ $(AM_V_GEN) \
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \ sed -e 's|[@]NM_LIBEXECDIR[@]|$(nm_libexecdir)|' \
-e 's|[@]CHARON[@]|$(charon)|' $< >$@ -e 's|[@]CHARON[@]|$(charon)|' $< >$@
EXTRA_DIST = \ EXTRA_DIST = \
src/frontends/gnome/auth-dialog/Makefile.am
+1 -1
View File
@@ -1,4 +1,4 @@
libexec_PROGRAMS = nm-strongswan-auth-dialog nm_libexec_PROGRAMS = nm-strongswan-auth-dialog
nm_strongswan_auth_dialog_CPPFLAGS = \ nm_strongswan_auth_dialog_CPPFLAGS = \
$(GTHREAD_CFLAGS) \ $(GTHREAD_CFLAGS) \
src/frontends/gnome/configure.ac
+3
View File
@@ -14,6 +14,7 @@ AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
dnl dnl
dnl Required headers dnl Required headers
@@ -75,6 +76,8 @@ AC_ARG_WITH(
[AC_SUBST(charon, "$withval")], [AC_SUBST(charon, "$withval")],
[AC_SUBST(charon, "${libexecdir}/ipsec/charon-nm")] [AC_SUBST(charon, "${libexecdir}/ipsec/charon-nm")]
) )
nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager)
AC_SUBST(nm_libexecdir)
NM_COMPILER_WARNINGS NM_COMPILER_WARNINGS
src/frontends/gnome/nm-strongswan-service.name.in
+1 -1
View File
@@ -4,5 +4,5 @@ service=org.freedesktop.NetworkManager.strongswan
program=@CHARON@ program=@CHARON@
[GNOME] [GNOME]
auth-dialog=@LIBEXECDIR@/nm-strongswan-auth-dialog auth-dialog=@NM_LIBEXECDIR@/nm-strongswan-auth-dialog
properties=libnm-strongswan-properties properties=libnm-strongswan-properties