---
Makefile.plugins | 18 ++++++++++++++++++
configure.ac | 14 ++++++++++++++
2 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/Makefile.plugins b/Makefile.plugins
index 23524df..4e33524 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -137,6 +137,24 @@ plugins_vpnc_la_LDFLAGS = $(plugin_ldflags)
endif
endif
+if L2TP
+if L2TP_BUILTIN
+builtin_modules += l2tp
+builtin_sources += plugins/l2tp.c
+builtin_vpn_sources = plugins/vpn.c plugins/vpn.h
+builtin_cflags += -DL2TP=\"@L2TP@\"
+else
+plugin_LTLIBRARIES += plugins/l2tp.la
+plugin_objects += $(plugins_l2tp_la_OBJECTS)
+plugins_l2tp_la_SOURCES = plugins/vpn.h plugins/vpn.c \
+ plugins/l2tp.c
+plugins_l2tp_la_CFLAGS = $(plugin_cflags) -DL2TP=\"@L2TP@\" \
+ -DSTATEDIR=\""$(statedir)"\" \
+ -DSCRIPTDIR=\""$(build_scriptdir)"\"
+plugins_l2tp_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
builtin_sources += $(builtin_vpn_sources)
if PORTAL
diff --git a/configure.ac b/configure.ac
index 0986045..075255c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,6 +112,20 @@ fi
AM_CONDITIONAL(OPENCONNECT, test "${enable_openconnect}" != "no")
AM_CONDITIONAL(OPENCONNECT_BUILTIN, test "${enable_openconnect}" = "builtin")
+AC_ARG_ENABLE(l2tp,
+ AC_HELP_STRING([--enable-l2tp], [enable l2tp support]),
+ [enable_l2tp=${enableval}], [enable_l2tp="no"])
+if (test "${enable_l2tp}" != "no"); then
+ if (test -z "${path_l2tp}"); then
+ AC_PATH_PROG(L2TP, [xl2tpd], [], $PATH:/sbin:/usr/sbin)
+ else
+ L2TP="${path_l2tp}"
+ AC_SUBST(L2TP)
+ fi
+fi
+AM_CONDITIONAL(L2TP, test "${enable_l2tp}" != "no")
+AM_CONDITIONAL(L2TP_BUILTIN, test "${enable_l2tp}" = "builtin")
+
AC_ARG_ENABLE(portal,
AC_HELP_STRING([--enable-portal], [enable portal detection support]),
[enable_portal=${enableval}], [enable_portal="no"])
--
1.7.1
_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman
