X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=m4%2Flzo.m4;h=8214d4c2d36edfe7e364ba62fe0f548bd3f21a49;hp=58011f1a57afac18974a1cccc7962a866b14f3e8;hb=dced64c5c3625f6d2f0674e9fed14455aabc635e;hpb=4b0e5a03fe89529ebe5d471a82c29c153a12116b

diff --git a/m4/lzo.m4 b/m4/lzo.m4
index 58011f1a..8214d4c2 100644
--- a/m4/lzo.m4
+++ b/m4/lzo.m4
@@ -1,20 +1,24 @@
 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,
+    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,
-    [  --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,
-    [  --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,
@@ -22,8 +26,6 @@ AC_DEFUN(tinc_LZO,
     [AC_MSG_ERROR("lzo header files 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.")]