diff options
| author | Lars-Dominik Braun <ldb@leibniz-psychology.org> | 2020-02-20 12:36:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-02-22 00:45:58 +0100 |
| commit | 378918725259d221222dd0b1831fbaa3e0a17e1f (patch) | |
| tree | 8a3c76642001055aa982c6d9f03e00daf5e1e657 /m4/guix.m4 | |
| parent | 43e282accc17c8ff2156448e4e8fdd0d04d7ba1c (diff) | |
build: Depend on guile-ssh 0.12.0
This is a followup to 35f35111678e6622301b414f3d464acb71e106bb.
* m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Check for userauth-gssapi!
* doc/guix.texi: Document version requirement
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'm4/guix.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 8be7cca54f6..961ce838ac7 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 | |||
| @@ -142,13 +142,14 @@ dnl GUIX_CHECK_GUILE_SSH | |||
| 142 | dnl | 142 | dnl |
| 143 | dnl Check whether a recent-enough Guile-SSH is available. | 143 | dnl Check whether a recent-enough Guile-SSH is available. |
| 144 | AC_DEFUN([GUIX_CHECK_GUILE_SSH], [ | 144 | AC_DEFUN([GUIX_CHECK_GUILE_SSH], [ |
| 145 | dnl Check whether 'channel-send-eof' (introduced in 0.10.2) is present. | 145 | dnl Check whether 'userauth-gssapi!' (introduced in 0.12.0) is present. |
| 146 | AC_CACHE_CHECK([whether Guile-SSH is available and recent enough], | 146 | AC_CACHE_CHECK([whether Guile-SSH is available and recent enough], |
| 147 | [guix_cv_have_recent_guile_ssh], | 147 | [guix_cv_have_recent_guile_ssh], |
| 148 | [GUILE_CHECK([retval], | 148 | [GUILE_CHECK([retval], |
| 149 | [(and (@ (ssh channel) channel-send-eof) | 149 | [(and (@ (ssh channel) channel-send-eof) |
| 150 | (@ (ssh popen) open-remote-pipe) | 150 | (@ (ssh popen) open-remote-pipe) |
| 151 | (@ (ssh dist node) node-eval))]) | 151 | (@ (ssh dist node) node-eval) |
| 152 | (@ (ssh auth) userauth-gssapi!))]) | ||
| 152 | if test "$retval" = 0; then | 153 | if test "$retval" = 0; then |
| 153 | guix_cv_have_recent_guile_ssh="yes" | 154 | guix_cv_have_recent_guile_ssh="yes" |
| 154 | else | 155 | else |
