diff options
| author | Thomas Nagy <tnagy2pow10@gmail.com> | 2015-03-07 15:31:19 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-03-16 03:00:07 +0100 |
| commit | 3c0e3af39541f15eef0f9017cb1622706e73e46a (patch) | |
| tree | 9afaa2e78e6a63cea6f86a870f8124fba90ee5f9 /buildtools | |
| parent | 5771276be91ec3aad6a7d8cf396ee4721a171feb (diff) | |
| download | samba-3c0e3af39541f15eef0f9017cb1622706e73e46a.tar.gz | |
Transition to waf 1.8: wrapped conf.check_cfg
Reviewed-By: Jelmer Vernooij <jelmer@samba.org>
(forward ported to current master by abartlet)
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 4 | ||||
| -rwxr-xr-x | buildtools/wafsamba/wscript | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 905adc7df64..4f646fdb8f0 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -846,3 +846,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf): if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []: if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']): conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup'] + +@conf +def CHECK_CFG(self, *k, **kw): + return self.check_cfg(*k, **kw) diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 8027c00dd21..31805430efe 100755 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -383,7 +383,7 @@ def configure(conf): conf.CHECK_INLINE() # check for pkgconfig - conf.check_cfg(atleast_pkgconfig_version='0.0.0') + conf.CHECK_CFG(atleast_pkgconfig_version='0.0.0') conf.DEFINE('_GNU_SOURCE', 1, add_to_cflags=True) conf.DEFINE('_XOPEN_SOURCE_EXTENDED', 1, add_to_cflags=True) |