diff options
| author | Marius Bakke <marius@gnu.org> | 2020-07-24 23:53:17 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-07-24 23:53:17 +0200 |
| commit | cbe96f14700f4805552c47d5f163a75c35f86575 (patch) | |
| tree | d7791d29b283507bb8953a292d764b24774c955c /m4/guix.m4 | |
| parent | 337333c2567bdf767fdc8e04520c4bc0c8b33784 (diff) | |
| parent | 7a9a27a051a04a7fee2e7fe40127fedbe9112cfd (diff) | |
| download | guix-cbe96f14700f4805552c47d5f163a75c35f86575.tar guix-cbe96f14700f4805552c47d5f163a75c35f86575.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'm4/guix.m4')
| -rw-r--r-- | m4/guix.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/m4/guix.m4 b/m4/guix.m4 index 7c27ae74df..cce03045db 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -142,14 +142,16 @@ dnl GUIX_CHECK_GUILE_SSH dnl dnl Check whether a recent-enough Guile-SSH is available. AC_DEFUN([GUIX_CHECK_GUILE_SSH], [ - dnl Check whether 'userauth-gssapi!' (introduced in 0.12.0) is present. + dnl Check whether '#:nodelay' paramater to 'make-session' (introduced in + dnl 0.13.0) is present. AC_CACHE_CHECK([whether Guile-SSH is available and recent enough], [guix_cv_have_recent_guile_ssh], [GUILE_CHECK([retval], [(and (@ (ssh channel) channel-send-eof) (@ (ssh popen) open-remote-pipe) (@ (ssh dist node) node-eval) - (@ (ssh auth) userauth-gssapi!))]) + (@ (ssh auth) userauth-gssapi!) + ((@ (ssh session) make-session) #:nodelay #t))]) if test "$retval" = 0; then guix_cv_have_recent_guile_ssh="yes" else |