Support and autodetect LZO version 2.0 and later.

diff --git a/m4/lzo.m4 b/m4/lzo.m4
index 8214d4c2d36edfe7e364ba62fe0f548bd3f21a49..2697d6f0a4bd5923b41c4513e3bcba6efb7a7381 100644 (file)
--- a/m4/lzo.m4
+++ b/m4/lzo.m4
@@ -21,13 +21,17 @@ AC_DEFUN([tinc_LZO],
      LDFLAGS="$LDFLAGS -L$withval"]
   )
 
-  AC_CHECK_HEADERS(lzo1x.h,
-    [],
-    [AC_MSG_ERROR("lzo header files not found."); break]
-  )
-
-  AC_CHECK_LIB(lzo, lzo1x_1_compress,
-    [LIBS="$LIBS -llzo"],
-    [AC_MSG_ERROR("lzo libraries not found.")]
+  AC_CHECK_LIB(lzo2, lzo1x_1_compress,
+    [AC_CHECK_HEADERS(lzo/lzo1x.h,
+      [LIBS="$LIBS -llzo2"],
+      [AC_MSG_ERROR("lzo2 header files not found."); break]
+    )],
+    [AC_CHECK_LIB(lzo, lzo1x_1_compress,
+      [AC_CHECK_HEADERS(lzo1x.h,
+        [LIBS="$LIBS -llzo"],
+       [AC_MSG_ERROR("lzo1 header files not found."); break]
+      )],
+      [AC_MSG_ERROR("lzo libraries not found."); break]
+    )]
   )
 ])