X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/ef5f5c8659b1ca3999e362dfa33478e0a0150ced..d17e085a59534a333cb8db028579fd0e6ec7f89b:/config-daemon.ac

diff --git a/config-daemon.ac b/config-daemon.ac
index 803eb53699..42b59819d3 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -5,6 +5,7 @@ AC_MSG_RESULT([$guix_build_daemon])
 
 dnl C++ environment.  This macro must be used unconditionnaly.
 AC_PROG_CXX
+AM_PROG_AR
 AC_LANG([C++])
 
 if test "x$guix_build_daemon" = "xyes"; then
@@ -113,10 +114,10 @@ if test "x$guix_build_daemon" = "xyes"; then
   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 https://hydra.gnu.org"
+    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 http://hydra.gnu.org"
+    guix_substitute_urls="http://mirror.hydra.gnu.org"
   fi
   AC_MSG_CHECKING([for default substitute URLs])
   AC_MSG_RESULT([$guix_substitute_urls])
@@ -128,12 +129,20 @@ if test "x$guix_build_daemon" = "xyes"; then
   dnl 'restore-file-set', which requires unbuffered custom binary input
   dnl ports from Guile >= 2.0.10.)
   GUIX_CHECK_UNBUFFERED_CBIP
-  guix_build_daemon_offload="$ac_cv_guix_cbips_support_setvbuf"
 
-  if test "x$guix_build_daemon_offload" = "xyes"; then
-    AC_DEFINE([HAVE_DAEMON_OFFLOAD_HOOK], [1],
-      [Define if the daemon's 'offload' build hook is being built.])
-  fi
+  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)
+      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).])
+      ;;
+    *)
+      guix_build_daemon_offload="no"
+      ;;
+  esac
 
   dnl Temporary directory used to store the daemon's data.
   GUIX_TEST_ROOT_DIRECTORY
@@ -144,6 +153,8 @@ if test "x$guix_build_daemon" = "xyes"; then
 
   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],