Use CPPFLAGS, LDFLAGS and LIBS as appropiate.

[oweals/tinc.git] / m4 / lzo.m4

diff --git a/m4/lzo.m4 b/m4/lzo.m4
index 147318fe05c0af5e4346e29786517e4f0fb3e49f..33d47d3a49542c0a4ceffc78f1faa790b78dd48b 100644 (file)
--- a/m4/lzo.m4
+++ b/m4/lzo.m4
@@ -2,27 +2,23 @@ dnl Check to find the lzo headers/libraries
 
 AC_DEFUN(tinc_LZO,
 [
-  tinc_ac_save_CPPFLAGS="$CPPFLAGS"
-
   AC_ARG_WITH(lzo,
     AC_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]),
     [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]),
     [lzo_lib="$withval"
-     LIBS="$LIBS -L$withval"]
+     LDFLAGS="$LDFLAGS -L$withval"]
   )
 
   AC_CHECK_HEADERS(lzo1x.h,
@@ -30,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.")]