diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-09-08 12:54:13 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-09-08 12:54:13 +1000 |
| commit | 3eb6f79a02de6820581b91f8d9be80b8dd620119 (patch) | |
| tree | 3567dccbd6e247f72fe079e4592f0084b1ac0059 /source4/lib/zlib.m4 | |
| parent | dadd59ba401943d0cf5e4d07959456b70a3c11d9 (diff) | |
| parent | 1efff73068e933dd0b4cc81ff901f6010fda9a6b (diff) | |
| download | samba-3eb6f79a02de6820581b91f8d9be80b8dd620119.tar.gz samba-3eb6f79a02de6820581b91f8d9be80b8dd620119.tar.bz2 samba-3eb6f79a02de6820581b91f8d9be80b8dd620119.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into trusted-domains
(This used to be commit a057c3ed9df2670e5cad5f1807e280d77eb58cb0)
Diffstat (limited to 'source4/lib/zlib.m4')
| -rw-r--r-- | source4/lib/zlib.m4 | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/source4/lib/zlib.m4 b/source4/lib/zlib.m4 index 7b967fc8d2..9ee7b8e49e 100644 --- a/source4/lib/zlib.m4 +++ b/source4/lib/zlib.m4 @@ -1,11 +1,26 @@ AC_CHECK_HEADERS(zlib.h) -# we require this new function... -AC_CHECK_LIB_EXT(z, ZLIB_LIBS, inflateReset2) +AC_CHECK_LIB_EXT(z, ZLIB_LIBS, zlibVersion) + +AC_CACHE_CHECK([for zlib >= 1.2.3], samba_cv_zlib_1_2_3, [ + AC_TRY_COMPILE([ + #include <zlib.h> + ],[ + #if (ZLIB_VERNUM >= 0x1230) + #else + #error "ZLIB_VERNUM < 0x1230" + #endif + ],[ + samba_cv_zlib_1_2_3=yes + ],[ + samba_cv_zlib_1_2_3=no + ]) +]) if test x"$ac_cv_header_zlib_h" = x"yes" -a \ - x"$ac_cv_lib_ext_z_inflateReset2" = x"yes"; then + x"$ac_cv_lib_ext_z_zlibVersion" = x"yes" -a \ + x"$samba_cv_zlib_1_2_3" = x"yes"; then SMB_EXT_LIB(ZLIB, [${ZLIB_LIBS}]) else SMB_INCLUDE_MK(lib/zlib.mk) |