lib: prepare the build of zlib

metze

diff --git a/source/configure.ac b/source/configure.ac
index 29db34eddf3145c0f35346bc61fccd8dad3a1078..d03092c6b665c454d9073b694aaa01578d43ee4a 100644 (file)
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -24,6 +24,7 @@ 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(nsswitch/nsstest.m4)
 m4_include(pidl/config.m4)
 

diff --git a/source/lib/zlib.m4 b/source/lib/zlib.m4
new file mode 100644 (file)
index 0000000..7b967fc
--- /dev/null
+++ b/source/lib/zlib.m4
@@ -0,0 +1,12 @@
+
+AC_CHECK_HEADERS(zlib.h)
+
+# we require this new function...
+AC_CHECK_LIB_EXT(z, ZLIB_LIBS, inflateReset2)
+
+if test x"$ac_cv_header_zlib_h" = x"yes" -a \
+       x"$ac_cv_lib_ext_z_inflateReset2" = x"yes"; then
+       SMB_EXT_LIB(ZLIB, [${ZLIB_LIBS}])
+else
+       SMB_INCLUDE_MK(lib/zlib.mk)
+fi

diff --git a/source/lib/zlib.mk b/source/lib/zlib.mk
new file mode 100644 (file)
index 0000000..095f129
--- /dev/null
+++ b/source/lib/zlib.mk
@@ -0,0 +1,17 @@
+[SUBSYSTEM::ZLIB]
+CFLAGS = -Ilib/zlib
+
+libzlibsrcdir := lib/zlib
+ZLIB_OBJ_FILES = \
+               $(libzlibsrcdir)/adler32.o \
+               $(libzlibsrcdir)/compress.o \
+               $(libzlibsrcdir)/crc32.o \
+               $(libzlibsrcdir)/gzio.o \
+               $(libzlibsrcdir)/uncompr.o \
+               $(libzlibsrcdir)/deflate.o \
+               $(libzlibsrcdir)/trees.o \
+               $(libzlibsrcdir)/zutil.o \
+               $(libzlibsrcdir)/inflate.o \
+               $(libzlibsrcdir)/infback.o \
+               $(libzlibsrcdir)/inftrees.o \
+               $(libzlibsrcdir)/inffast.o

diff --git a/source/lib/zlib/zconf.h b/source/lib/zlib/zconf.h
index b65f30ee517a637279f775fa761e8410d299dc55..214603c151cc1fafe4c53762af4c0fba8c9140fc 100644 (file)
--- a/source/lib/zlib/zconf.h
+++ b/source/lib/zlib/zconf.h
@@ -5,6 +5,9 @@
 
 /* @(#) $Id$ */
 
+#include "replace.h"
+#define Z_PREFIX
+
 #ifndef ZCONF_H
 #define ZCONF_H