diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 23:16:17 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 23:16:17 +0100 |
| commit | ebb7cf9e21060105d9950dd5142c0eb918083666 (patch) | |
| tree | 36c1607b80d92e27fb9d09029d1d3b57a1fd5065 /m4 | |
| parent | 0b870f7915f5da43758753fd088a22033936dc50 (diff) | |
| parent | c2d7e800e6788277bc56f31d5836f9d507dc1506 (diff) | |
| download | patches-ebb7cf9e21060105d9950dd5142c0eb918083666.tar patches-ebb7cf9e21060105d9950dd5142c0eb918083666.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/guix.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/m4/guix.m4 b/m4/guix.m4 index 8be7cca54f..961ce838ac 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -142,13 +142,14 @@ 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 'channel-send-eof' (introduced in 0.10.2) is present. + dnl Check whether 'userauth-gssapi!' (introduced in 0.12.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 dist node) node-eval) + (@ (ssh auth) userauth-gssapi!))]) if test "$retval" = 0; then guix_cv_have_recent_guile_ssh="yes" else |