diff options
| author | Andy Wingo <wingo@pobox.com> | 2020-03-03 21:09:53 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2020-03-03 21:25:22 +0100 |
| commit | 0ad3986504eac9065ffd54701e7674e424967b80 (patch) | |
| tree | 6b9576d906a19af8fac070877a56af17c758c78d | |
| parent | 5c950503a64e9151566f4d98b4a75184cddb24b7 (diff) | |
| download | guile-0ad3986504eac9065ffd54701e7674e424967b80.tar.gz | |
GUILE_PKG finds guile-3.0
* meta/guile.m4 (GUILE_PKG): Drop 1.8 from default versions to look for,
and add 3.0.
| -rw-r--r-- | meta/guile.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/guile.m4 b/meta/guile.m4 index 89823e9c3..bc0daaf46 100644 --- a/meta/guile.m4 +++ b/meta/guile.m4 @@ -47,8 +47,8 @@ # for an available version of Guile. # # By default, this macro will search for the latest stable version of -# Guile (e.g. 2.2), falling back to the previous stable version -# (e.g. 2.0) if it is available. If no guile-@var{VERSION}.pc file is +# Guile (e.g. 3.0), falling back to the previous stable version +# (e.g. 2.2) if it is available. If no guile-@var{VERSION}.pc file is # found, an error is signalled. The found version is stored in # @var{GUILE_EFFECTIVE_VERSION}. # @@ -61,7 +61,7 @@ # AC_DEFUN([GUILE_PKG], [PKG_PROG_PKG_CONFIG - _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])" + _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0])" if test -n "$GUILE_EFFECTIVE_VERSION"; then _guile_tmp="" for v in $_guile_versions_to_search; do @@ -221,7 +221,7 @@ AC_DEFUN([GUILE_SITE_DIR], # as well. # # By default, this macro will search for the latest stable version of -# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older +# Guile (e.g. 3.0). x.y or x.y.z versions can be specified. If an older # version is found, the macro will signal an error. # # The effective version of the found @code{guile} is set to @@ -237,7 +237,7 @@ AC_DEFUN([GUILE_SITE_DIR], AC_DEFUN([GUILE_PROGS], [_guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])" if test -z "$_guile_required_version"; then - _guile_required_version=2.2 + _guile_required_version=3.0 fi _guile_candidates=guile |