diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-13 13:24:13 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-13 13:24:13 +0200 |
| commit | 69b10487fcd63dfe1e94fa97c9f3fd9b035646b4 (patch) | |
| tree | d4960893a4444634d404c7fbe4fa3e8778d30179 /app/openvpn/config.h | |
| parent | 9f6cfff38ae87922adc022300e1e2fd1c0d4c3e4 (diff) | |
| parent | e45929e220fe49e30235a1d4d36c1a413547f8bf (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/openvpn/config.h')
| -rw-r--r-- | app/openvpn/config.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/app/openvpn/config.h b/app/openvpn/config.h index 0d86c1d9..b825e2bd 100644 --- a/app/openvpn/config.h +++ b/app/openvpn/config.h @@ -450,13 +450,13 @@ #define PACKAGE_NAME "OpenVPN" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "OpenVPN 2.3_rc1+dspatch3" +#define PACKAGE_STRING "OpenVPN 2.4-icsopenvpn" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "openvpn" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.3_beta1" +#define PACKAGE_VERSION "2.4_master" /* Define to the necessary symbol if this constant uses a non-standard name on your system. */ @@ -539,6 +539,9 @@ /* Use LZO compression library */ #define ENABLE_LZO 1 +#define ENABLE_SNAPPY 1 +#define ENABLE_LZ4 1 +#define NEED_COMPAT_LZ4 1 /* Enable PKCS11 capability */ /* #undef USE_PKCS11 */ @@ -550,13 +553,16 @@ #define ENABLE_SSL 1 #define USE_SSL 1 #define ENABLE_CRYPTO 1 -#define ENABLE_CRYPTO_OPENSSL 1 + +/* via android.mk */ +/*#define ENABLE_CRYPTO_OPENSSL 1*/ +/* #define ENABLE_CRYPTO_POLARSSL 1 */ /* Use valgrind memory debugging library */ /* #undef USE_VALGRIND */ /* Version number of package */ -#define VERSION "2.1.4" +#define VERSION "2.3.1" /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE @@ -616,3 +622,12 @@ #define HAVE_LZO_LZO1X_H 1 #define HAVE_SYS_TIME_H 1 #define HAVE_TIME_H 1 +#define HAVE_CONFIG_VERSION_H 1 +#define PATH_SEPARATOR_STR "/" +#define HAVE_SA_FAMILY_T 1 + + +// Workaround for bionc +#define IPPROTO_IP IPPROTO_IP +#define IPPROTO_TCP IPPROTO_TCP + |