projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle timeouts during connecting the same way as other errors.
[tinc]
/
m4
/
zlib.m4
diff --git
a/m4/zlib.m4
b/m4/zlib.m4
index
d5fbc67
..
71f39f7
100644
(file)
--- a/
m4/zlib.m4
+++ b/
m4/zlib.m4
@@
-1,20
+1,24
@@
dnl Check to find the zlib headers/libraries
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,
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"
[zlib_include="$withval"
- CFLAGS="$CFLAGS -I$withval"
CPPFLAGS="$CPPFLAGS -I$withval"]
)
AC_ARG_WITH(zlib-lib,
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"
[zlib_lib="$withval"
- L
IBS="$LIB
S -L$withval"]
+ L
DFLAGS="$LDFLAG
S -L$withval"]
)
AC_CHECK_HEADERS(zlib.h,
)
AC_CHECK_HEADERS(zlib.h,
@@
-22,8
+26,6
@@
AC_DEFUN(tinc_ZLIB,
[AC_MSG_ERROR("zlib header files not found."); break]
)
[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.")]