From: Thomas Nagy Date: Sat, 7 Mar 2015 14:31:19 +0000 (+0100) Subject: Transition to waf 1.8: wrapped conf.check_cfg X-Git-Tag: tdb-1.3.5~540 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=3c0e3af39541f15eef0f9017cb1622706e73e46a;p=samba.git Transition to waf 1.8: wrapped conf.check_cfg Reviewed-By: Jelmer Vernooij (forward ported to current master by abartlet) Reviewed-by: Andrew Bartlett --- 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) diff --git a/source3/wscript b/source3/wscript index 90f5d7ff202..ffff44df1aa 100644 --- a/source3/wscript +++ b/source3/wscript @@ -654,7 +654,7 @@ msg.msg_accrightslen = sizeof(fd); # we would normally use --libs here, but cups-config incorrectly adds # gssapi_krb5 and other libraries to its --libs output. That breaks the use # of an in-tree heimdal kerberos - conf.check_cfg(path=conf.env.CUPS_CONFIG, args="--cflags --ldflags", + conf.CHECK_CFG(path=conf.env.CUPS_CONFIG, args="--cflags --ldflags", package="", uselib_store="CUPS") conf.CHECK_HEADERS('cups/cups.h cups/language.h', lib='cups') conf.CHECK_FUNCS_IN('httpConnect httpConnectEncrypt', 'cups') @@ -1523,7 +1523,7 @@ main() { conf.DEFINE('HAVE_CEPH', '1') if Options.options.with_glusterfs: - conf.check_cfg(package='glusterfs-api', args='"glusterfs-api >= 4" --cflags --libs', + conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 4" --cflags --libs', msg='Checking for glusterfs-api >= 4', uselib_store="GFAPI") conf.CHECK_HEADERS('api/glfs.h', lib='gfapi') conf.CHECK_LIB('gfapi', shlib=True) @@ -1540,7 +1540,7 @@ main() { if Options.options.enable_vxfs: conf.DEFINE('HAVE_VXFS', '1') - if conf.check_cfg(package='dbus-1', args='--cflags --libs', + if conf.CHECK_CFG(package='dbus-1', args='--cflags --libs', msg='Checking for dbus', uselib_store="DBUS-1"): if (conf.CHECK_HEADERS('dbus/dbus.h', lib='dbus-1') and conf.CHECK_LIB('dbus-1', shlib=True)): diff --git a/source3/wscript_configure_system_ncurses b/source3/wscript_configure_system_ncurses index 5c804291cee..0cc54fb1525 100644 --- a/source3/wscript_configure_system_ncurses +++ b/source3/wscript_configure_system_ncurses @@ -7,7 +7,7 @@ if not conf.env.NCURSES_CONFIG: conf.find_program('ncurses6-config', var='NCURSES_CONFIG') if conf.env.NCURSES_CONFIG: - conf.check_cfg(path=conf.env.NCURSES_CONFIG, args="--cflags --libs", + conf.CHECK_CFG(path=conf.env.NCURSES_CONFIG, args="--cflags --libs", package="", uselib_store="NCURSES") conf.CHECK_HEADERS('ncurses.h menu.h panel.h form.h', lib='ncurses') diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript index cbba87d5804..0223d7378d5 100644 --- a/source4/lib/tls/wscript +++ b/source4/lib/tls/wscript @@ -21,12 +21,12 @@ def configure(conf): conf.fatal("--disable-gnutls given: Building the AD DC requires GnuTLS (eg libgnutls-dev, gnutls-devel) for ldaps:// support and for the BackupKey protocol") return - if conf.check_cfg(package='gnutls', + if conf.CHECK_CFG(package='gnutls', args='"gnutls >= 3.0.0" --cflags --libs', msg='Checking for gnutls >= 3.0.0s', mandatory=False): conf.DEFINE('HAVE_GNUTLS3', 1) else: - conf.check_cfg(package='gnutls', + conf.CHECK_CFG(package='gnutls', args='"gnutls >= 1.4.0 gnutls != 2.2.4 gnutls != 2.8.0 gnutls != 2.8.1" --cflags --libs', msg='Checking for gnutls >= 1.4.0 and broken versions', mandatory=False) diff --git a/wscript b/wscript index 23f94798c51..d6db12c4a73 100644 --- a/wscript +++ b/wscript @@ -216,7 +216,7 @@ def configure(conf): conf.env['ENABLE_RELRO'] = True if Options.options.enable_systemd != False: - conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs', + conf.CHECK_CFG(package='libsystemd-daemon', args='--cflags --libs', msg='Checking for libsystemd-daemon', uselib_store="SYSTEMD-DAEMON") conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon') conf.CHECK_LIB('systemd-daemon', shlib=True) diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5 index ce49ab7518f..38397e32b7d 100644 --- a/wscript_configure_system_mitkrb5 +++ b/wscript_configure_system_mitkrb5 @@ -21,11 +21,11 @@ else: conf.find_program('krb5-config', path_list=path_krb5_config, var='KRB5_CONFIG') if conf.env.KRB5_CONFIG: - conf.check_cfg(path=conf.env.KRB5_CONFIG, args="--cflags --libs", + conf.CHECK_CFG(path=conf.env.KRB5_CONFIG, args="--cflags --libs", package="", uselib_store="KRB5") krb5_define_syslib(conf, "krb5", conf.env['LIB_KRB5']) - conf.check_cfg(path=conf.env.KRB5_CONFIG, args="--cflags --libs", + conf.CHECK_CFG(path=conf.env.KRB5_CONFIG, args="--cflags --libs", package="gssapi", uselib_store="GSSAPI") krb5_define_syslib(conf, "gssapi", conf.env['LIB_GSSAPI']) if 'k5crypto' in conf.env['LIB_GSSAPI']: @@ -54,7 +54,7 @@ if conf.env.KRB5_CONFIG: else: Logs.info('%s is detected, MIT krb5 build can proceed' % (kversion)) -conf.check_cfg(args="--cflags --libs", package="com_err", uselib_store="com_err") +conf.CHECK_CFG(args="--cflags --libs", package="com_err", uselib_store="com_err") conf.CHECK_FUNCS_IN('_et_list', 'com_err') conf.CHECK_HEADERS('com_err.h', lib='com_err')