From: Stefan Metzmacher Date: Mon, 10 Sep 2018 08:22:16 +0000 (+0200) Subject: Revert "wafsamba/samba_autoconf: when setting undefined result, use empty tuple" X-Git-Tag: tdb-1.3.17~1666 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93b23570358e143a90a8aaaa007bb0d482a531ec;p=thirdparty%2Fsamba.git Revert "wafsamba/samba_autoconf: when setting undefined result, use empty tuple" This reverts commit 95ba6b97441b75f28aef5ec1ee5a9442683f3763. There was already a better fix under discusion. Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 6bc34c086f0..6b940e53c00 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -445,12 +445,8 @@ def CHECK_CODE(conf, code, define, exec_args=exec_args, define_ret=define_ret) except Exception: - # Even when exception happened, conf.check might have set the define - # already to int(ret). We want to undefine it in the case of 'always'. - # Otherwise, we'd get defines set to 0 when they should be undefined - # and it foils #ifdef check if always: - conf.undefine(define) + conf.DEFINE(define, 0) conf.COMPOUND_END(False) if mandatory: raise