From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 17 Oct 2008 10:08:15 +0000 (+0200)
Subject: Use standard va_copy.
X-Git-Tag: samba-4.0.0alpha6~769^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=842ea427bc012a6f26f2d968e8174d8c7ee26aef;p=thirdparty%2Fsamba.git

Use standard va_copy.
---

diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c
index a3bb5be43af..b3c830dd5b9 100644
--- 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 418ae41392b..8c2b3feeca9 100644
--- 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 a5b7da7e071..05d655217fd 100644
--- 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)