Fix ans_key exchange in recent changes

[tinc] / m4 / lzo.m4

diff --git a/m4/lzo.m4 b/m4/lzo.m4
index 8214d4c..a996b1d 100644 (file)
--- a/m4/lzo.m4
+++ b/m4/lzo.m4
@@ -21,13 +21,22 @@ 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(lzo2, lzo1x_1_compress,
+    [LIBS="$LIBS -llzo2"],
+    [AC_CHECK_LIB(lzo, lzo1x_1_compress,
+      [LIBS="$LIBS -llzo"],
+      [AC_MSG_ERROR("lzo libraries not found."); break]
+    )]
   )
 
-  AC_CHECK_LIB(lzo, lzo1x_1_compress,
-    [LIBS="$LIBS -llzo"],
-    [AC_MSG_ERROR("lzo libraries not found.")]
+  AC_CHECK_HEADERS(lzo/lzo1x.h,
+    [AC_DEFINE(LZO1X_H, [<lzo/lzo1x.h>], [Location of lzo1x.h])],
+    [AC_CHECK_HEADERS(lzo2/lzo1x.h,
+      [AC_DEFINE(LZO1X_H, [<lzo2/lzo1x.h>], [Location of lzo1x.h])],
+      [AC_CHECK_HEADERS(lzo1x.h,
+        [AC_DEFINE(LZO1X_H, [<lzo1x.h>], [Location of lzo1x.h])],
+        [AC_MSG_ERROR("lzo header files not found."); break]
+      )]
+    )]
   )
 ])