Support and autodetect LZO version 2.0 and later.

diff --git a/src/net_packet.c b/src/net_packet.c
index 8b877c21a93e59349695fac2aef00542b3db1522..ffda5a1253702c3ae2733fbc084e65239f20380d 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -29,7 +29,12 @@
 #include <openssl/hmac.h>
 
 #include <zlib.h>
+#ifdef HAVE_LZO_LZO1X_H
+#include <lzo/lzo1x.h>
+#endif
+#ifdef HAVE_LZO1X_H
 #include <lzo1x.h>
+#endif
 
 #include "avl_tree.h"
 #include "conf.h"

diff --git a/src/tincd.c b/src/tincd.c
index c82872b35ac87de9b8d357441554d5542b9e1aac..7619af552cbc8ef1369f5f79b2be6d004284a5a4 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -37,7 +37,12 @@
 #include <openssl/evp.h>
 #include <openssl/engine.h>
 
+#ifdef HAVE_LZO_LZO1X_H
+#include <lzo/lzo1x.h>
+#endif
+#ifdef HAVE_LZO1X_H
 #include <lzo1x.h>
+#endif
 
 #include <getopt.h>
 #include "pidfile.h"