diff options
| author | Alon Bar-Lev <alon.barlev@gmail.com> | 2012-02-29 22:12:09 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-03-22 22:17:27 +0100 |
| commit | 74bbc71b75bac49f5c9df81827fa184b8a365d36 (patch) | |
| tree | bf38c0d91a2bc9eb9ac2fc7abdc7b1ab98ad0d43 /src/openvpn/options.c | |
| parent | 0708426170fd578f598fb0f0d3df78bd1fca7117 (diff) | |
| download | openvpn-74bbc71b75bac49f5c9df81827fa184b8a365d36.tar.gz openvpn-74bbc71b75bac49f5c9df81827fa184b8a365d36.tar.xz openvpn-74bbc71b75bac49f5c9df81827fa184b8a365d36.zip | |
build: proper lzo detection and usage
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'src/openvpn/options.c')
| -rw-r--r-- | src/openvpn/options.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 4e95b83..12f46c7 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -75,8 +75,12 @@ const char title_string[] = #endif /* defined(USE_POLARSSL) */ #endif /* USE_SSL */ #endif /* USE_CRYPTO */ -#ifdef USE_LZO - " [LZO" LZO_VERSION_NUM "]" +#ifdef ENABLE_LZO +#ifdef ENABLE_LZO_STUB + " [LZO (STUB)]" +#else + " [LZO]" +#endif #endif #if EPOLL " [EPOLL]" @@ -354,7 +358,7 @@ static const char usage_message[] = #ifdef ENABLE_DEBUG "--gremlin mask : Special stress testing mode (for debugging only).\n" #endif -#ifdef USE_LZO +#ifdef ENABLE_LZO "--comp-lzo : Use fast LZO compression -- may add up to 1 byte per\n" " packet for uncompressible data.\n" "--comp-noadapt : Don't use adaptive compression when --comp-lzo\n" @@ -1512,7 +1516,7 @@ show_settings (const struct options *o) SHOW_BOOL (fast_io); -#ifdef USE_LZO +#ifdef ENABLE_LZO SHOW_INT (lzo); #endif @@ -2954,7 +2958,7 @@ options_string (const struct options *o, tt = NULL; } -#ifdef USE_LZO +#ifdef ENABLE_LZO if (o->lzo & LZO_SELECTED) buf_printf (&out, ",comp-lzo"); #endif @@ -6180,7 +6184,7 @@ add_option (struct options *options, options->passtos = true; } #endif -#ifdef USE_LZO +#ifdef ENABLE_LZO else if (streq (p[0], "comp-lzo")) { VERIFY_PERMISSION (OPT_P_COMP); @@ -6206,7 +6210,7 @@ add_option (struct options *options, VERIFY_PERMISSION (OPT_P_COMP); options->lzo &= ~LZO_ADAPTIVE; } -#endif /* USE_LZO */ +#endif /* ENABLE_LZO */ #ifdef USE_CRYPTO else if (streq (p[0], "show-ciphers")) { |