Mathieu Lirzin <mthl@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Mathieu Lirzin <mthl@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 30126) by debbugs.gnu.org; 20 Feb 2018 19:56:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Feb 20 14:56:13 2018 Received: from localhost ([127.0.0.1]:53242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1eoE1C-0007EV-6L for submit <at> debbugs.gnu.org; Tue, 20 Feb 2018 14:56:13 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34235) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mthl@HIDDEN>) id 1eoE11-0007Dt-LA for 30126 <at> debbugs.gnu.org; Tue, 20 Feb 2018 14:56:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <mthl@HIDDEN>) id 1eoE0v-0003pk-1m for 30126 <at> debbugs.gnu.org; Tue, 20 Feb 2018 14:55:46 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <mthl@HIDDEN>) id 1eoE0n-0003ie-S6; Tue, 20 Feb 2018 14:55:37 -0500 Received: from [2a01:e35:2ec2:e580:7d5f:f616:fc6f:3970] (port=33916 helo=godel) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from <mthl@HIDDEN>) id 1eoE0n-0006Uv-1W; Tue, 20 Feb 2018 14:55:37 -0500 From: Mathieu Lirzin <mthl@HIDDEN> To: Paolo Bonzini <bonzini@HIDDEN> Subject: Re: bug#30126: Do not require =?utf-8?B?4oCcbHRtYWluLnNo4oCd?= for out-of-tree libtool References: <1477917050-23989-1-git-send-email-bonzini@HIDDEN> <36c494ee-616f-e830-4a61-e1c89dd31dc2@HIDDEN> <87efq2knfr.fsf@HIDDEN> <87tvvncgwr.fsf_-_@HIDDEN> <877esieotj.fsf@HIDDEN> Date: Tue, 20 Feb 2018 20:55:33 +0100 In-Reply-To: <877esieotj.fsf@HIDDEN> (Mathieu Lirzin's message of "Mon, 15 Jan 2018 23:31:52 +0100") Message-ID: <878tbnv3ka.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 30126 Cc: eggert@HIDDEN, 30126 <at> debbugs.gnu.org, automake-patches@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -5.0 (-----) --=-=-= Content-Type: text/plain Hello, Mathieu Lirzin <mthl@HIDDEN> writes: > Mathieu Lirzin <mthl@HIDDEN> writes: > >>>>From a936b7d4cf8583ace0be6756b4b066a2c1aebe18 Mon Sep 17 00:00:00 2001 >> From: Paolo Bonzini <bonzini@HIDDEN> >> Date: Mon, 31 Oct 2016 13:30:50 +0100 >> Subject: [PATCH] automake: Do not require ltmain.sh for out-of-tree libtool >> >> If Automake does not see LT_SUPPORTED_TAG, it assumes an old libtool >> that does not know about AC_REQUIRE_AUX_FILE. However, if the program >> does not use Libtool's configure.ac macros this check gets a >> false positive. Do not require ltmain.sh if no Libtool macro is >> found in configure.ac. >> >> * bin/automake.in ($libtool_bundled): New variable. >> (handle_libtool): Do not require libtool files if libtool is not being >> bundled. >> (scan_autoconf_traces): Set $libtool_bundled. Trace AC_PROG_LIBTOOL. >> --- > > Would you have some time to allocate on a test for this patch in the > following days/weeks? I would like to be able to merge it before > releasing Automake 1.16? I have implemented the test myself, however I still don't understand how the following scenario could reasonably happen. So could you explain me how such configuration could happen so that I can include it as a rationale describing the test? Thanks. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-tests-Add-t-libtool-when-required.sh.patch From 196fc03864028e022b7a590b50c5711c6754e42b Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin <mthl@HIDDEN> Date: Tue, 20 Feb 2018 11:14:54 +0100 Subject: [PATCH] =?UTF-8?q?tests:=20Add=20=E2=80=9Ct/libtool-when-required?= =?UTF-8?q?.sh=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * t/libtool-when-required.sh: New failing test for bug#30126. * t/list-of-tests.mk (handwritten_TESTS, XFAIL_TESTS): Add it. --- t/libtool-when-required.sh | 36 ++++++++++++++++++++++++++++++++++++ t/list-of-tests.mk | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 t/libtool-when-required.sh diff --git a/t/libtool-when-required.sh b/t/libtool-when-required.sh new file mode 100644 index 000000000..d5f93814f --- /dev/null +++ b/t/libtool-when-required.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# Copyright (C) 2018 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + +# Make sure Automake does not require libtool files when no libtool macros are +# used. + +. test-init.sh + +cat >> configure.ac <<'END' +AC_PROG_CC +AC_SUBST([LIBTOOL], [libtool]) +AM_PROG_AR +AC_OUTPUT +END + +cat >> Makefile.am <<'END' +lib_LTLIBRARIES = libfoo.la +END + +$ACLOCAL +AUTOMAKE_run -d 'should not complain about missing ltmain.sh' -- --add-missing + +: diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 271bfb573..8fdd076aa 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -38,6 +38,7 @@ t/override-conditional-pr13940.sh \ t/dist-pr109765.sh \ t/instdir-cond2.sh \ t/java-nobase.sh \ +t/libtool-when-required.sh \ t/objext-pr10128.sh \ t/remake-timing-bug-pr8365.sh \ t/lex-subobj-nodep.sh \ @@ -638,6 +639,7 @@ t/libtool8.sh \ t/libtool9.sh \ t/libtoo10.sh \ t/libtoo11.sh \ +t/libtool-when-required.sh \ t/license.sh \ t/license2.sh \ t/link_c_cxx.sh \ -- 2.16.1 --=-=-= Content-Type: text/plain -- Mathieu Lirzin GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37 --=-=-=--
bug-automake@HIDDEN:bug#30126; Package automake.
Full text available.Received: (at 30126) by debbugs.gnu.org; 15 Jan 2018 22:32:15 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 15 17:32:15 2018 Received: from localhost ([127.0.0.1]:57863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ebDId-0006Cl-6T for submit <at> debbugs.gnu.org; Mon, 15 Jan 2018 17:32:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mthl@HIDDEN>) id 1ebDIa-0006CY-EM for 30126 <at> debbugs.gnu.org; Mon, 15 Jan 2018 17:32:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <mthl@HIDDEN>) id 1ebDIU-0001KM-CE for 30126 <at> debbugs.gnu.org; Mon, 15 Jan 2018 17:32:07 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <mthl@HIDDEN>) id 1ebDIK-0001GY-Rz; Mon, 15 Jan 2018 17:31:56 -0500 Received: from [2a01:e35:2ec2:e580:7d5f:f616:fc6f:3970] (port=50566 helo=godel) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from <mthl@HIDDEN>) id 1ebDII-0004Vy-Je; Mon, 15 Jan 2018 17:31:55 -0500 From: Mathieu Lirzin <mthl@HIDDEN> To: Paolo Bonzini <bonzini@HIDDEN> Subject: Re: bug#30126: Do not require =?utf-8?B?4oCcbHRtYWluLnNo4oCd?= for out-of-tree libtool References: <1477917050-23989-1-git-send-email-bonzini@HIDDEN> <36c494ee-616f-e830-4a61-e1c89dd31dc2@HIDDEN> <87efq2knfr.fsf@HIDDEN> <87tvvncgwr.fsf_-_@HIDDEN> Date: Mon, 15 Jan 2018 23:31:52 +0100 In-Reply-To: <87tvvncgwr.fsf_-_@HIDDEN> (Mathieu Lirzin's message of "Mon, 15 Jan 2018 15:53:24 +0100") Message-ID: <877esieotj.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 30126 Cc: eggert@HIDDEN, 30126 <at> debbugs.gnu.org, automake-patches@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -5.0 (-----) Hello Paolo, Mathieu Lirzin <mthl@HIDDEN> writes: >>From a936b7d4cf8583ace0be6756b4b066a2c1aebe18 Mon Sep 17 00:00:00 2001 > From: Paolo Bonzini <bonzini@HIDDEN> > Date: Mon, 31 Oct 2016 13:30:50 +0100 > Subject: [PATCH] automake: Do not require ltmain.sh for out-of-tree libtool > > If Automake does not see LT_SUPPORTED_TAG, it assumes an old libtool > that does not know about AC_REQUIRE_AUX_FILE. However, if the program > does not use Libtool's configure.ac macros this check gets a > false positive. Do not require ltmain.sh if no Libtool macro is > found in configure.ac. > > * bin/automake.in ($libtool_bundled): New variable. > (handle_libtool): Do not require libtool files if libtool is not being > bundled. > (scan_autoconf_traces): Set $libtool_bundled. Trace AC_PROG_LIBTOOL. > --- Would you have some time to allocate on a test for this patch in the following days/weeks? I would like to be able to merge it before releasing Automake 1.16? Thanks. -- Mathieu Lirzin GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
bug-automake@HIDDEN:bug#30126; Package automake.
Full text available.Mathieu Lirzin <mthl@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Mathieu Lirzin <mthl@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at submit) by debbugs.gnu.org; 15 Jan 2018 14:53:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 15 09:53:58 2018
Received: from localhost ([127.0.0.1]:56863 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1eb695-0002Am-E0
for submit <at> debbugs.gnu.org; Mon, 15 Jan 2018 09:53:58 -0500
Received: from eggs.gnu.org ([208.118.235.92]:32970)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mthl@HIDDEN>) id 1eb693-0002AQ-NF
for submit <at> debbugs.gnu.org; Mon, 15 Jan 2018 09:53:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <mthl@HIDDEN>) id 1eb68x-0006QE-KA
for submit <at> debbugs.gnu.org; Mon, 15 Jan 2018 09:53:48 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level:
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD
autolearn=disabled version=3.3.2
Received: from lists.gnu.org ([2001:4830:134:3::11]:54918)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <mthl@HIDDEN>) id 1eb68x-0006Q2-GE
for submit <at> debbugs.gnu.org; Mon, 15 Jan 2018 09:53:47 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52167)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <mthl@HIDDEN>) id 1eb68u-0000Ur-MV
for bug-automake@HIDDEN; Mon, 15 Jan 2018 09:53:47 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <mthl@HIDDEN>) id 1eb68q-0006KI-Nv
for bug-automake@HIDDEN; Mon, 15 Jan 2018 09:53:44 -0500
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:49084)
by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <mthl@HIDDEN>)
id 1eb68d-00068F-9p; Mon, 15 Jan 2018 09:53:27 -0500
Received: from [2a01:e35:2ec2:e580:7d5f:f616:fc6f:3970] (port=41142 helo=godel)
by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
(Exim 4.82) (envelope-from <mthl@HIDDEN>)
id 1eb68c-0001UE-Gt; Mon, 15 Jan 2018 09:53:26 -0500
From: Mathieu Lirzin <mthl@HIDDEN>
To: bug-automake@HIDDEN
Subject: Do not require =?utf-8?B?4oCcbHRtYWluLnNo4oCd?= for out-of-tree
libtool
References: <1477917050-23989-1-git-send-email-bonzini@HIDDEN>
<36c494ee-616f-e830-4a61-e1c89dd31dc2@HIDDEN>
<87efq2knfr.fsf@HIDDEN>
Date: Mon, 15 Jan 2018 15:53:24 +0100
In-Reply-To: <87efq2knfr.fsf@HIDDEN> (Mathieu Lirzin's message of "Tue, 17
Oct 2017 13:45:28 +0200")
Message-ID: <87tvvncgwr.fsf_-_@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 2001:4830:134:3::11
X-Spam-Score: -5.0 (-----)
X-Debbugs-Envelope-To: submit
Cc: Paolo Bonzini <bonzini@HIDDEN>, eggert@HIDDEN,
automake-patches@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -5.0 (-----)
--=-=-=
Content-Type: text/plain
I am opening a bug to keep track of this.
Mathieu Lirzin <mthl@HIDDEN> writes:
> Paolo Bonzini <bonzini@HIDDEN> writes:
>
>> On 31/10/2016 13:30, Paolo Bonzini wrote:
>>> If Automake does not see LT_SUPPORTED_TAG, it assumes an old libtool
>>> that does not know about AC_REQUIRE_AUX_FILE. However, if the program
>>> does not use Libtool's configure.ac macros this check gets a
>>> false positive. Do not require ltmain.sh if no Libtool macro is
>>> found in configure.ac.
>>>
>>> Libtools that are not stone-age are already covered by LT_SUPPORTED_TAG
>>> and _LT_AC_TAGCONFIG, but add AC_PROG_LIBTOOL just in case for Libtool
>>> up to 1.4.
>>
>> This patch was never applied.
>>
>> Paolo
>>
>>> 2016-10-31 Paolo Bonzini <bonzini@HIDDEN>
>>>
>>> * bin/automake.in ($libtool_bundled): New.
>>> (handle_libtool): Do not require libtool files if libtool is
>>> not being bundled.
>>> (scan_autoconf_traces): Set $libtool_bundled. Trace
>>> AC_PROG_LIBTOOL too.
>>>
>>> Signed-off-by: Paolo Bonzini <bonzini@HIDDEN>
>>> ---
>>> If the patch is accepted I will send an Autoconf patch to
>>> preselect AC_PROG_LIBTOOL.
>>>
>>> Since this is a bug, it would be nice to add it at least to
>>> the 1.16 branch.
>>>
>>> bin/automake.in | 12 +++++++++++-
>>> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> I haven't tested this, and I am not a Libtool expert so I trust your
> analysis.
>
> What do you think of adding a test ensuring that ltmain.sh is not
> required when no Libtool macro is found?
>
> I have attached a updated patch with trivial formatting and comment
> changes.
Here is the current version of the patch which needs a test to be
merged.
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline;
filename=0001-automake-Do-not-require-ltmain.sh-for-out-of-tree-li.patch
From a936b7d4cf8583ace0be6756b4b066a2c1aebe18 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonzini@HIDDEN>
Date: Mon, 31 Oct 2016 13:30:50 +0100
Subject: [PATCH] automake: Do not require ltmain.sh for out-of-tree libtool
If Automake does not see LT_SUPPORTED_TAG, it assumes an old libtool
that does not know about AC_REQUIRE_AUX_FILE. However, if the program
does not use Libtool's configure.ac macros this check gets a
false positive. Do not require ltmain.sh if no Libtool macro is
found in configure.ac.
* bin/automake.in ($libtool_bundled): New variable.
(handle_libtool): Do not require libtool files if libtool is not being
bundled.
(scan_autoconf_traces): Set $libtool_bundled. Trace AC_PROG_LIBTOOL.
---
bin/automake.in | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/bin/automake.in b/bin/automake.in
index 5e36c0f..b7fbe96 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -344,6 +344,8 @@ my @extra_recursive_targets = ();
# Lists of tags supported by Libtool.
my %libtool_tags = ();
+# 1 if Libtool is being bundled, so ltmain.sh is required.
+my $libtool_bundled = 0;
# 1 if Libtool uses LT_SUPPORTED_TAG. If it does, then it also
# uses AC_REQUIRE_AUX_FILE.
my $libtool_new_api = 0;
@@ -2524,7 +2526,7 @@ sub handle_libtool ()
# (Starting with Libtool 2.0 we do not have to bother. These
# requirements are done with AC_REQUIRE_AUX_FILE.)
require_conf_file_with_macro (TRUE, 'LIBTOOL', FOREIGN, @libtool_files)
- if $relative_dir eq '.' && ! $libtool_new_api;
+ if $relative_dir eq '.' && $libtool_bundled && ! $libtool_new_api;
my @libtool_rms;
foreach my $item (sort keys %libtool_clean_directories)
@@ -5239,6 +5241,7 @@ sub scan_autoconf_traces
_AM_COND_IF => 1,
_AM_COND_ELSE => 1,
_AM_COND_ENDIF => 1,
+ AC_PROG_LIBTOOL => 0,
LT_SUPPORTED_TAG => 1,
_LT_AC_TAGCONFIG => 0,
m4_include => 1,
@@ -5482,10 +5485,17 @@ EOF
if $mtime > $configure_deps_greatest_timestamp;
}
}
+ elsif ($macro eq 'AC_PROG_LIBTOOL')
+ {
+ # Detect bundling of really old Libtool up to 1.4 that does not
+ # support tags.
+ $libtool_bundled = 1;
+ }
elsif ($macro eq 'LT_SUPPORTED_TAG')
{
$libtool_tags{$args[1]} = 1;
$libtool_new_api = 1;
+ $libtool_bundled = 1;
}
elsif ($macro eq '_LT_AC_TAGCONFIG')
{
@@ -5498,6 +5508,7 @@ EOF
# Hardcode the tags supported by Libtool 1.5.
%libtool_tags = (CC => 1, CXX => 1, GCJ => 1, F77 => 1);
}
+ $libtool_bundled = 1;
}
}
--
2.9.5
--=-=-=
Content-Type: text/plain
--
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
--=-=-=--
Mathieu Lirzin <mthl@HIDDEN>:bug-automake@HIDDEN.
Full text available.bug-automake@HIDDEN:bug#30126; Package automake.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.