1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00

Revert "wafsamba/samba_autoconf: when setting undefined result, use empty tuple"

This reverts commit 95ba6b9744.

There was already a better fix under discusion.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher
2018-09-10 10:22:16 +02:00
committed by Andrew Bartlett
parent 200ddf8e73
commit 93b2357035

View File

@ -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