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 /source3 | |
| 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 'source3')
| -rw-r--r-- | source3/wscript | 6 | ||||
| -rw-r--r-- | source3/wscript_configure_system_ncurses | 2 |
2 files changed, 4 insertions, 4 deletions
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') |