diff options
| author | Leo Famulari <leo@famulari.name> | 2016-11-26 16:21:47 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-11-26 16:21:47 -0500 |
| commit | a282cdae107c8aec512b563f25dd411183ef2830 (patch) | |
| tree | 3359e7101ba120cb6d2dbd156327edd727bcc01a /config-daemon.ac | |
| parent | 3ad8cb4163deee77882ee4bded83a548752b896f (diff) | |
| parent | cd65d600ac6e8701ef9c54f5d09a45cd6c149949 (diff) | |
| download | guix-a282cdae107c8aec512b563f25dd411183ef2830.tar guix-a282cdae107c8aec512b563f25dd411183ef2830.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'config-daemon.ac')
| -rw-r--r-- | config-daemon.ac | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index 8a3e6d8b60..056c939e39 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -128,12 +128,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 |