X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=m4%2Fzlib.m4;h=64245a505825f865260f5d061ff9983bece0eb49;hp=d69132639282d2baf3de72d9ce922aca531ecead;hb=c6d2a08bbfa806b6e48826259fb9287475000c41;hpb=013a2e159e42c46808ea8d0b6abd57525db30a50

diff --git a/m4/zlib.m4 b/m4/zlib.m4
index d6913263..64245a50 100644
--- a/m4/zlib.m4
+++ b/m4/zlib.m4
@@ -1,39 +1,38 @@
 dnl Check to find the zlib headers/libraries
 
-AC_DEFUN(tinc_ZLIB,
+AC_DEFUN([tinc_ZLIB],
 [
-  tinc_ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_ARG_ENABLE([zlib],
+    AS_HELP_STRING([--disable-zlib], [disable zlib compression support]))
+  AS_IF([test "x$enable_zlib" != "xno"], [
+  AC_DEFINE(HAVE_ZLIB, 1, [have zlib compression support])
+    AC_ARG_WITH(zlib,
+      AS_HELP_STRING([--with-zlib=DIR], [zlib base directory, or:]),
+      [zlib="$withval"
+       CPPFLAGS="$CPPFLAGS -I$withval/include"
+       LDFLAGS="$LDFLAGS -L$withval/lib"]
+    )
 
-  AC_ARG_WITH(zlib,
-    AC_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"]
-  )
+    AC_ARG_WITH(zlib-include,
+      AS_HELP_STRING([--with-zlib-include=DIR], [zlib headers directory]),
+      [zlib_include="$withval"
+       CPPFLAGS="$CPPFLAGS -I$withval"]
+    )
 
-  AC_ARG_WITH(zlib-include,
-    AC_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,
+      AS_HELP_STRING([--with-zlib-lib=DIR], [zlib library directory]),
+      [zlib_lib="$withval"
+       LDFLAGS="$LDFLAGS -L$withval"]
+    )
 
-  AC_ARG_WITH(zlib-lib,
-    AC_HELP_STRING([--with-zlib-lib=DIR], [zlib library directory]),
-    [zlib_lib="$withval"
-     LIBS="$LIBS -L$withval"]
-  )
+    AC_CHECK_HEADERS(zlib.h,
+      [],
+      [AC_MSG_ERROR("zlib header files not found."); break]
+    )
 
-  AC_CHECK_HEADERS(zlib.h,
-    [],
-    [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.")]
-  )
+    AC_CHECK_LIB(z, compress2,
+      [LIBS="$LIBS -lz"],
+      [AC_MSG_ERROR("zlib libraries not found.")]
+    )
+  ])
 ])