diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-01 18:04:12 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-01 18:04:12 +0100 |
| commit | 86990eeda2a85acd3640059c0b681f1eddbacba0 (patch) | |
| tree | df0d4f0b86dad2b260b7354d451993c141dde5e7 /config-daemon.ac | |
| parent | 6d796220c417a34100c282a7fa1f9afb6ac00339 (diff) | |
| parent | 52fb59ef253d9550ca4cfa095c2c0c2360d79095 (diff) | |
| download | patches-86990eeda2a85acd3640059c0b681f1eddbacba0.tar patches-86990eeda2a85acd3640059c0b681f1eddbacba0.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'config-daemon.ac')
| -rw-r--r-- | config-daemon.ac | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index 80d84cbdbc..d409ce0117 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -132,16 +132,11 @@ if test "x$guix_build_daemon" = "xyes"; then AC_DEFINE_UNQUOTED([GUIX_SUBSTITUTE_URLS], ["$guix_substitute_urls"], [Default list of substitute URLs used by 'guix-daemon'.]) - dnl Check whether the 'offload' build hook can be built (uses - dnl 'restore-file-set', which requires unbuffered custom binary input - dnl ports from Guile >= 2.0.10.) - GUIX_CHECK_UNBUFFERED_CBIP - 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).]) |