X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=m4%2Fzlib.m4;h=71f39f717ce895038c68edf0b87f7247f4643788;hp=d69132639282d2baf3de72d9ce922aca531ecead;hb=396ac4be802f8b75c5a2ab5925925427c61c1da3;hpb=4370b98bb1dfa9eb1e400549cb6fcb6711aa1b29

diff --git a/m4/zlib.m4 b/m4/zlib.m4
index d6913263..71f39f71 100644
--- a/m4/zlib.m4
+++ b/m4/zlib.m4
@@ -1,28 +1,24 @@
 dnl Check to find the zlib headers/libraries
 
-AC_DEFUN(tinc_ZLIB,
+AC_DEFUN([tinc_ZLIB],
 [
-  tinc_ac_save_CPPFLAGS="$CPPFLAGS"
-
   AC_ARG_WITH(zlib,
-    AC_HELP_STRING([--with-zlib=DIR], [zlib base directory, or:]),
+    AS_HELP_STRING([--with-zlib=DIR], [zlib base directory, or:]),
     [zlib="$withval"
-     CFLAGS="$CFLAGS -I$withval/include"
      CPPFLAGS="$CPPFLAGS -I$withval/include"
-     LIBS="$LIBS -L$withval/lib"]
+     LDFLAGS="$LDFLAGS -L$withval/lib"]
   )
 
   AC_ARG_WITH(zlib-include,
-    AC_HELP_STRING([--with-zlib-include=DIR], [zlib headers directory]),
+    AS_HELP_STRING([--with-zlib-include=DIR], [zlib headers directory]),
     [zlib_include="$withval"
-     CFLAGS="$CFLAGS -I$withval"
      CPPFLAGS="$CPPFLAGS -I$withval"]
   )
 
   AC_ARG_WITH(zlib-lib,
-    AC_HELP_STRING([--with-zlib-lib=DIR], [zlib library directory]),
+    AS_HELP_STRING([--with-zlib-lib=DIR], [zlib library directory]),
     [zlib_lib="$withval"
-     LIBS="$LIBS -L$withval"]
+     LDFLAGS="$LDFLAGS -L$withval"]
   )
 
   AC_CHECK_HEADERS(zlib.h,
@@ -30,8 +26,6 @@ AC_DEFUN(tinc_ZLIB,
     [AC_MSG_ERROR("zlib header files not found."); break]
   )
 
-  CPPFLAGS="$tinc_ac_save_CPPFLAGS"
-
   AC_CHECK_LIB(z, compress2,
     [LIBS="$LIBS -lz"],
     [AC_MSG_ERROR("zlib libraries not found.")]