Permalink
Browse files

Changed USE_KERNEL26 to USE_NETKEY and rewrote the comment lines arou…

…nd it

to be a little clearer about what this is.
(cherry picked from commit e07d007)
  • Loading branch information...
1 parent 657b743 commit 2ebf9a567cb041411ed4bfc88c6956d494d83424 @letoams letoams committed with Ken Bantoft Nov 28, 2007
View
@@ -287,7 +287,7 @@ USE_IKEPING?=true
# using TXT instead of KEY records. See references to 'Flag Day'
USE_KEYRR?=true
-# include support for 2.4 KLIPS and 2.6 KLIPS in pluto
+# include support for Linux 2.4 and 2.6 KLIPS kernel level IPsec support for pluto
USE_KLIPS?=true
# KLIPS needs PFKEYv2, but sometimes we want PFKEY without KLIPS
@@ -299,8 +299,8 @@ USE_MAST?=false
# MAST is generally a prerequisite for SAREF support in applications
USE_SAREF_KERNEL=false
-# include support for NETKEY 2.5/2.6 IPsec in pluto (aka "native", "kame")
-USE_KERNEL26?=true
+# include support for Linux NETKEY (XFRM) kernel level IPsec support for pluto (aka "native", "kame")
+USE_NETKEY?=true
# include support for sending Openswan Vendor IDs
USE_VENDORID?=true
View
@@ -102,7 +102,7 @@ endif
# USE_ variables determine if features are compiled into Openswan.
# export them so that "make env" can get at them
export USE_LWRES USE_IPROUTE2 USE_IPSECPOLICY USE_IKEPING
-export USE_KEYRR USE_KLIPS USE_KERNEL26 USE_VENDORID
+export USE_KEYRR USE_KLIPS USE_NETKEY USE_VENDORID
export USE_HWRANDOM USE_AGGRESSIVE USE_XAUTH USE_XAUTHPAM
export USE_NAT_TRAVERSAL USE_NAT_TRAVERSAL_TRANSPORT_MODE USE_LDAP
export USE_LIBCURL USE_SMARTCARD USE_OE
@@ -14,7 +14,7 @@ TCLINC=-I/0g/sandboxes/cygwin/tcl/include
PORTINCLUDE+=-I${OPENSWANSRCDIR}/ports/win2k/include
USE_KLIPS=false
-USE_KERNEL26=false
+USE_NETKEY=false
USE_WIN2K=true
BUILD_KLIPS=false
@@ -9,7 +9,7 @@ TCLLIB=/usr/local/tcl8.3/lib/libtcl83s.a
TCLINC=-I/usr/local/tcl8.3/include -DSTATIC_BUILD #-DUSE_TCL_STUBS
USE_KLIPS=false
-USE_KERNEL26=false
+USE_NETKEY=false
USE_WIN2K=true
BUILD_KLIPS=false
@@ -4,7 +4,7 @@ PORTINCLUDE+=-g -O3 -I/opt/local/include -L/opt/local/lib
USERLINK=-L/usr/local/lib
USE_KLIPS=false
-USE_KERNEL26=false
+USE_NETKEY=false
USE_WIN2K=false
BUILD_KLIPS=false
USE_YACC=true
@@ -15,7 +15,7 @@ USERLINK=-mcygwin -nostdlib ${CYGWINDIR}/lib/crt0.o
USERLINK+=-L${CYGWINDIR}/lib -lcygwin ${LIBGCC}
USE_KLIPS=false
-USE_KERNEL26=false
+USE_NETKEY=false
USE_WIN2K=true
BUILD_KLIPS=false
@@ -117,7 +117,7 @@ KEYRR_DEFINES=-DUSE_KEYRR
endif
NETKEY_DIST_SRCS=kernel_netlink.c kernel_netlink.h
-ifeq ($(USE_KERNEL26),true)
+ifeq ($(USE_NETKEY),true)
NETKEY_DEFS=-DNETKEY_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES
NETKEY_SRCS=${NETKEY_DIST_SRCS}
NETKEY_OBJS=kernel_netlink.o

0 comments on commit 2ebf9a5

Please sign in to comment.