X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=m4%2Flzo.m4;h=2697d6f0a4bd5923b41c4513e3bcba6efb7a7381;hp=33d47d3a49542c0a4ceffc78f1faa790b78dd48b;hb=bdb3c24cea06e9557738b42e3c37cd036613b58d;hpb=e898b930dcd0694a49dc8cdcf373e0fc125c9fde

diff --git a/m4/lzo.m4 b/m4/lzo.m4
index 33d47d3a..2697d6f0 100644
--- a/m4/lzo.m4
+++ b/m4/lzo.m4
@@ -1,33 +1,37 @@
 dnl Check to find the lzo headers/libraries
 
-AC_DEFUN(tinc_LZO,
+AC_DEFUN([tinc_LZO],
 [
   AC_ARG_WITH(lzo,
-    AC_HELP_STRING([--with-lzo=DIR], [lzo base directory, or:]),
+    AS_HELP_STRING([--with-lzo=DIR], [lzo base directory, or:]),
     [lzo="$withval"
      CPPFLAGS="$CPPFLAGS -I$withval/include"
      LDFLAGS="$LDFLAGS -L$withval/lib"]
   )
 
   AC_ARG_WITH(lzo-include,
-    AC_HELP_STRING([--with-lzo-include=DIR], [lzo headers directory]),
+    AS_HELP_STRING([--with-lzo-include=DIR], [lzo headers directory]),
     [lzo_include="$withval"
      CPPFLAGS="$CPPFLAGS -I$withval"]
   )
 
   AC_ARG_WITH(lzo-lib,
-    AC_HELP_STRING([--with-lzo-lib=DIR], [lzo library directory]),
+    AS_HELP_STRING([--with-lzo-lib=DIR], [lzo library directory]),
     [lzo_lib="$withval"
      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]
+    )]
   )
 ])