FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-12-24 02:05:12 +01:00
Code Issues Projects Releases Wiki Activity

Option for adding HAVE_X to conf.env - conf.check(add_have_to_env=1)

Browse Source
This commit is contained in:
Thomas Nagy 2016-04-03 11:08:00 +02:00
parent cf9330a371
commit 00c955d8fa
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@ NEW IN WAF 1.9
- Enabled pre-forked builds by default to achieve faster builds, up to 2x speedup on short-lived processes
* API changes:
- The minimum Python version required is Python 2.5
- Remove the duplicate split functions from Utils
- Remove the command called "update"
- Add Task.get_cwd()

15
waflib/Tools/c_config.py
View File

@ -301,12 +301,14 @@ def exec_cfg(self, kw):
env = self.env.env or None
def define_it():
pkgname = kw.get('uselib_store', kw['package'].upper())
# by default, add HAVE_X to the config.h, else provide DEFINES_X for use=X
if kw.get('global_define', 1):
# compatibility, replace by pkgname in WAF 1.9?
self.define(self.have_define(kw['package']), 1, False)
else:
self.env.append_unique('DEFINES_%s' % pkgname, "%s=1" % self.have_define(pkgname))
self.env[self.have_define(pkgname)] = 1
if kw.get('add_have_to_env', 1):
self.env[self.have_define(pkgname)] = 1
# pkg-config version
if 'atleast_pkgconfig_version' in kw:
@ -665,10 +667,11 @@ def post_check(self, *k, **kw):
self.env.append_value(var, '%s=%s' % (define_name, int(is_success)))
# define conf.env.HAVE_X to 1
if kw.get('uselib_store', None):
self.env[self.have_define(kw['uselib_store'])] = 1
else:
self.env[define_name] = int(is_success)
if kw.get('add_have_to_env', 1):
if kw.get('uselib_store', None):
self.env[self.have_define(kw['uselib_store'])] = 1
else:
self.env[define_name] = int(is_success)
if 'header_name' in kw:
if kw.get('auto_add_header_name', False):