[PATCH] allow specifying a required version in GUILE_PROGS

[PATCH] allow specifying a required version in GUILE_PROGS

[Aleix Conchillo Flaqué]

[-- Attachment #1: Type: text/plain, Size: 527 bytes --]

The following patch allows to specify a required Guile version in
GUILE_PROGS. By default, it requires >= 2.0. The following works:

GUILE_PROGS([2.0])
GUILE_PROGS([2.0.9])

It also works with 1.8.

I am not an expert on m4 macros. I've used "cut" instead of
m4_bregexp. I tried it but couldn't get it right.

In some packages I have implemented procedures which will be available
in the next release of Guile. My plan is to remove these procedures
and add a requirement on a Guile version.

Let me know what you think.

Aleix

[-- Attachment #2: guile-progs.patch --]
[-- Type: application/octet-stream, Size: 4525 bytes --]

From 66fdc5ff8c0fea6c285c5de01cd8efc12ba58e02 Mon Sep 17 00:00:00 2001
From: Aleix Conchillo Flaque <aconchillo@gmail.com>
Date: Thu, 3 Oct 2013 15:49:07 -0700
Subject: [PATCH] allow specifying a required version in GUILE_PROGS

* meta/guile.m4: GUILE_PROGS now takes an optional argument to specify a
  required Guile version. By default, it requires Guile >= 2.0. A micro
  version can also be specified (e.g. GUILE_PROGS([2.0.10])).
---
 meta/guile.m4 | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/meta/guile.m4 b/meta/guile.m4
index a3e1ef1..5ec2055 100644
--- a/meta/guile.m4
+++ b/meta/guile.m4
@@ -1,17 +1,17 @@
 ## Autoconf macros for working with Guile.
 ##
-##   Copyright (C) 1998,2001, 2006, 2010, 2012 Free Software Foundation, Inc.
+##   Copyright (C) 1998,2001, 2006, 2010, 2012, 2013 Free Software Foundation, Inc.
 ##
 ## This library is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU Lesser General Public License
 ## as published by the Free Software Foundation; either version 3 of
 ## the License, or (at your option) any later version.
-## 
+##
 ## This library is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## Lesser General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this library; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
@@ -177,12 +177,15 @@ AC_DEFUN([GUILE_SITE_DIR],
 
 # GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
 #
-# Usage: GUILE_PROGS
+# Usage: GUILE_PROGS([VERSION])
 #
 # This macro looks for programs @code{guile} and @code{guild}, setting
 # variables @var{GUILE} and @var{GUILD} to their paths, respectively.
 # If @code{guile} is not found, signal an error.
 #
+# By default, this macro will search for the latest stable version of
+# Guile (e.g. 2.0).
+#
 # The effective version of the found @code{guile} is set to
 # @var{GUILE_EFFECTIVE_VERSION}.  This macro ensures that the effective
 # version is compatible with the result of a previous invocation of
@@ -195,17 +198,42 @@ AC_DEFUN([GUILE_SITE_DIR],
 #
 AC_DEFUN([GUILE_PROGS],
  [AC_PATH_PROG(GUILE,guile)
+  _guile_required_version="m4_default([$1], [2.0])"
   if test "$GUILE" = "" ; then
       AC_MSG_ERROR([guile required but not found])
   fi
   AC_SUBST(GUILE)
 
-  _guile_prog_version=`$GUILE -c "(display (effective-version))"`
+  _guile_effective_version=`$GUILE -c "(display (effective-version))"`
   if test -z "$GUILE_EFFECTIVE_VERSION"; then
-    GUILE_EFFECTIVE_VERSION=$_guile_prog_version
-  elif test "$GUILE_EFFECTIVE_VERSION" != "$_guile_prog_version"; then
-    AC_MSG_ERROR([found development files for Guile $GUILE_EFFECTIVE_VERSION, but $GUILE has effective version $_guile_prog_version])
+    GUILE_EFFECTIVE_VERSION=$_guile_effective_version
+  elif test "$GUILE_EFFECTIVE_VERSION" != "$_guile_effective_version"; then
+    AC_MSG_ERROR([found development files for Guile $GUILE_EFFECTIVE_VERSION, but $GUILE has effective version $_guile_effective_version])
+  fi
+
+  _guile_prog_version=`$GUILE -c "(display (version))"`
+  _guile_major_version=`$GUILE -c "(display (major-version))"`
+  _guile_minor_version=`$GUILE -c "(display (minor-version))"`
+  _guile_micro_version=`$GUILE -c "(display (micro-version))"`
+
+  AC_MSG_CHECKING([for Guile version >= $_guile_required_version])
+  _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 -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])
+        fi
+      fi
+    else
+      AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
+    fi
+  else
+    AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
   fi
+  AC_MSG_RESULT([$_guile_prog_version])
 
   AC_PATH_PROG(GUILD,guild)
   AC_SUBST(GUILD)
-- 
1.8.4.rc3

Re: [PATCH] allow specifying a required version in GUILE_PROGS

[Ludovic Courtès]

Hi Aleix,

(Second try.)

Aleix Conchillo Flaqué <aconchillo@gmail.com> skribis:

> From 66fdc5ff8c0fea6c285c5de01cd8efc12ba58e02 Mon Sep 17 00:00:00 2001
> From: Aleix Conchillo Flaque <aconchillo@gmail.com>
> Date: Thu, 3 Oct 2013 15:49:07 -0700
> Subject: [PATCH] allow specifying a required version in GUILE_PROGS
>
> * meta/guile.m4: GUILE_PROGS now takes an optional argument to specify a
>   required Guile version. By default, it requires Guile >= 2.0. A micro
>   version can also be specified (e.g. GUILE_PROGS([2.0.10])).

The patch looks good to me.

> +  _guile_prog_version=`$GUILE -c "(display (version))"`
> +  _guile_major_version=`$GUILE -c "(display (major-version))"`
> +  _guile_minor_version=`$GUILE -c "(display (minor-version))"`
> +  _guile_micro_version=`$GUILE -c "(display (micro-version))"`
> +
> +  AC_MSG_CHECKING([for Guile version >= $_guile_required_version])
> +  _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 -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])

Perhaps error messages should show
$_guile_major_version.$_guile_minor_version.$_guile_micro_version since
that could differ from $_guile_prog_version (for instance in Debian
$_guile_prog_version is something like 2.0.9-deb42.)

For code contributed to Guile, we ask for a copyright assignment to the
FSF.  Would that be OK with you?  If yes, I can send you the form
off-list, and then we can proceed (you might even be able to avoid snail
mail entirely.)

TIA,
Ludo’.

Re: [PATCH] allow specifying a required version in GUILE_PROGS

[Aleix Conchillo Flaqué]

[-- Attachment #1: Type: text/plain, Size: 906 bytes --]

Hi!

On Mon, Oct 14, 2013 at 2:05 PM, Ludovic Courtès <ludo@gnu.org> wrote:
> Hi Aleix,
>
> (Second try.)
>
> The patch looks good to me.
>
> Perhaps error messages should show
> $_guile_major_version.$_guile_minor_version.$_guile_micro_version since
> that could differ from $_guile_prog_version (for instance in Debian
> $_guile_prog_version is something like 2.0.9-deb42.)
>

Yes, I saw that and thought it was OK as the check was successfully
anyway. But probably it looks better as you suggested. In the attached
patch I don't get the version from (version) and I build
_guile_prog_version with macro.minor.micro.

> For code contributed to Guile, we ask for a copyright assignment to the
> FSF.  Would that be OK with you?  If yes, I can send you the form
> off-list, and then we can proceed (you might even be able to avoid snail
> mail entirely.)
>

Yes, sure.

Aleix

[-- Attachment #2: guile-progs.patch --]
[-- Type: application/octet-stream, Size: 4559 bytes --]

From 05a621e880155849d293ce1db4155fb9a97c3c66 Mon Sep 17 00:00:00 2001
From: Aleix Conchillo Flaque <aconchillo@gmail.com>
Date: Thu, 3 Oct 2013 15:49:07 -0700
Subject: [PATCH] allow specifying a required version in GUILE_PROGS

* meta/guile.m4: GUILE_PROGS now takes an optional argument to specify a
  required Guile version. By default, it requires Guile >= 2.0. A micro
  version can also be specified (e.g. GUILE_PROGS([2.0.10])).
---
 meta/guile.m4 | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/meta/guile.m4 b/meta/guile.m4
index a3e1ef1..304dea9 100644
--- a/meta/guile.m4
+++ b/meta/guile.m4
@@ -1,17 +1,17 @@
 ## Autoconf macros for working with Guile.
 ##
-##   Copyright (C) 1998,2001, 2006, 2010, 2012 Free Software Foundation, Inc.
+##   Copyright (C) 1998,2001, 2006, 2010, 2012, 2013 Free Software Foundation, Inc.
 ##
 ## This library is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU Lesser General Public License
 ## as published by the Free Software Foundation; either version 3 of
 ## the License, or (at your option) any later version.
-## 
+##
 ## This library is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## Lesser General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this library; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
@@ -177,12 +177,15 @@ AC_DEFUN([GUILE_SITE_DIR],
 
 # GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
 #
-# Usage: GUILE_PROGS
+# Usage: GUILE_PROGS([VERSION])
 #
 # This macro looks for programs @code{guile} and @code{guild}, setting
 # variables @var{GUILE} and @var{GUILD} to their paths, respectively.
 # If @code{guile} is not found, signal an error.
 #
+# By default, this macro will search for the latest stable version of
+# Guile (e.g. 2.0).
+#
 # The effective version of the found @code{guile} is set to
 # @var{GUILE_EFFECTIVE_VERSION}.  This macro ensures that the effective
 # version is compatible with the result of a previous invocation of
@@ -195,17 +198,42 @@ AC_DEFUN([GUILE_SITE_DIR],
 #
 AC_DEFUN([GUILE_PROGS],
  [AC_PATH_PROG(GUILE,guile)
+  _guile_required_version="m4_default([$1], [2.0])"
   if test "$GUILE" = "" ; then
       AC_MSG_ERROR([guile required but not found])
   fi
   AC_SUBST(GUILE)
 
-  _guile_prog_version=`$GUILE -c "(display (effective-version))"`
+  _guile_effective_version=`$GUILE -c "(display (effective-version))"`
   if test -z "$GUILE_EFFECTIVE_VERSION"; then
-    GUILE_EFFECTIVE_VERSION=$_guile_prog_version
-  elif test "$GUILE_EFFECTIVE_VERSION" != "$_guile_prog_version"; then
-    AC_MSG_ERROR([found development files for Guile $GUILE_EFFECTIVE_VERSION, but $GUILE has effective version $_guile_prog_version])
+    GUILE_EFFECTIVE_VERSION=$_guile_effective_version
+  elif test "$GUILE_EFFECTIVE_VERSION" != "$_guile_effective_version"; then
+    AC_MSG_ERROR([found development files for Guile $GUILE_EFFECTIVE_VERSION, but $GUILE has effective version $_guile_effective_version])
+  fi
+
+  _guile_major_version=`$GUILE -c "(display (major-version))"`
+  _guile_minor_version=`$GUILE -c "(display (minor-version))"`
+  _guile_micro_version=`$GUILE -c "(display (micro-version))"`
+  _guile_prog_version="$_guile_major_version.$_guile_minor_version.$_guile_micro_version"
+
+  AC_MSG_CHECKING([for Guile version >= $_guile_required_version])
+  _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 -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])
+        fi
+      fi
+    else
+      AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
+    fi
+  else
+    AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
   fi
+  AC_MSG_RESULT([$_guile_prog_version])
 
   AC_PATH_PROG(GUILD,guild)
   AC_SUBST(GUILD)
-- 
1.8.4.rc3

Re: [PATCH] allow specifying a required version in GUILE_PROGS

[Ludovic Courtès]

Aleix Conchillo Flaqué <aconchillo@gmail.com> skribis:

> Hi!
>
> On Mon, Oct 14, 2013 at 2:05 PM, Ludovic Courtès <ludo@gnu.org> wrote:
>> Hi Aleix,
>>
>> (Second try.)
>>
>> The patch looks good to me.
>>
>> Perhaps error messages should show
>> $_guile_major_version.$_guile_minor_version.$_guile_micro_version since
>> that could differ from $_guile_prog_version (for instance in Debian
>> $_guile_prog_version is something like 2.0.9-deb42.)
>>
>
> Yes, I saw that and thought it was OK as the check was successfully
> anyway. But probably it looks better as you suggested. In the attached
> patch I don't get the version from (version) and I build
> _guile_prog_version with macro.minor.micro.

The new version looks good to me.

I forgot, but while waiting for the assignment to be on file ;-), could
you update the manual entry for ‘GUILE_PROGS’?

Thanks,
Ludo’.

Re: [PATCH] allow specifying a required version in GUILE_PROGS

[Aleix Conchillo Flaqué]

[-- Attachment #1: Type: text/plain, Size: 534 bytes --]

On Fri, Oct 18, 2013 at 2:50 PM, Ludovic Courtès <ludo@gnu.org> wrote:
>
> The new version looks good to me.
>
> I forgot, but while waiting for the assignment to be on file ;-), could
> you update the manual entry for ‘GUILE_PROGS’?
>

I already did a minor update, may be it's not enough... From looking
into the doc/ref/Makefile.am, I understood the documentation is
obtained from the guile.m4 itself, right?

I am attaching a new patch with some more documentation. Let me know
if it works.

Thanks!

Aleix

[-- Attachment #2: guile-progs.patch --]
[-- Type: application/octet-stream, Size: 4665 bytes --]

From 2864df77b6fff50897b6e981d86844c870be07bb Mon Sep 17 00:00:00 2001
From: Aleix Conchillo Flaque <aconchillo@gmail.com>
Date: Thu, 3 Oct 2013 15:49:07 -0700
Subject: [PATCH] allow specifying a required version in GUILE_PROGS

* meta/guile.m4: GUILE_PROGS now takes an optional argument to specify a
  required Guile version. By default, it requires Guile >= 2.0. A micro
  version can also be specified (e.g. GUILE_PROGS([2.0.10])).
---
 meta/guile.m4 | 45 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/meta/guile.m4 b/meta/guile.m4
index a3e1ef1..29eccec 100644
--- a/meta/guile.m4
+++ b/meta/guile.m4
@@ -1,17 +1,17 @@
 ## Autoconf macros for working with Guile.
 ##
-##   Copyright (C) 1998,2001, 2006, 2010, 2012 Free Software Foundation, Inc.
+##   Copyright (C) 1998,2001, 2006, 2010, 2012, 2013 Free Software Foundation, Inc.
 ##
 ## This library is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU Lesser General Public License
 ## as published by the Free Software Foundation; either version 3 of
 ## the License, or (at your option) any later version.
-## 
+##
 ## This library is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## Lesser General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU Lesser General Public
 ## License along with this library; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
@@ -177,12 +177,16 @@ AC_DEFUN([GUILE_SITE_DIR],
 
 # GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
 #
-# Usage: GUILE_PROGS
+# Usage: GUILE_PROGS([VERSION])
 #
 # This macro looks for programs @code{guile} and @code{guild}, setting
 # variables @var{GUILE} and @var{GUILD} to their paths, respectively.
 # If @code{guile} is not found, signal an error.
 #
+# 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
+# version is found, the macro will signal an error.
+#
 # The effective version of the found @code{guile} is set to
 # @var{GUILE_EFFECTIVE_VERSION}.  This macro ensures that the effective
 # version is compatible with the result of a previous invocation of
@@ -195,17 +199,42 @@ AC_DEFUN([GUILE_SITE_DIR],
 #
 AC_DEFUN([GUILE_PROGS],
  [AC_PATH_PROG(GUILE,guile)
+  _guile_required_version="m4_default([$1], [2.0])"
   if test "$GUILE" = "" ; then
       AC_MSG_ERROR([guile required but not found])
   fi
   AC_SUBST(GUILE)
 
-  _guile_prog_version=`$GUILE -c "(display (effective-version))"`
+  _guile_effective_version=`$GUILE -c "(display (effective-version))"`
   if test -z "$GUILE_EFFECTIVE_VERSION"; then
-    GUILE_EFFECTIVE_VERSION=$_guile_prog_version
-  elif test "$GUILE_EFFECTIVE_VERSION" != "$_guile_prog_version"; then
-    AC_MSG_ERROR([found development files for Guile $GUILE_EFFECTIVE_VERSION, but $GUILE has effective version $_guile_prog_version])
+    GUILE_EFFECTIVE_VERSION=$_guile_effective_version
+  elif test "$GUILE_EFFECTIVE_VERSION" != "$_guile_effective_version"; then
+    AC_MSG_ERROR([found development files for Guile $GUILE_EFFECTIVE_VERSION, but $GUILE has effective version $_guile_effective_version])
+  fi
+
+  _guile_major_version=`$GUILE -c "(display (major-version))"`
+  _guile_minor_version=`$GUILE -c "(display (minor-version))"`
+  _guile_micro_version=`$GUILE -c "(display (micro-version))"`
+  _guile_prog_version="$_guile_major_version.$_guile_minor_version.$_guile_micro_version"
+
+  AC_MSG_CHECKING([for Guile version >= $_guile_required_version])
+  _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 -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])
+        fi
+      fi
+    else
+      AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
+    fi
+  else
+    AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
   fi
+  AC_MSG_RESULT([$_guile_prog_version])
 
   AC_PATH_PROG(GUILD,guild)
   AC_SUBST(GUILD)
-- 
1.8.4.rc3

Re: [PATCH] allow specifying a required version in GUILE_PROGS

[Ludovic Courtès]

Hi Aleix,

Aleix Conchillo Flaqué <aconchillo@gmail.com> skribis:

> From 2864df77b6fff50897b6e981d86844c870be07bb Mon Sep 17 00:00:00 2001
> From: Aleix Conchillo Flaque <aconchillo@gmail.com>
> Date: Thu, 3 Oct 2013 15:49:07 -0700
> Subject: [PATCH] allow specifying a required version in GUILE_PROGS
>
> * meta/guile.m4: GUILE_PROGS now takes an optional argument to specify a
>   required Guile version. By default, it requires Guile >= 2.0. A micro
>   version can also be specified (e.g. GUILE_PROGS([2.0.10])).

Pushed, thanks!

As you noticed it took an unusually loooong time to process your
copyright paperwork at the FSF.  They are now aware of the problem and
are working on improving the situation.

So now there might still be bottlenecks to process your patches, but you
know who they are.  ;-)

Apologies, and thanks again!

Ludo’.

Re: [PATCH] allow specifying a required version in GUILE_PROGS

[Aleix Conchillo Flaqué]

On Sat, Dec 21, 2013 at 1:05 PM, Ludovic Courtès <ludo@gnu.org> wrote:
>
> Pushed, thanks!
>
> As you noticed it took an unusually loooong time to process your
> copyright paperwork at the FSF.  They are now aware of the problem and
> are working on improving the situation.
>
> So now there might still be bottlenecks to process your patches, but you
> know who they are.  ;-)
>
> Apologies, and thanks again!
>

Thanks to you! And no worries, no process is flawless.

Best,

Aleix