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

Let conf.check/conf.check_cfg set HAVE_x in config.h by default

Browse Source
This commit is contained in:
Thomas Nagy 2016-03-28 16:16:30 +02:00
parent 1eaa5e7a0f
commit 9fd2683095
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
waflib/Tools/c_config.py
View File

@ -301,7 +301,7 @@ def exec_cfg(self, kw):
env = self.env.env or None
def define_it():
pkgname = kw.get('uselib_store', kw['package'].upper())
if kw.get('global_define'):
if kw.get('global_define', 1):
# compatibility, replace by pkgname in WAF 1.9?
self.define(self.have_define(kw['package']), 1, False)
else:
@ -316,7 +316,10 @@ def exec_cfg(self, kw):
kw['okmsg'] = 'yes'
return
# checking for the version of a module
# checking for the version of a module as separate verifications:
# conf.check_cfg(package='libpng', atleast_version='1.0', ...)
# this is obsolete since once can use pkg-config arguments directly:
# conf.check_cfg(package='libpng', atleast_version='1.6', args=['--libs', '--cflags', 'libpng >= 1.6'])
for x in cfg_ver:
y = x.replace('-', '_')
if y in kw:
@ -655,9 +658,8 @@ def post_check(self, *k, **kw):
else:
self.define_cond(define_name, is_success, comment=comment)
# consistency with check_cfg
if kw.get('global_define', None):
self.env[kw['define_name']] = int(is_success)
# define conf.env.HAVE_X to 1
self.env[define_name] = int(is_success)
if 'header_name' in kw:
if kw.get('auto_add_header_name', False):