summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2017-05-31 21:50:09 +0200
committerAndy Wingo <wingo@pobox.com>2017-05-31 21:51:22 +0200
commit96bb1b50e1eeb49ddf31369f3f5a077027a7cca5 (patch)
treef568bad58a5b5a61cc3fb4d42480882c8fa859d5
parent8f4597d1da371c23e19721c2fdb3177c3ae73f14 (diff)
downloadguile-96bb1b50e1eeb49ddf31369f3f5a077027a7cca5.tar.gz
guile.m4 fix for 3.0 prereleases
* meta/guile.m4 (GUILE_PROGS): Allow prereleases of Guile with a new major version.
-rw-r--r--meta/guile.m43
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/guile.m4 b/meta/guile.m4
index 23c2c63bc..4978880a3 100644
--- a/meta/guile.m4
+++ b/meta/guile.m4
@@ -287,6 +287,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