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.

Signed-off-by: Thomas Nagy <tnagy@waf.io>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure
index e7bcbd6bffa76cf8c835083b6b3add3afd246431..a1e58011b3f3921f75456505c84783e91f6e3f7c 100644 (file)
--- 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 33e36b1ed27e9d1fcd0b95cf73c90f4d4a4822c8..26876206ccfa53aecf7408785f2f21afa29b1290 100644 (file)
--- 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')