From 96bb1b50e1eeb49ddf31369f3f5a077027a7cca5 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Wed, 31 May 2017 21:50:09 +0200
Subject: [PATCH 1/2] 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 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

From 9846178c69445142ef0b9432417453d2d4de6635 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Wed, 31 May 2017 21:52:15 +0200
Subject: [PATCH 2/2] Update guile.m4 to check for 2.2 by default

* meta/guile.m4 (GUILE_PKG): Update default Guile versions to 2.2.
---
 meta/guile.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/guile.m4 b/meta/guile.m4
index 4978880a3..89823e9c3 100644
--- a/meta/guile.m4
+++ b/meta/guile.m4
@@ -61,7 +61,7 @@
 #
 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
@@ -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.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
@@ -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.0
+    _guile_required_version=2.2
   fi
 
   _guile_candidates=guile