build: Ensure -Werror=format works with -Wformat=2 on NULL format strings

This should fix the build on some gcc versions, (noticed on FreeBSD by Volker).

We want the protection of -Werror=format without the errors extending
to the format string itself being NULL, because that is valid for
ldb_search().

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Aug 17 14:50:16 CEST 2012 on sn-devel-104

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 03c2b242fb013d520d82b2579a0f21e4917e3160..50039fccc37a56be38353bff263f0ede5d65d4ef 100644 (file)
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -629,7 +629,7 @@ def SAMBA_CONFIG_H(conf, path=None):
 
         # This check is because for ldb_search(), a NULL format string
         # is not an error, but some compilers complain about that.
-        if CHECK_CFLAGS(conf, "-Werror=format", '''
+        if CHECK_CFLAGS(conf, ["-Werror=format", "-Wformat=2"], '''
 int testformat(char *format, ...) __attribute__ ((format (__printf__, 1, 2)));
 
 int main(void) {