diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-07-08 19:23:03 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-07-27 17:15:43 +0200 |
| commit | d34103502d76ac1a0d52e9dc0735e37f6671ef0d (patch) | |
| tree | f6909ca84d154bf54fbe17e01a5c4551c5268717 | |
| parent | 5df431a9038712e175f729bcbfbe86927f88545d (diff) | |
Update aclocal.m4.
| -rw-r--r-- | aclocal.m4 | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -48,7 +48,7 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # AC_DEFUN([GUILE_PKG], [PKG_PROG_PKG_CONFIG - _guile_versions_to_search="m4_default([$1], [2.0 1.8])" + _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])" if test -n "$GUILE_EFFECTIVE_VERSION"; then _guile_tmp="" for v in $_guile_versions_to_search; do @@ -208,7 +208,7 @@ AC_DEFUN([GUILE_SITE_DIR], # as well. # # By default, this macro will search for the latest stable version of -# Guile (e.g. 2.0). x.y or x.y.z versions can be specified. If an older +# Guile (e.g. 2.2). 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 @@ -224,7 +224,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.0 + _guile_required_version=2.2 fi _guile_candidates=guile @@ -274,6 +274,9 @@ AC_DEFUN([GUILE_PROGS], else as_fn_error $? "Guile $_guile_required_version required, but $_guile_prog_version found" "$LINENO" 5 fi + elif test "$GUILE_EFFECTIVE_VERSION" = "$_major_version.$_minor_version" -a -z "$_micro_version"; then + # Allow prereleases that have the right effective version. + true else AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found]) fi |