From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Pirotte Newsgroups: gmane.lisp.guile.devel Subject: Master- patch - Fixing GUILE_PROGS wrong versioning checks Date: Sat, 25 Jun 2016 23:28:41 -0300 Message-ID: <20160625232841.7423f304@capac> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/63l8Fj7OriWZIQbmFWPvtER"; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1466908187 11889 80.91.229.3 (26 Jun 2016 02:29:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 26 Jun 2016 02:29:47 +0000 (UTC) To: guile-devel Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Sun Jun 26 04:29:38 2016 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bGzpJ-0006dO-SH for guile-devel@m.gmane.org; Sun, 26 Jun 2016 04:29:38 +0200 Original-Received: from localhost ([::1]:52201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGzpI-0001Z6-Jg for guile-devel@m.gmane.org; Sat, 25 Jun 2016 22:29:36 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGzp4-0001Yy-4X for guile-devel@gnu.org; Sat, 25 Jun 2016 22:29:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bGzoz-0000jD-Vc for guile-devel@gnu.org; Sat, 25 Jun 2016 22:29:21 -0400 Original-Received: from maximusconfessor.all2all.org ([79.99.200.102]:50291) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGzoz-0000XA-KI for guile-devel@gnu.org; Sat, 25 Jun 2016 22:29:17 -0400 Original-Received: from localhost (unknown [192.168.0.2]) by maximusconfessor.all2all.org (Postfix) with ESMTP id 33D31A04C0DE for ; Sun, 26 Jun 2016 04:28:53 +0200 (CEST) Original-Received: from maximusconfessor.all2all.org ([192.168.0.1]) by localhost (maximusconfessor.all2all.org [192.168.0.2]) (amavisd-new, port 10024) with ESMTP id YXr-Ge9xA84Y for ; Sun, 26 Jun 2016 04:28:48 +0200 (CEST) Original-Received: from capac (unknown [177.40.150.46]) by maximusconfessor.all2all.org (Postfix) with ESMTPSA id 63F4CA04C0CC for ; Sun, 26 Jun 2016 04:28:48 +0200 (CEST) X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 79.99.200.102 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.org gmane.lisp.guile.devel:18441 Archived-At: --Sig_/63l8Fj7OriWZIQbmFWPvtER Content-Type: multipart/mixed; boundary="MP_/Ssrf7NCv=pmRlrSATKG.bsb" --MP_/Ssrf7NCv=pmRlrSATKG.bsb Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline 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 c= ase we don't want that... Cheers, David --MP_/Ssrf7NCv=pmRlrSATKG.bsb Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0003-Fixing-GUILE_PROGS-wrong-versioning-checks.patch =46rom 2d1593a6f9c7fc5f1636f9695e8685fcc6334cfd Mon Sep 17 00:00:00 2001 From: David Pirotte 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 >=3D 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=3D`echo $_guile_required_version | cut -d . -f 1` _minor_version=3D`echo $_guile_required_version | cut -d . -f 2` _micro_version=3D`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 $_gui= le_prog_version found]) --=20 2.8.1 --MP_/Ssrf7NCv=pmRlrSATKG.bsb-- --Sig_/63l8Fj7OriWZIQbmFWPvtER Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJXbz3ZAAoJEPN0/ZOjBXrXg1kH/io0wVzGGGqd6ETSjQ+fEPtW l/w6UYYvefZ5JPxMxDGuE5YsLaECaIdAg15wCz+f8VfyANt03CT6dNnTh43SgNSG 3mouPB5U96T5DfzYZT1onsu+Nz8Xr6Dh2EN4EjiY9OiXMaOiTuRKdZhApDf1P0Vc cwJ9upQaTLntKtO02xTMIsnfz/aQLqrrBRX2LGP2Db4FuqN9LCh3KMkwW7db0PgF 9V6G/aOTS1cov0E6h8m+Dohx6FMuzkprIgWWPgGUlU3DgKFUVRM6kPk1GeraCf9A vam+LkLijOIbEipQxtQ/JY6DCpwTLre7EWuq+lLZKa1CnEw33zJGoay+MncTgKM= =2tYn -----END PGP SIGNATURE----- --Sig_/63l8Fj7OriWZIQbmFWPvtER--