Master- patch - Fixing GUILE_PROGS wrong versioning checks

Master- patch - Fixing GUILE_PROGS wrong versioning checks

[David Pirotte]

[-- Attachment #1.1: Type: text/plain, Size: 224 bytes --]

Hello,

Attached.

Note that the fix might be 'too strong': GUILE_PROG[2.x] will accept Guile 3.x
versions ... I'm not sure about this :) feel free to update this patch in case we
don't want that...

Cheers,
David

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0003-Fixing-GUILE_PROGS-wrong-versioning-checks.patch --]
[-- Type: text/x-patch, Size: 2238 bytes --]

From 2d1593a6f9c7fc5f1636f9695e8685fcc6334cfd Mon Sep 17 00:00:00 2001
From: David Pirotte <david@altosw.be>
Date: Sat, 25 Jun 2016 23:07:48 -0300
Subject: [PATCH 3/3] Fixing GUILE_PROGS wrong versioning checks

* meta/guile.m4: Fixing GUILE_PROGS versioning checks were wrong and
  incomplete, leading to false errors like: "... checking for Guile
  version >= 2.0.11... configure: error: Guile 2.0.11 required, but
  2.1.3 found".

  thanks to Colomban Wendling, aka b4n, who also suggested this fix
  during a chat on #autotools while helping me wrt another autotool
  related problem I was nvestigating.
---
 meta/guile.m4 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/guile.m4 b/meta/guile.m4
index e1d6483..cc4e488 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.0), falling back to the previous stable version
-# (e.g. 1.8) if it is available.  If no guile-@var{VERSION}.pc file is
+# 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
 # found, an error is signalled.  The found version is stored in
 # @var{GUILE_EFFECTIVE_VERSION}.
 #
@@ -224,8 +224,12 @@ AC_DEFUN([GUILE_PROGS],
   _major_version=`echo $_guile_required_version | cut -d . -f 1`
   _minor_version=`echo $_guile_required_version | cut -d . -f 2`
   _micro_version=`echo $_guile_required_version | cut -d . -f 3`
-  if test "$_guile_major_version" -ge "$_major_version"; then
-    if test "$_guile_minor_version" -ge "$_minor_version"; then
+  if test "$_guile_major_version" -gt "$_major_version"; then
+    true
+  elif test "$_guile_major_version" -eq "$_major_version"; then
+    if test "$_guile_minor_version" -gt "$_minor_version"; then
+      true
+    elif test "$_guile_minor_version" -eq "$_minor_version"; then
       if test -n "$_micro_version"; then
         if test "$_guile_micro_version" -lt "$_micro_version"; then
           AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
-- 
2.8.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: Master- patch - Fixing GUILE_PROGS wrong versioning checks

[Andy Wingo]

On Sun 26 Jun 2016 04:28, David Pirotte <david@altosw.be> writes:

> From 2d1593a6f9c7fc5f1636f9695e8685fcc6334cfd Mon Sep 17 00:00:00 2001
> From: David Pirotte <david@altosw.be>
> Date: Sat, 25 Jun 2016 23:07:48 -0300
> Subject: [PATCH 3/3] Fixing GUILE_PROGS wrong versioning checks
>
> * meta/guile.m4: Fixing GUILE_PROGS versioning checks were wrong and
>   incomplete, leading to false errors like: "... checking for Guile
>   version >= 2.0.11... configure: error: Guile 2.0.11 required, but
>   2.1.3 found".
>
>   thanks to Colomban Wendling, aka b4n, who also suggested this fix
>   during a chat on #autotools while helping me wrt another autotool
>   related problem I was nvestigating.

Applied, thanks :)

Andy