package/openvpn/openvpn-2.x-01-minilzo.patch

   1 diff -rdup openvpn-2.0.9.orig/configure openvpn-2.0.9/configure
   2 --- openvpn-2.0.9.orig/configure        2006-10-01 14:18:24.000000000 +0200
   3 +++ openvpn-2.0.9/configure     2006-10-01 14:18:24.000000000 +0200
   4 @@ -9620,9 +9620,9 @@ fi
   5       havelzolib=0
   6       for i in $lzolibs ; do
   7         if test $havelzolib = 1 ; then break ; fi
   8 -       as_ac_Lib=`echo "ac_cv_lib_$i''_lzo1x_1_15_compress" | $as_tr_sh`
   9 -echo "$as_me:$LINENO: checking for lzo1x_1_15_compress in -l$i" >&5
  10 -echo $ECHO_N "checking for lzo1x_1_15_compress in -l$i... $ECHO_C" >&6
  11 +       as_ac_Lib=`echo "ac_cv_lib_$i''_lzo1x_1_compress" | $as_tr_sh`
  12 +echo "$as_me:$LINENO: checking for lzo1x_1_compress in -l$i" >&5
  13 +echo $ECHO_N "checking for lzo1x_1_compress in -l$i... $ECHO_C" >&6
  14  if eval "test \"\${$as_ac_Lib+set}\" = set"; then
  15    echo $ECHO_N "(cached) $ECHO_C" >&6
  16  else
  17 @@ -9641,11 +9641,11 @@ extern "C"
  18  #endif
  19  /* We use char because int might match the return type of a gcc2
  20     builtin and then its argument prototype would still apply.  */
  21 -char lzo1x_1_15_compress ();
  22 +char lzo1x_1_compress ();
  23  int
  24  main ()
  25  {
  26 -lzo1x_1_15_compress ();
  27 +lzo1x_1_compress ();
  28    ;
  29    return 0;
  30  }
  31 diff -rdup openvpn-2.0.9.orig/configure.ac openvpn-2.0.9/configure.ac
  32 --- openvpn-2.0.9.orig/configure.ac     2006-10-01 14:18:15.000000000 +0200
  33 +++ openvpn-2.0.9/configure.ac  2006-10-01 14:18:15.000000000 +0200
  34 @@ -485,7 +485,7 @@ if test "$LZO" = "yes"; then
  35       havelzolib=0
  36       for i in $lzolibs ; do
  37         if test $havelzolib = 1 ; then break ; fi
  38 -       AC_CHECK_LIB($i, lzo1x_1_15_compress,
  39 +       AC_CHECK_LIB($i, lzo1x_1_compress,
  40            [
  41             OPENVPN_ADD_LIBS(-l$i)
  42             AC_DEFINE(USE_LZO, 1, [Use LZO compression library])
  43
  44 --- openvpn-2.0.9.orig/lzo.h    2005-11-01 12:06:10.000000000 +0100
  45 +++ openvpn-2.0.9/lzo.h 2005-11-01 12:06:10.000000000 +0100
  46 @@ -25,11 +25,15 @@
  47  #ifdef USE_LZO
  48
  49  #ifdef LZO_HEADER_DIR
  50 -#include "lzo/lzoutil.h"
  51  #include "lzo/lzo1x.h"
  52 +#ifndef MINILZO_VERSION
  53 +#include "lzo/lzoutil.h"
  54 +#endif
  55  #else
  56 -#include "lzoutil.h"
  57  #include "lzo1x.h"
  58 +#ifndef MINILZO_VERSION
  59 +#include "lzoutil.h"
  60 +#endif
  61  #endif
  62
  63  #include "buffer.h"