From a3f1779fdb217dc73982188b656576085a02f0ac Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sat, 12 Sep 2015 09:49:41 +0200 Subject: [PATCH] build:wafsamba: Use the samba-provided CHECK_CFG method in configuration tests This is for forward compatibility with waf 1.8. All other tests use CHECK_CFG, but check_cfg was re-introduced for some reason. --- lib/util/wscript_configure | 6 +++--- source3/wscript | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure index e7bcbd6..a1e5801 100644 --- a/lib/util/wscript_configure +++ b/lib/util/wscript_configure @@ -110,19 +110,19 @@ conf.SET_TARGET_TYPE('systemd-journal', 'EMPTY') conf.SET_TARGET_TYPE('systemd', 'EMPTY') 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') if not conf.CHECK_LIB('systemd-daemon', shlib=True): conf.CHECK_LIB('systemd', shlib=True) if Options.options.enable_systemd != False: - conf.check_cfg(package='libsystemd-journal', args='--cflags --libs', + conf.CHECK_CFG(package='libsystemd-journal', args='--cflags --libs', msg='Checking for libsystemd-journal') if not conf.CHECK_LIB('systemd-journal', shlib=True): conf.CHECK_LIB('systemd', shlib=True) if Options.options.enable_lttng != False: - conf.check_cfg(package='lttng-ust', args='--cflags --libs', + conf.CHECK_CFG(package='lttng-ust', args='--cflags --libs', msg='Checking for lttng-ust', uselib_store="LTTNG-UST") conf.CHECK_HEADERS('lttng/tracef.h', lib='lttng-st') conf.CHECK_LIB('lttng-ust', shlib=True) diff --git a/source3/wscript b/source3/wscript index 33e36b1..2687620 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1582,7 +1582,7 @@ main() { versions = ['1.0', '0.16', '0.14'] for version in versions: testlib = 'tracker-sparql-' + version - if conf.check_cfg(package=testlib, + if conf.CHECK_CFG(package=testlib, args='--cflags --libs', mandatory=False): conf.SET_TARGET_TYPE(testlib, 'SYSLIB')