LU-9680 utils: fix Netlink / YAML library handling

[fs/lustre-release.git] / libcfs / autoconf / lustre-libcfs.m4

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 211bfef..9b98dab 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -1790,30 +1790,23 @@ EXTRA_KCFLAGS="$tmp_flags"
 ]) # LIBCFS_HAVE_LIST_CMP_FUNC_T
 
 #
-# LIBCFS_NLA_STRSCPY
+# LIBCFS_NLA_STRLCPY
 #
 # Kernel version 5.10-rc3 commit 872f690341948b502c93318f806d821c56772c42
 # replaced nla_strlcpy() with nla_strscpy().
 #
-AC_DEFUN([LIBCFS_SRC_NLA_STRSCPY], [
-       LB2_LINUX_TEST_SRC([nla_strscpy], [
-               #include <net/netlink.h>
-       ],[
-               if (nla_strscpy(NULL, NULL, 0) < 0)
-                       return -EINVAL;
-       ],[
-       ],[])
+AC_DEFUN([LIBCFS_NLA_STRLCPY], [
+LB_CHECK_COMPILE([if 'nla_strlcpy()' still exists],
+nla_strlcpy, [
+       #include <net/netlink.h>
+],[
+       if (nla_strlcpy(NULL, NULL, 0) == 0)
+               return -EINVAL;
+],[
+       AC_DEFINE(HAVE_NLA_STRLCPY, 1,
+               ['nla_strlcpy' is available])
 ])
-AC_DEFUN([LIBCFS_NLA_STRSCPY], [
-       AC_MSG_CHECKING([if 'nla_strscpy()' exists])
-       LB2_LINUX_TEST_RESULT([nla_strscpy], [
-               AC_DEFINE(HAVE_NLA_STRSCPY, 1,
-                       ['nla_strscpy' is available])
-               AC_MSG_RESULT(yes)
-       ],[
-               AC_MSG_RESULT(no)
-       ])
-]) # LIBCFS_NLA_STRSCPY
+]) # LIBCFS_NLA_STRLCPY
 
 #
 # LIBCFS_HAVE_CIPHER_HEADER
@@ -1905,8 +1898,6 @@ param_set_uint_minmax, [
 AC_DEFUN([LIBCFS_PROG_LINUX_SRC], [
        # 5.6
        LIBCFS_SRC_HAVE_PROC_OPS
-       # 5.10
-       LIBCFS_SRC_NLA_STRSCPY
 
        AC_MSG_CHECKING([for available kernel interfaces to libcfs])
        LB2_LINUX_TEST_COMPILE_ALL([libcfs])
@@ -1915,8 +1906,6 @@ AC_DEFUN([LIBCFS_PROG_LINUX_SRC], [
 AC_DEFUN([LIBCFS_PROG_LINUX_RESULTS], [
        # 5.6
        LIBCFS_HAVE_PROC_OPS
-       # 5.10
-       LIBCFS_NLA_STRSCPY
 ])
 
 #
@@ -2069,6 +2058,7 @@ LIBCFS_SEC_RELEASE_SECCTX
 LIBCFS_HAVE_KFREE_SENSITIVE
 LIBCFS_HAVE_CRYPTO_SHA2_HEADER
 LIBCFS_HAVE_LIST_CMP_FUNC_T
+LIBCFS_NLA_STRLCPY
 # 5.12
 LIBCFS_HAVE_CIPHER_HEADER
 # 5.13