Don't include .svn directory in sample configuration.

[tinc] / m4 / zlib.m4

diff --git a/m4/zlib.m4 b/m4/zlib.m4
index 8407838..71f39f7 100644 (file)
--- a/m4/zlib.m4
+++ b/m4/zlib.m4
@@ -1,20 +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,
+    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-include,
-    [  --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,
-    [  --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,
@@ -22,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.")]