merge_trees(): ensure that the callers release output buffer

diff --git a/config.mak.uname b/config.mak.uname
index a88f13989ac9c2cbb303e2ae5f9ed43c9a5f778f..22958a8d6ffbf3ca937b5aac97bb9f616de70130 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -36,6 +36,8 @@ ifeq ($(uname_S),Linux)
        HAVE_DEV_TTY = YesPlease
        HAVE_CLOCK_GETTIME = YesPlease
        HAVE_CLOCK_MONOTONIC = YesPlease
+       # -lrt is needed for clock_gettime on glibc <= 2.16
+       NEEDS_LIBRT = YesPlease
        HAVE_GETDELIM = YesPlease
        SANE_TEXT_GREP=-a
 endif