--- openl2tp-1.8/Makefile.orig	2018-03-17 14:24:57.000000000 +0300
+++ openl2tp-1.8/Makefile	2018-03-17 14:46:34.769800757 +0300
@@ -1,26 +1,26 @@
 # BEGIN CONFIGURABLE SETTINGS
 
 # Compile-time features
-L2TP_FEATURE_LAC_SUPPORT=	y
-L2TP_FEATURE_LNS_SUPPORT=	y
-L2TP_FEATURE_RPC_MANAGEMENT=	y
-L2TP_FEATURE_LAIC_SUPPORT=	y
-L2TP_FEATURE_LAOC_SUPPORT=	y
-L2TP_FEATURE_LNIC_SUPPORT=	y
-L2TP_FEATURE_LNOC_SUPPORT=	y
+L2TP_FEATURE_LAC_SUPPORT ?=	y
+L2TP_FEATURE_LNS_SUPPORT ?=	y
+L2TP_FEATURE_RPC_MANAGEMENT ?=	y
+L2TP_FEATURE_LAIC_SUPPORT ?=	y
+L2TP_FEATURE_LAOC_SUPPORT ?=	y
+L2TP_FEATURE_LNIC_SUPPORT ?=	y
+L2TP_FEATURE_LNOC_SUPPORT ?=	y
 L2TP_FEATURE_LOCAL_CONF_FILE=	y
-#L2TP_FEATURE_LOCAL_STAT_FILE=	y
+L2TP_FEATURE_LOCAL_STAT_FILE ?=	n
 
 # Define USE_DMALLOC to enable dmalloc memory debugging
-# USE_DMALLOC=		y
+USE_DMALLOC ?=		n
 
 # Define to include test code. This must be defined to run the
 # regression tests
-# L2TP_TEST=		y
+L2TP_TEST ?=		n
 
 # Define to compile in debug code. Also makes default trace flags
 # enable all messages
-# L2TP_DEBUG=		y
+L2TP_DEBUG ?=		n
 
 # Use asynchronous RPC requests where appropriate
 # Affects only L2TP-PPP-IPPOOL interfaces, not management interfaces.
@@ -99,12 +99,14 @@
 
 # Build pppd dir only if ppp version is earlier than 2.4.5 since the
 # openl2tp plugins were integrated in ppp-2.4.5.
-PPPD_SUBDIR=pppd
-ifeq ($(PPPD_VERSION),2.4.5)
 PPPD_SUBDIR=
+
+TEST=
+ifeq ($(L2TP_TEST),y)
+TEST=test
 endif
 
-SUBDIRS=		usl cli plugins $(PPPD_SUBDIR) test doc
+SUBDIRS=		usl cli plugins $(PPPD_SUBDIR) $(TEST) doc
 
 .PHONY:			$(SUBDIRS:%=subdir-%)