X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=m4%2Flzo.m4;h=a996b1d09bccac82542af92751c27fc5b26273f0;hp=147318fe05c0af5e4346e29786517e4f0fb3e49f;hb=5219ee25a248fe26055e54215c5027cbf8483439;hpb=4370b98bb1dfa9eb1e400549cb6fcb6711aa1b29

diff --git a/m4/lzo.m4 b/m4/lzo.m4
index 147318fe..a996b1d0 100644
--- a/m4/lzo.m4
+++ b/m4/lzo.m4
@@ -1,39 +1,42 @@
 dnl Check to find the lzo headers/libraries
 
-AC_DEFUN(tinc_LZO,
+AC_DEFUN([tinc_LZO],
 [
-  tinc_ac_save_CPPFLAGS="$CPPFLAGS"
-
   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"
-     CFLAGS="$CFLAGS -I$withval/include"
      CPPFLAGS="$CPPFLAGS -I$withval/include"
-     LIBS="$LIBS -L$withval/lib"]
+     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"
-     CFLAGS="$CFLAGS -I$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"
-     LIBS="$LIBS -L$withval"]
+     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]
+    )]
   )
 
-  CPPFLAGS="$tinc_ac_save_CPPFLAGS"
-
-  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]
+      )]
+    )]
   )
 ])