diff options
| author | Thomas Nagy <tnagy@waf.io> | 2016-03-26 14:35:52 +0100 |
|---|---|---|
| committer | Uri Simchoni <uri@samba.org> | 2017-02-21 13:47:07 +0100 |
| commit | e36e1f7b12291ac818206cadc2b3081a02f62f84 (patch) | |
| tree | 2857090e9064794584d341ee12ce78e8c0a67ca9 /source3/wscript | |
| parent | f73c6bd2698ccd6e52b0782407c1c6c6fe78d60d (diff) | |
| download | samba-e36e1f7b12291ac818206cadc2b3081a02f62f84.tar.gz | |
build:wafsamba: Remove ambiguous 'if x in conf.env' constructs
Configuration values such as HAVE_STDDEF_H can be set to 0
to indicate a test failure. Waf 1.5 has a few bugs that
prevent configuration tests from setting such values
consistently on failures.
Consequently, conditions such as 'if conf.env.VARNAME' must be
used to indicate that config test successes are expected.
Note that conf.env.VARNAME always returns an empty list (False value)
when no variable is defined so there are no risk of raising
AttributeError/KeyError exceptions.
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
Autobuild-User(master): Uri Simchoni <uri@samba.org>
Autobuild-Date(master): Tue Feb 21 13:47:07 CET 2017 on sn-devel-144
Diffstat (limited to 'source3/wscript')
| -rw-r--r-- | source3/wscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/wscript b/source3/wscript index 07338e90271..2ea1db2c9cc 100644 --- a/source3/wscript +++ b/source3/wscript @@ -141,7 +141,7 @@ long ret = splice(0,0,1,0,400,SPLICE_F_MOVE); host_os = sys.platform if host_os.rfind('sunos') == -1: conf.CHECK_HEADERS('sys/inotify.h') - if "HAVE_SYS_INOTIFY_H" in conf.env: + if conf.env.HAVE_SYS_INOTIFY_H: conf.DEFINE('HAVE_INOTIFY', 1) # Check for kernel change notify support @@ -313,7 +313,7 @@ int main(int argc, char **argv) conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_flags', define='HAVE_STAT_ST_FLAGS', headers='sys/types.h sys/stat.h unistd.h') - if "HAVE_BLKCNT_T" in conf.env: + if conf.env.HAVE_BLKCNT_T: conf.CHECK_CODE(''' static int test_array[1 - 2 * !(((long int)(sizeof(blkcnt_t))) <= 4)];''', 'SIZEOF_BLKCNT_T_4', @@ -321,7 +321,7 @@ int main(int argc, char **argv) msg="Checking whether blkcnt_t is 32 bit") # If sizeof is 4 it can't be 8 - if "HAVE_BLKCNT_T" in conf.env: + if conf.env.HAVE_BLKCNT_T: if not conf.CONFIG_SET('SIZEOF_BLKCNT_T_4'): conf.CHECK_CODE(''' static int test_array[1 - 2 * !(((long int)(sizeof(blkcnt_t))) <= 8)];''', @@ -332,7 +332,7 @@ int main(int argc, char **argv) # Check for POSIX capability support conf.CHECK_FUNCS_IN('cap_get_proc', 'cap', headers='sys/capability.h') - if "HAVE_SYS_CAPABILITY_H" in conf.env: + if conf.env.HAVE_SYS_CAPABILITY_H: conf.CHECK_CODE(''' cap_t cap; cap_value_t vals[1]; |