added a configure option to select charon binary
authorMartin Willi <martin@strongswan.org>
Thu, 4 Sep 2008 08:37:31 +0000 (08:37 -0000)
committerMartin Willi <martin@strongswan.org>
Thu, 4 Sep 2008 08:37:31 +0000 (08:37 -0000)
src/charon/plugins/nm/gnome/Makefile.am
src/charon/plugins/nm/gnome/configure.in
src/charon/plugins/nm/gnome/nm-strongswan-service.name.in

index e3ad3f3..62d28e4 100644 (file)
@@ -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)  \
index bf3ef73..5bbcdcb 100644 (file)
@@ -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",[
index a2c6274..4120e55 100644 (file)
@@ -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