Merge pull request #5932 from craigcomstock/ent-13016/3.24

RedHat 10 and Debian 13 related changes (3.24)

Author: larsewi

m4/cf3_with_library.m4

@@ -84,7 +84,8 @@ AC_DEFUN([CF3_WITH_LIBRARY],
   if test "x$with_[$1]" != xyes &&
      test "x$with_[$1]" != xcheck &&
      test "x$with_[$1]" != x/usr &&
-     test "x$with_[$1]" != x/
+     test "x$with_[$1]" != x/ &&
+     test -n "$with_[$1]"
   then
     ULN[]_LDFLAGS="$ULN[]_LDFLAGS -R$with_[$1]/lib"
   fi

tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf

@@ -8,8 +8,8 @@ body common control
 bundle agent test
 {
   meta:
-      "test_soft_fail" string => "windows",
-        meta => { "ENT-10401" };
+      "test_soft_fail" string => "windows|redhat_10",
+        meta => { "ENT-10401", "ENT-13494" };
 
   methods:
       # source file