diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-03-15 15:18:39 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-03-15 15:19:54 +0100 |
| commit | 608e42e7c92114497e7908980424288079acee1e (patch) | |
| tree | 54464815e1d943a3de22876d0a3aa49ccd595748 | |
| parent | 13159c68ef912a77e5718232f6cf7a0deec4ecde (diff) | |
| download | guix-608e42e7c92114497e7908980424288079acee1e.tar.gz | |
build: Prefer Guile 2.2 over 2.0.
* configure.ac: In 'GUILE_PKG', prefer 2.2 over 2.0. Remove warning about 2.2 not being fully supported. * doc/guix.texi (Requirements): Mention Guile 2.2.x.
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | doc/guix.texi | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index e5daadb121..3bf2bf1610 100644 --- a/configure.ac +++ b/configure.ac @@ -73,9 +73,9 @@ m4_pattern_forbid([PKG_CHECK_MODULES]) m4_pattern_forbid([GUILE_MODULE_AVAILABLE]) m4_pattern_forbid([^GUILE_P$]) -dnl Search for 'guile' and 'guild'. Prefer 2.0 until the 2.2 upgrade is -dnl complete. This macro defines 'GUILE_EFFECTIVE_VERSION'. -GUILE_PKG([2.0 2.2]) +dnl Search for 'guile' and 'guild'. This macro defines +dnl 'GUILE_EFFECTIVE_VERSION'. +GUILE_PKG([2.2 2.0]) GUILE_PROGS if test "x$GUILD" = "x"; then AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) @@ -83,8 +83,6 @@ fi if test "x$GUILE_EFFECTIVE_VERSION" = "x2.0"; then PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7]) -else - AC_MSG_WARN([Guile $GUILE_EFFECTIVE_VERSION is not fully supported!]) fi dnl Installation directory for .scm and .go files. diff --git a/doc/guix.texi b/doc/guix.texi index 82298e677d..78bf03de9e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -551,7 +551,8 @@ in the Guix source tree for additional details. GNU Guix depends on the following packages: @itemize -@item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.7 or later; +@item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.7 or +later, including 2.2.x; @item @url{http://gnupg.org/, GNU libgcrypt}; @item @uref{http://gnutls.org/, GnuTLS}, specifically its Guile bindings |