X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=62ec024fc0d67fbefc6369d74209cd8a195d7afa;hp=8ff37b5d666e55e871b98b6d788f85480e17e6b6;hb=38555069bf3de77726a1afb9d15911bc4db484b7;hpb=353e3c2f8d9f195c0f87a16259f22b2f84de11d4

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 8ff37b5..62ec024 100644
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -101,13 +101,10 @@ AC_DEFUN([LIBCFS_DIGEST_SETKEY_FLAGS],
 LB_LINUX_TRY_COMPILE([
 	#include <linux/err.h>
 	#include <linux/crypto.h>
-
-	static int foo(struct crypto_tfm *tfm, const u8 *key, unsigned int l, u32* f)
-	{
-		return 1;
-	}
 ],[
-	struct digest_alg alg = {.dia_setkey=foo};
+	struct digest_alg alg;
+
+	alg.dia_setkey(NULL, NULL, 0, NULL);
 ],[
 	AC_MSG_RESULT([yes])
 	AC_DEFINE(HAVE_DIGEST_SETKEY_FLAGS, 1, [kernel dia_setkey takes 4 args])
@@ -116,7 +113,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-
 # 2.6.19 API changes
 # kmem_cache_destroy(cachep) return void instead of
 # int
@@ -839,6 +835,12 @@ AC_CHECK_TYPE([spinlock_t],
 # lnet/utils/wirecheck.c
 AC_CHECK_FUNCS([strnlen])
 
+# lnet/libcfs/user-prim.c, missing for RHEL5 and earlier userspace
+AC_CHECK_FUNCS([strlcpy])
+
+# libcfs/libcfs/user-prim.c, missing for RHEL5 and earlier userspace
+AC_CHECK_FUNCS([strlcat])
+
 AC_CHECK_TYPE([umode_t],
 	[AC_DEFINE(HAVE_UMODE_T, 1, [umode_t is defined])],
 	[],