Fix LZO 1.x vs 2.x header file #include mess.

diff --git a/configure.in b/configure.in
index 6b072603f4488ee9b8a033fa4d46924891fcd4e6..ce72b0095fe273b6bc6557f3faffa6f7104dda0e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -444,6 +444,12 @@ if test x$use_lzo = xyes; then
   fi
   AC_SUBST(LZO_LIBS)
 
+  if test "$LZO_LIBS" = "-llzo"; then
+    AC_CHECK_HEADERS(lzo1x.h)
+  elif test "$LZO_LIBS" = "-llzo2"; then
+    AC_CHECK_HEADERS(lzo/lzo1x.h)
+  fi
+
   if test "$minilzo_enabled" = "yes"; then
     AC_DEFINE(USE_MINILZO, 1, [whether to use the included minilzo])
   fi

diff --git a/lib/gnutls_compress_int.c b/lib/gnutls_compress_int.c
index 0925048800df78dfe34db3df548b1d79a22b5634..f06e09bc1a31bf17220476543b7c6636cffc4cb1 100644 (file)
--- a/lib/gnutls_compress_int.c
+++ b/lib/gnutls_compress_int.c
@@ -34,7 +34,9 @@
  * can be used.
  */
 #  include "../libextra/minilzo/minilzo.h"
-# else
+# elif HAVE_LZO_LZO1X_H
+#  include <lzo/lzo1x.h>
+# elif HAVE_LZO1X_H
 #  include <lzo1x.h>
 # endif
 

diff --git a/libextra/gnutls_extra.c b/libextra/gnutls_extra.c
index 42752b5039cb0b711c5d23f4d1074ca45104f52c..ebbec9bd36129b990c89701605bfbad2eb3e7988 100644 (file)
--- a/libextra/gnutls_extra.c
+++ b/libextra/gnutls_extra.c
@@ -31,7 +31,9 @@
 #ifdef USE_LZO
 # ifdef USE_MINILZO
 #  include "minilzo/minilzo.h"
-# else
+# elif HAVE_LZO_LZO1X_H
+#  include <lzo/lzo1x.h>
+# elif HAVE_LZO1X_H
 #  include <lzo1x.h>
 # endif
 #endif