diff options
| author | David Pirotte <david@altosw.be> | 2016-06-25 23:07:48 -0300 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2016-06-27 10:07:13 +0200 |
| commit | ed39782c2a000c1e3f49c314e2f71bd9de64a694 (patch) | |
| tree | c7fb960f22d0ead9d2f8e2282deaeaadae508420 /meta | |
| parent | cce3ea2b5979a0b156bd25ee72bae270529a4239 (diff) | |
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.
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/guile.m4 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/guile.m4 b/meta/guile.m4 index dd3c212e8..9fd4f1a9f 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]) |