From 6c34e74f1340a72ab7dce077e4d326f03989322c Mon Sep 17 00:00:00 2001
From: James Yonan <james@openvpn.net>
Date: Thu, 10 Mar 2011 00:04:39 +0000
Subject: Added --enable-lzo-stub configure option to build an OpenVPN client
 without LZO, but that has limited interoperability with LZO-enabled servers.

Modified "push-peer-info" option to push IV_LZO_STUB=1 to server when
client was built with --enable-lzo-stub configure option.  This tells
the server that the client lacks LZO capabilities, so the server
should turn off LZO compression for this client via "lzo no".

Added "setenv PUSH_PEER_INFO" option having the same effect as
"push-peer-info".

Version 2.1.3j

git-svn-id: http://svn.openvpn.net/projects/branches/BETA21@7023 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 configure.ac | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 5575705..729ce40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,12 @@ AC_ARG_ENABLE(lzo,
    [LZO="yes"]
 )
 
+AC_ARG_ENABLE(lzo-stub,
+   [  --enable-lzo-stub       Don't compile LZO compression support but still allow limited interoperability with LZO-enabled peers],
+   [LZO_STUB="$enableval"],
+   [LZO_STUB="no"]
+)
+
 AC_ARG_ENABLE(crypto,
    [  --disable-crypto        Disable OpenSSL crypto support],
    [CRYPTO="$enableval"],
@@ -657,7 +663,7 @@ dnl
 dnl check for LZO library
 dnl
 
-if test "$LZO" = "yes"; then
+if test "$LZO" = "yes" && test "$LZO_STUB" = "no"; then
    LZO_H=""
    AC_CHECKING([for LZO Library and Header files])
    AC_CHECK_HEADER(lzo/lzo1x.h,
@@ -687,10 +693,15 @@ if test "$LZO" = "yes"; then
    else
      AC_MSG_RESULT([LZO headers were not found])
      AC_MSG_RESULT([LZO library available from http://www.oberhumer.com/opensource/lzo/])
-     AC_MSG_ERROR([Or try ./configure --disable-lzo])
+     AC_MSG_ERROR([Or try ./configure --disable-lzo OR ./configure --enable-lzo-stub])
    fi
 fi
 
+dnl enable multi-client mode
+if test "$LZO_STUB" = "yes"; then
+   AC_DEFINE(LZO_STUB, 1, [Enable LZO stub capability])
+fi
+
 dnl
 dnl check for OpenSSL-crypto library
 dnl
-- 
cgit 


From e9f8696f3981fc493501082d996340c9021919c7 Mon Sep 17 00:00:00 2001
From: James Yonan <james@openvpn.net>
Date: Sun, 27 Mar 2011 09:20:13 +0000
Subject: Added ./configure --enable-osxipconfig option for Mac OS X which will
 enable the use of ipconfig (instead of ifconfig) for configuring the IP
 address and netmask of the tun/tap adapter.

Version 2.1.3p


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7092 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 configure.ac | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 729ce40..342074f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,11 @@ AC_ARG_ENABLE(iproute2,
    test $enableval = "yes" && AC_DEFINE(CONFIG_FEATURE_IPROUTE, 1, [enable iproute2 support])   
 )
 
+AC_ARG_ENABLE(osxipconfig,
+   [  --enable-osxipconfig    Enable support for ipconfig on OS X],
+   test $enableval = "yes" && AC_DEFINE(DARWIN_USE_IPCONFIG, 1, [Enable support for ipconfig on OS X])
+)
+
 AC_ARG_ENABLE(def-auth,
    [  --disable-def-auth      Disable deferred authentication],
    [DEF_AUTH="$enableval"],
-- 
cgit 


From cf906790a88cc4489fd4677aa6b9c5f6a7146488 Mon Sep 17 00:00:00 2001
From: James Yonan <james@openvpn.net>
Date: Tue, 19 Apr 2011 10:28:06 +0000
Subject: Revert r7092 and r7151, i.e. remove --enable-osxipconfig configure
 option.  ipconfig on Mac has certain behavior that makes it unsuitable for
 use by OpenVPN to configure tun/tap interface.

Version 2.1.3u


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7191 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 configure.ac | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 342074f..729ce40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,11 +176,6 @@ AC_ARG_ENABLE(iproute2,
    test $enableval = "yes" && AC_DEFINE(CONFIG_FEATURE_IPROUTE, 1, [enable iproute2 support])   
 )
 
-AC_ARG_ENABLE(osxipconfig,
-   [  --enable-osxipconfig    Enable support for ipconfig on OS X],
-   test $enableval = "yes" && AC_DEFINE(DARWIN_USE_IPCONFIG, 1, [Enable support for ipconfig on OS X])
-)
-
 AC_ARG_ENABLE(def-auth,
    [  --disable-def-auth      Disable deferred authentication],
    [DEF_AUTH="$enableval"],
-- 
cgit