Use standard va_copy.

diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c
index a3bb5be43af53c226de31b8d2101cbc6d1a7f081..b3c830dd5b9d4c16772712bd5d139b9386ed05b7 100644 (file)
--- a/source3/lib/dprintf.c
+++ b/source3/lib/dprintf.c
@@ -41,7 +41,7 @@
        msgstr = lang_msg(format);
        if (!msgstr) return -1;
 
-       VA_COPY(ap2, ap);
+       va_copy(ap2, ap);
 
        ret = vasprintf(&p, msgstr, ap2);
 

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 418ae41392b2d83ef1e262a064bf360f2efc5a90..8c2b3feeca9605357377455b4f52277e10f79503 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2565,7 +2565,7 @@ char *smb_xstrndup(const char *s, size_t n)
        int n;
        va_list ap2;
 
-       VA_COPY(ap2, ap);
+       va_copy(ap2, ap);
 
        n = vasprintf(ptr, format, ap2);
        if (n == -1 || ! *ptr) {

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index a5b7da7e0716ff1dd5aaf7c1f6ae031b7e3f4ddf..05d655217fddd357e50ab615076c1ab9fcb9974a 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -37,7 +37,13 @@ m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
 m4_include(nsswitch/nsstest.m4)
 m4_include(../pidl/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)
+])
+
 
 AC_CONFIG_FILES(../source4/lib/registry/registry.pc)
 AC_CONFIG_FILES(../source4/librpc/dcerpc.pc)