diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-06-10 17:48:15 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-06-10 20:18:49 +0200 |
| commit | bff935b814355b8b75b422857c56aced0a6b1388 (patch) | |
| tree | c1cb9c89149848d7d739629b300efa563b51577c | |
| parent | 0eeaf10fd0ef37c2db497bfe39ed97d761593946 (diff) | |
| download | samba-bff935b814355b8b75b422857c56aced0a6b1388.tar.gz | |
wafsamba: try to fix the build on AIX with xlc_r
bld.env['CPP'] can be 'None' or '[]', bld.CONFIG_SET("CPP") should return False
File "./buildtools/wafsamba/samba_pidl.py", line 131, in SAMBA_PIDL_LIST
bld.SAMBA_PIDL(name, p, options=options, output_dir=output_dir, symlink=symlink, generate_tables=generate_tables)
File "./buildtools/wafsamba/samba_pidl.py", line 65, in SAMBA_PIDL
cpp = 'CPP="%s"' % bld.CONFIG_GET("CPP")[0]
IndexError: list index out of range
metze
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Sun Jun 10 20:18:49 CEST 2012 on sn-devel-104
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 4da5df86a07..be5e9267ddf 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -467,7 +467,16 @@ def CONFIG_GET(conf, option): @conf def CONFIG_SET(conf, option): '''return True if a configuration option was found''' - return (option in conf.env) and (conf.env[option] != ()) + if option not in conf.env: + return False + v = conf.env[option] + if v == None: + return False + if v == []: + return False + if v == (): + return False + return True Build.BuildContext.CONFIG_SET = CONFIG_SET Build.BuildContext.CONFIG_GET = CONFIG_GET |