sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00
Code

Use common detection function for zlib.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-10-17 11:52:55 +02:00
parent fcce58cc61
commit 9d9f5b44ed
3 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source4/lib/zlib.m4 → lib/zlib/zlib.m4
View File

@ -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
])

28
source3/configure.in
View File

@ -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)

7
source4/configure.ac
View File

@ -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)