Use common detection function for zlib.

diff --git a/source4/lib/zlib.m4 b/lib/zlib/zlib.m4
similarity index 87%
rename from source4/lib/zlib.m4
rename to lib/zlib/zlib.m4
index ac220ebede7caef7700f6cbb59855f60c0fa2d43..32d747c3884238de55a84da4f01f956f6209a5d2 100644 (file)
--- a/source4/lib/zlib.m4
+++ b/lib/zlib/zlib.m4
@@ -1,3 +1,4 @@
+AC_DEFUN([AC_ZLIB],[
 AC_CHECK_HEADERS(zlib.h)
 
 AC_CHECK_LIB_EXT(z, ZLIB_LIBS, zlibVersion)
@@ -20,7 +21,9 @@ AC_CACHE_CHECK([for zlib >= 1.2.3], samba_cv_zlib_1_2_3, [
 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}])
+       $1
 else
-       SMB_INCLUDE_MK(lib/zlib.mk)
+       $2
 fi
+])
+

diff --git a/source3/configure.in b/source3/configure.in
index d65d28d0b7824c7eca73c41fc3e3721df5378977..9388ebabc01081d9c77447eab621d4e456686686 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6248,32 +6248,10 @@ if test x$enable_merged_build = xyes; then
        m4_include(samba4.m4)
 fi
 
-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
-               ])
-])
-
+m4_include(../lib/zlib/zlib.m4)
 AC_SUBST(ZLIB_LIBS)
 AC_SUBST(ZLIB_OBJS)
-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
-       ZLIB_OBJS=""
-else
+AC_ZLIB([ZLIB_OBJS=""], [
        ZLIB_LIBS=""
        for o in adler32.o compress.o crc32.o gzio.o uncompr.o \
                     deflate.o trees.o zutil.o inflate.o infback.o \
@@ -6282,7 +6260,7 @@ else
                ZLIB_OBJS="$ZLIB_OBJS ../lib/zlib/$o"
        done
        CFLAGS="$CFLAGS -I../lib/zlib"
-fi
+])
 
 dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
 LIB_REMOVE_USR_LIB(LDFLAGS)

diff --git a/source4/configure.ac b/source4/configure.ac
index 7c95f2a17504e8310f95b04a7b048f404a1fcbfb..9d387fcb4c1a7b193f73f81870079cf96e4c3362 100644 (file)
--- 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)