From 994ed353125e711472702c3bc9e1f744328f62bf Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 4 Sep 2008 08:37:31 +0000 Subject: [PATCH] added a configure option to select charon binary --- src/charon/plugins/nm/gnome/Makefile.am | 3 ++- src/charon/plugins/nm/gnome/configure.in | 7 +++++++ src/charon/plugins/nm/gnome/nm-strongswan-service.name.in | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/charon/plugins/nm/gnome/Makefile.am b/src/charon/plugins/nm/gnome/Makefile.am index e3ad3f385..62d28e438 100644 --- a/src/charon/plugins/nm/gnome/Makefile.am +++ b/src/charon/plugins/nm/gnome/Makefile.am @@ -11,7 +11,8 @@ nmvpnservice_DATA = nm-strongswan-service.name @INTLTOOL_DESKTOP_RULE@ nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in - sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@ + sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \ + -e 's|[@]CHARON[@]|$(charon)|' $< >$@ EXTRA_DIST = nm-strongswan-service.name.in \ $(dbusservice_DATA) \ diff --git a/src/charon/plugins/nm/gnome/configure.in b/src/charon/plugins/nm/gnome/configure.in index bf3ef7352..5bbcdcbad 100644 --- a/src/charon/plugins/nm/gnome/configure.in +++ b/src/charon/plugins/nm/gnome/configure.in @@ -80,6 +80,13 @@ PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.7.0 libnm-util libnm_glib libnm_ AC_SUBST(NM_UTILS_CFLAGS) AC_SUBST(NM_UTILS_LIBS) +AC_ARG_WITH( + [charon], + AS_HELP_STRING([--with-charon=file],[path to the strongSwan IKEv2 daemon charon"]), + [AC_SUBST(charon, "$withval")], + [AC_SUBST(charon, "${libexecdir}/ipsec/charon")] +) + AC_ARG_ENABLE(more-warnings, AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), set_more_warnings="$enableval",[ diff --git a/src/charon/plugins/nm/gnome/nm-strongswan-service.name.in b/src/charon/plugins/nm/gnome/nm-strongswan-service.name.in index a2c627484..4120e55ae 100644 --- a/src/charon/plugins/nm/gnome/nm-strongswan-service.name.in +++ b/src/charon/plugins/nm/gnome/nm-strongswan-service.name.in @@ -1,7 +1,7 @@ [VPN Connection] name=strongswan service=org.freedesktop.NetworkManager.strongswan -program=/usr/lib/ipsec/charon +program=@CHARON@ [GNOME] auth-dialog=@LIBEXECDIR@/nm-strongswan-auth-dialog