sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

Build zlib (required for ndr_compression) if it's not pulled in through

Browse Source 
other means.
This commit is contained in:
Jelmer Vernooij 2008-10-15 01:04:13 +02:00
parent 7fb590d4f9
commit 65fdcd92fa
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/Makefile.in
View File

@ -56,6 +56,7 @@ PIDL_ARGS=@PIDL_ARGS@
TERMLDFLAGS=@TERMLDFLAGS@
TERMLIBS=@TERMLIBS@
PRINT_LIBS=@PRINT_LIBS@
ZLIB_LIBS=@ZLIB_LIBS@
AUTH_LIBS=@AUTH_LIBS@
ACL_LIBS=@ACL_LIBS@
PASSDB_LIBS=@PASSDB_LIBS@
@ -251,8 +252,11 @@ LIBNDR_DRSUAPI_OBJ = librpc/ndr/ndr_drsuapi.o \
librpc/gen_ndr/ndr_drsuapi.o \
librpc/gen_ndr/ndr_drsblobs.o
ZLIB_OBJ = @ZLIB_OBJS@
COMPRESSION_OBJ = ../lib/compression/mszip.o \
../lib/compression/lzxpress.o
../lib/compression/lzxpress.o \
$(ZLIB_OBJ)
DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \
$(COMPRESSION_OBJ)

36
source3/configure.in
View File

@ -6248,6 +6248,42 @@ 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
])
])
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
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 \
inftrees.o inffast.o
do
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)
LIB_REMOVE_USR_LIB(LIBS)