Merge branch 'master' into core-updates

1 files changed, 18 insertions, 5 deletions

diff --git a/config-daemon.ac b/config-daemon.ac
index 1169bb6ef4..a13525a7f5 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -38,13 +38,21 @@ if test "x$guix_build_daemon" = "xyes"; then
   case "$LIBGCRYPT_PREFIX" in
     no)
       LIBGCRYPT_CFLAGS=""
-      LIBGCRYPT_LIBS=""
       ;;
     *)
       LIBGCRYPT_CFLAGS="-I$LIBGCRYPT_PREFIX/include"
-      LIBGCRYPT_LIBS="-L$LIBGCRYPT_PREFIX/lib -lgcrypt"
       ;;
   esac
+
+  case "$LIBGCRYPT_LIBDIR" in
+    no)
+      LIBGCRYPT_LIBS="-lgcrypt"
+      ;;
+   *)
+      LIBGCRYPT_LIBS="-L$LIBGCRYPT_LIBDIR -lgcrypt"
+      ;;
+  esac
+
   AC_SUBST([LIBGCRYPT_CFLAGS])
   AC_SUBST([LIBGCRYPT_LIBS])
 
@@ -67,9 +75,14 @@ if test "x$guix_build_daemon" = "xyes"; then
   AC_CHECK_FUNCS([chroot unshare])
   AC_CHECK_HEADERS([sched.h sys/param.h sys/mount.h])
 
-  dnl Check for lutimes, optionally used for changing the mtime of
-  dnl symlinks.
-  AC_CHECK_FUNCS([lutimes])
+  dnl lutimes and lchown: used when canonicalizing store items.
+  dnl posix_fallocate: used when extracting archives.
+  dnl vfork: to speed up spawning of helper programs.
+  dnl sched_setaffinity: to improve RPC locality.
+  dnl statvfs: to detect disk-full conditions.
+  dnl strsignal: for error reporting.
+  AC_CHECK_FUNCS([lutimes lchown posix_fallocate vfork sched_setaffinity \
+     statvfs nanosleep strsignal])
 
   dnl Check whether the store optimiser can optimise symlinks.
   AC_MSG_CHECKING([whether it is possible to create a link to a symlink])