From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 11 Nov 2006 20:10:46 +0000 (+0000)
Subject: Support and autodetect LZO version 2.0 and later.
X-Git-Tag: release-1.0.5~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8d393b30a922110ec77d5b243347416b50cd2160;p=oweals%2Ftinc.git

Support and autodetect LZO version 2.0 and later.
---

diff --git a/src/net_packet.c b/src/net_packet.c
index 8b877c2..ffda5a1 100644
--- 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 c82872b..7619af5 100644
--- 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"