Merge pull request #5928 from craigcomstock/ENT-13016/master

Various fixups related to rhel-10 and deb-13 platforms

Author: craigcomstock

libpromises/eval_context.c

@@ -3972,7 +3972,12 @@ void EvalContextAddFunctionEvent(EvalContext *ctx, const FnCall *fp, int64_t sta
 int64_t EvalContextEventStart()
 {
     struct timespec ts;
+#ifdef CLOCK_MONOTONIC
     clock_gettime(CLOCK_MONOTONIC, &ts);
+#else
+// As in libcfnet/net.c some OS-es don't have monotonic clock, realtime clock is best we can do.
+    clock_gettime(CLOCK_REALTIME, &ts);
+#endif
     return ts.tv_sec * 1000000000LL + ts.tv_nsec;
 }
 

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