summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/configure.ac7
-rw-r--r--source4/lib/zlib.m426
2 files changed, 6 insertions, 27 deletions
diff --git a/source4/configure.ac b/source4/configure.ac
index 7c95f2a175..9d387fcb4c 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -24,7 +24,12 @@ m4_include(../lib/util/time.m4)
m4_include(../lib/popt/samba.m4)
m4_include(lib/charset/config.m4)
m4_include(lib/socket/config.m4)
-m4_include(lib/zlib.m4)
+m4_include(../lib/zlib/zlib.m4)
+AC_ZLIB([
+SMB_EXT_LIB(ZLIB, [${ZLIB_LIBS}])
+],[
+SMB_INCLUDE_MK(lib/zlib.mk)
+])
m4_include(nsswitch/nsstest.m4)
m4_include(../pidl/config.m4)
diff --git a/source4/lib/zlib.m4 b/source4/lib/zlib.m4
deleted file mode 100644
index ac220ebede..0000000000
--- a/source4/lib/zlib.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-AC_CHECK_HEADERS(zlib.h)
-
-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_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)
-fi