[Guile-commits] 01/01: guile.m4 fix for 3.0 prereleases

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 5b5acba03d34808deadb646d00d3057a425266ad
Author: Andy Wingo <address@hidden>
Date:   Wed May 31 21:50:09 2017 +0200

    guile.m4 fix for 3.0 prereleases
    
    * meta/guile.m4 (GUILE_PROGS): Allow prereleases of Guile with a new
      major version.
---
 meta/guile.m4 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/guile.m4 b/meta/guile.m4
index 23c2c63..4978880 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