doc: Mention value /var to localstatedir option.

[jackhill/guix/guix.git] / config-daemon.ac

diff --git a/config-daemon.ac b/config-daemon.ac
index 524b10b..bf94815 100644 (file)
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -48,7 +48,7 @@ if test "x$guix_build_daemon" = "xyes"; then
   esac
 
   case "$LIBGCRYPT_LIBDIR" in
-    no)
+    no | "")
       LIBGCRYPT_LIBS="-lgcrypt"
       ;;
     *)
@@ -118,14 +118,10 @@ if test "x$guix_build_daemon" = "xyes"; then
   dnl Check for <linux/fs.h> (for immutable file support).
   AC_CHECK_HEADERS([linux/fs.h])
 
-  dnl Determine the appropriate default list of substitute URLs.
-  GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)])
-  if test "x$have_gnutls" = "xyes"; then
-    guix_substitute_urls="https://mirror.hydra.gnu.org"
-  else
-    AC_MSG_WARN([GnuTLS is missing, substitutes will be downloaded in the clear])
-    guix_substitute_urls="http://mirror.hydra.gnu.org"
-  fi
+  dnl Determine the appropriate default list of substitute URLs (GnuTLS
+  dnl is required so we can default to 'https'.)
+  guix_substitute_urls="https://ci.guix.gnu.org"
+
   AC_MSG_CHECKING([for default substitute URLs])
   AC_MSG_RESULT([$guix_substitute_urls])
 
@@ -135,8 +131,8 @@ if test "x$guix_build_daemon" = "xyes"; then
   dnl Check for Guile-SSH, which is required by 'guix offload'.
   GUIX_CHECK_GUILE_SSH
 
-  case "x$ac_cv_guix_cbips_support_setvbuf$guix_cv_have_recent_guile_ssh" in
-    xyesyes)
+  case "x$guix_cv_have_recent_guile_ssh" in
+    xyes)
       guix_build_daemon_offload="yes"
       AC_DEFINE([HAVE_DAEMON_OFFLOAD_HOOK], [1],
        [Define if the daemon's 'offload' build hook is being built (requires Guile-SSH).])
@@ -152,17 +148,6 @@ if test "x$guix_build_daemon" = "xyes"; then
   AC_SUBST([GUIX_TEST_ROOT])
 
   GUIX_CHECK_LOCALSTATEDIR
-
-  AC_CONFIG_FILES([nix/scripts/list-runtime-roots],
-    [chmod +x nix/scripts/list-runtime-roots])
-  AC_CONFIG_FILES([nix/scripts/download],
-    [chmod +x nix/scripts/download])
-  AC_CONFIG_FILES([nix/scripts/substitute],
-    [chmod +x nix/scripts/substitute])
-  AC_CONFIG_FILES([nix/scripts/guix-authenticate],
-    [chmod +x nix/scripts/guix-authenticate])
-  AC_CONFIG_FILES([nix/scripts/offload],
-    [chmod +x nix/scripts/offload])
 fi
 
 AM_CONDITIONAL([HAVE_LIBBZ2], [test "x$HAVE_LIBBZ2" = "xyes"])