From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 09 16:34:58 2011 Received: (at submit) by debbugs.gnu.org; 9 Apr 2011 20:34:58 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q8erx-0003wN-R4 for submit@debbugs.gnu.org; Sat, 09 Apr 2011 16:34:58 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Q8erv-0003wB-Ty for submit@debbugs.gnu.org; Sat, 09 Apr 2011 16:34:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q8erp-0001Jl-Va for submit@debbugs.gnu.org; Sat, 09 Apr 2011 16:34:50 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([199.232.76.165]:36152) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q8erp-0001Jh-Te for submit@debbugs.gnu.org; Sat, 09 Apr 2011 16:34:49 -0400 Received: from [140.186.70.92] (port=50193 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q8erp-0005Sn-0l for bug-automake@gnu.org; Sat, 09 Apr 2011 16:34:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q8ern-0001JA-Pi for bug-automake@gnu.org; Sat, 09 Apr 2011 16:34:48 -0400 Received: from mail-ww0-f49.google.com ([74.125.82.49]:58521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q8ern-0001J0-IJ for bug-automake@gnu.org; Sat, 09 Apr 2011 16:34:47 -0400 Received: by wwb39 with SMTP id 39so4667309wwb.30 for ; Sat, 09 Apr 2011 13:34:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:user-agent:mime-version :content-type:content-transfer-encoding:message-id; bh=x6cTrBxLBPYYtu/wSHyAEMEYQZ+Jv+TSbtvA/Om38Y0=; b=MaDEzS4n0wQ+hwoCt0uvHl9Sd1M6SoqE4jviY5jTgrd6p1D9INjdidu7NqzjDJ2row AxnVsVsZLXfuRKACQTFRcUwV5rA1k6KEOYBNUW3Zuskr2W8QvrPbS6RzVqE8h09QRumN 0XizgSqFlP+MavCleFhkvHH0TyKM4y1OceqsQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:mime-version:content-type :content-transfer-encoding:message-id; b=T2WJB+ob3dlpPehMJXrOxjZd9xPrN2kGdzlVzIQQ8+DqkFrX1+ahTTOYEukym/3Z77 NC2Zd88qp2ALSPe2YfmvfWRaprUXzSZhGlHqXv9q3ZaMkbSSfLdPTlcwZRUB+XCvi+jU +k4kP1CtGx2BPBtSN9gTF4jGWOyk5QoDZItag= Received: by 10.216.145.135 with SMTP id p7mr1125556wej.38.1302381286462; Sat, 09 Apr 2011 13:34:46 -0700 (PDT) Received: from bigio.localnet (host251-103-dynamic.2-87-r.retail.telecomitalia.it [87.2.103.251]) by mx.google.com with ESMTPS id m2sm1931963wer.13.2011.04.09.13.34.44 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 09 Apr 2011 13:34:45 -0700 (PDT) From: Stefano Lattarini To: bug-automake@gnu.org Subject: Defining `java_JAVA' doesn't cause errors even if $(javadir) is indefined Date: Sat, 9 Apr 2011 22:34:33 +0200 User-Agent: KMail/1.13.3 (Linux/2.6.30-2-686; KDE/4.4.4; i686; ; ) MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201104092234.34030.stefano.lattarini@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 199.232.76.165 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.1 (-----) Well, the subject says it all. The following example exposes the bug: $ cat > configure.ac <<'END' AC_INIT([x], [0]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_FILES([Makefile]) END $ cat > Makefile.am <<'END' java_JAVA = foo.java END $ aclocal $ automake -a configure.ac:2: installing `./install-sh' configure.ac:2: installing `./missing' $ grep '^ *javadir' Makefile.in || echo 'javadir undefined!' javadir undefined! I can suggest three possibilities to fix this issue: 1. Define `javadir' to `$(pkgdatadir)/java' in lib/am/java.am. 2. Define `javadir' and `pkgjavadir' to respectively to `$(datadir)/java' and `$(pkgdatadir)/java' in `lib/am/java.am', and add "pkgjava" to the @prefixes passed to am_primary_prefixes() and am_install_var() calls in handle_java() in automake.in. 3. Remove "java" from the @prefixes passed to the am_primary_prefixes() and am_install_var() calls in handle_java() in automake.in. In the first two cases, the Automake manual should be adjusted accordingly. My preference lies with option 3. Opinions? Regards, Stefano From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 18 17:52:21 2011 Received: (at submit) by debbugs.gnu.org; 18 Sep 2011 21:52:21 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R5PHh-0006uy-31 for submit@debbugs.gnu.org; Sun, 18 Sep 2011 17:52:21 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R5PHS-0006ua-OP for submit@debbugs.gnu.org; Sun, 18 Sep 2011 17:52:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5PCd-0003YJ-RE for submit@debbugs.gnu.org; Sun, 18 Sep 2011 17:47:08 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([140.186.70.17]:55058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5PCd-0003YC-Pi for submit@debbugs.gnu.org; Sun, 18 Sep 2011 17:47:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5PCc-0005nY-BL for bug-automake@gnu.org; Sun, 18 Sep 2011 17:47:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5PCa-0003Xm-Jm for bug-automake@gnu.org; Sun, 18 Sep 2011 17:47:06 -0400 Received: from mail-fx0-f41.google.com ([209.85.161.41]:47370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5PCa-0003Xd-C3; Sun, 18 Sep 2011 17:47:04 -0400 Received: by fxh17 with SMTP id 17so3744728fxh.0 for ; Sun, 18 Sep 2011 14:47:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:message-id; bh=ELHYGdePFmezCnaEZWGQppWtgPUQ3PEKktqK/q5ueMc=; b=VM/8hTD2NY3GLEq86ImzfKt3yTH1gBY4skTChFxncwlmmVIShK0PmgETE0FCZQL0c1 SC1F3l2eDI4z+WjgKtUJ27ByLGHb5Ei8HreRUyneBVDHsVVwT51/VH1v3RjQRqSvl1cK eYLTPHkZmH5RRg5lG1EHYkTF63y+ILRmjuIAc= Received: by 10.223.43.211 with SMTP id x19mr1569824fae.142.1316382423182; Sun, 18 Sep 2011 14:47:03 -0700 (PDT) Received: from bigio.localnet (host170-30-dynamic.60-82-r.retail.telecomitalia.it. [82.60.30.170]) by mx.google.com with ESMTPS id n1sm19591174fad.20.2011.09.18.14.47.00 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 18 Sep 2011 14:47:01 -0700 (PDT) From: Stefano Lattarini To: bug-automake@gnu.org Subject: Re: bug#8461: Defining `java_JAVA' doesn't cause errors even if $(javadir) is indefined Date: Sun, 18 Sep 2011 23:46:48 +0200 User-Agent: KMail/1.13.7 (Linux/2.6.30-2-686; KDE/4.6.5; i686; ; ) References: <201104092234.34030.stefano.lattarini@gmail.com> In-Reply-To: <201104092234.34030.stefano.lattarini@gmail.com> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_JbmdOULWMuUi1+I" Message-Id: <201109182346.49818.stefano.lattarini@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.17 X-Spam-Score: -5.1 (-----) X-Debbugs-Envelope-To: submit Cc: 8461@debbugs.gnu.org, automake-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.2 (-----) --Boundary-00=_JbmdOULWMuUi1+I Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit tags 8461 patch close 8461 thanks Reference: I've decided to go with the third option listed there; attached is the patch I've pushed to maint. Regards, Stefano --Boundary-00=_JbmdOULWMuUi1+I Content-Type: text/x-patch; charset="utf-8"; name="0001-java-complain-if-java_JAVA-is-used-but-javadir-is-un.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="0001-java-complain-if-java_JAVA-is-used-but-javadir-is-un.patch" =46rom c9dfc368a623178f32b67b164f051e9ab65edd99 Mon Sep 17 00:00:00 2001 Message-Id: =46rom: Stefano Lattarini Date: Sun, 18 Sep 2011 23:32:38 +0200 Subject: [PATCH] java: complain if java_JAVA is used but $(javadir) is unde= fined =46ixes automake bug#8461. * automake.in (handle_java): Remove inappropriate "java" argument from the calls to `&am_install_var' and `&am_primary_prefixes'. * tests/instdir-java.test (Makefile.am): Define `$(javadir)'. * tests/javadir-undefined.test: New test. * tests/Makefile.am (TESTS): Add it. * NEWS: Update. =2D-- ChangeLog | 11 +++++++++++ NEWS | 4 ++++ automake.in | 4 ++-- tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/instdir-java.test | 1 + tests/javadir-undefined.test | 37 +++++++++++++++++++++++++++++++++++++ 7 files changed, 57 insertions(+), 2 deletions(-) create mode 100755 tests/javadir-undefined.test diff --git a/ChangeLog b/ChangeLog index 56a8d1c..8a697e6 100644 =2D-- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2011-09-18 Stefano Lattarini + + java: complain if java_JAVA is used but $(javadir) is undefined + Fixes automake bug#8461. + * automake.in (handle_java): Remove inappropriate "java" argument + from the calls to `&am_install_var' and `&am_primary_prefixes'. + * tests/instdir-java.test (Makefile.am): Define `$(javadir)'. + * tests/javadir-undefined.test: New test. + * tests/Makefile.am (TESTS): Add it. + * NEWS: Update. + 2011-09-12 Stefano Lattarini =20 cosmetics: fix various typos and grammaros diff --git a/NEWS b/NEWS index f26b332..9d3f46d 100644 =2D-- a/NEWS +++ b/NEWS @@ -93,6 +93,10 @@ Bugs fixed in 1.11.0a: - Java sources specified with check_JAVA are not compiled anymore upon "make all", but only upon "make check". =20 + - An usage like "java_JAVA =3D foo.java" will now cause Automake to warn + and error out if `javadir' is undefined, instead of silently producing + a broken Makefile.in. + - Now aclocal and automake, when they've to spawn autoconf or autom4te processes, honour the configure-time definitions of AUTOCONF and AUTOM4TE. diff --git a/automake.in b/automake.in index 208a66b..215881b 100755 =2D-- a/automake.in +++ b/automake.in @@ -5104,11 +5104,11 @@ sub handle_java { my @sourcelist =3D &am_install_var ('-candist', 'java', 'JAVA', =2D 'java', 'noinst', 'check'); + 'noinst', 'check'); return if ! @sourcelist; =20 my @prefixes =3D am_primary_prefixes ('JAVA', 1, =2D 'java', 'noinst', 'check'); + 'noinst', 'check'); =20 my $dir; my @java_sources =3D (); diff --git a/tests/Makefile.am b/tests/Makefile.am index c2dbf23..6c7139d 100644 =2D-- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -453,6 +453,7 @@ java2.test \ java3.test \ java-check.test \ java-empty-classpath.test \ +javadir-undefined.test \ javaprim.test \ javasubst.test \ java-clean.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index ad4f2c9..ab73658 100644 =2D-- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -731,6 +731,7 @@ java2.test \ java3.test \ java-check.test \ java-empty-classpath.test \ +javadir-undefined.test \ javaprim.test \ javasubst.test \ java-clean.test \ diff --git a/tests/instdir-java.test b/tests/instdir-java.test index 9d9a03c..94a6a25 100755 =2D-- a/tests/instdir-java.test +++ b/tests/instdir-java.test @@ -26,6 +26,7 @@ AC_OUTPUT END =20 cat >Makefile.am <<'END' +javadir =3D $(datarootdir)/java java_JAVA =3D foo.java END =20 diff --git a/tests/javadir-undefined.test b/tests/javadir-undefined.test new file mode 100755 index 0000000..9b6d1f3 =2D-- /dev/null +++ b/tests/javadir-undefined.test @@ -0,0 +1,37 @@ +#! /bin/sh +# Copyright (C) 2011 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 . + +# Use of JAVA primary should not allow the use of the `java_' prefix +# when $(javadir) is undefined. Otherwise, we could silently end up +# with a broken Makefile.in (where "make install" doesn't install +# the *.class files). +# See automake bug#8461. + +. ./defs || Exit 1 + +set -e + +$ACLOCAL + +echo java_JAVA =3D a.java > Makefile.am +AUTOMAKE_fails +grep '^Makefile\.am:1:.*java_JAVA.*javadir.* undefined' stderr +$EGREP '(uninitialized|line) ' stderr && Exit 1 + +echo javadir =3D a-dummy-value >> Makefile.am +$AUTOMAKE + +: =2D-=20 1.7.2.3 --Boundary-00=_JbmdOULWMuUi1+I-- From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 18 17:57:14 2011 Received: (at control) by debbugs.gnu.org; 18 Sep 2011 21:57:14 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R5PMP-00072A-Da for submit@debbugs.gnu.org; Sun, 18 Sep 2011 17:57:14 -0400 Received: from mail-fx0-f44.google.com ([209.85.161.44]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R5PMO-000723-0F for control@debbugs.gnu.org; Sun, 18 Sep 2011 17:57:12 -0400 Received: by fxd18 with SMTP id 18so3199936fxd.3 for ; Sun, 18 Sep 2011 14:52:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:references:in-reply-to:mime-version :content-type:content-transfer-encoding:message-id; bh=JM9M1xl8kdQ4bvryGO3RGa7evAtJGRyi1s+eP5kfTCI=; b=uS/sSI2P+jkDWkiBwTYRecClqGPB5T0IlzceyXpOtivZQRoAopEStQJO8/cJXkYDy3 i5DtDQCizMDKvGpRWvFj446iqrHbg3e1ycmUTYtxXDbhDWdloMDfQ5PJcGketYWdEBi5 cHpFYd6dAw2zbr5TJLWol2MWX5PqDE+o40Xko= Received: by 10.223.50.21 with SMTP id x21mr3873135faf.24.1316382733731; Sun, 18 Sep 2011 14:52:13 -0700 (PDT) Received: from bigio.localnet (host170-30-dynamic.60-82-r.retail.telecomitalia.it. [82.60.30.170]) by mx.google.com with ESMTPS id e17sm19616738fae.17.2011.09.18.14.52.12 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 18 Sep 2011 14:52:12 -0700 (PDT) From: Stefano Lattarini To: control@debbugs.gnu.org Subject: Re: bug#8461: Defining `java_JAVA' doesn't cause errors even if $(javadir) is indefined Date: Sun, 18 Sep 2011 23:52:00 +0200 User-Agent: KMail/1.13.7 (Linux/2.6.30-2-686; KDE/4.6.5; i686; ; ) References: <201104092234.34030.stefano.lattarini@gmail.com> <201109182346.49818.stefano.lattarini@gmail.com> In-Reply-To: <201109182346.49818.stefano.lattarini@gmail.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201109182352.01593.stefano.lattarini@gmail.com> X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -4.0 (----) tags 8461 patch close 8461 thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 19 12:31:01 2011 Received: (at 8461) by debbugs.gnu.org; 19 Sep 2011 16:31:01 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R5gkG-0003Kh-BF for submit@debbugs.gnu.org; Mon, 19 Sep 2011 12:31:01 -0400 Received: from mail-wy0-f172.google.com ([74.125.82.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1R5gkD-0003KZ-3S for 8461@debbugs.gnu.org; Mon, 19 Sep 2011 12:30:59 -0400 Received: by wyg24 with SMTP id 24so8246312wyg.17 for <8461@debbugs.gnu.org>; Mon, 19 Sep 2011 09:25:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:message-id; bh=/hEWYMvok1J9+3lblQVcGNe7jNH7JojtSfxNOnibapY=; b=jba15NK3mNUWYnhbFeY+szZRTd9zmMe8Iz46dZIviUT2jLTOmpxGq6J9tJs+YEm5Ok LepinmeuOxlalW2DEabId9/V57cGbhDFOnJSUSDHFFnqWv/o6urkSb9tW40AizM8Di5r s7cdyjmtiSBTIMw6OH1haxKbCzTWnAIMlrrV4= Received: by 10.216.177.132 with SMTP id d4mr3128471wem.45.1316449554294; Mon, 19 Sep 2011 09:25:54 -0700 (PDT) Received: from bigio.localnet (host186-92-dynamic.4-87-r.retail.telecomitalia.it. [87.4.92.186]) by mx.google.com with ESMTPS id p2sm2932397wbo.17.2011.09.19.09.25.51 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 19 Sep 2011 09:25:52 -0700 (PDT) From: Stefano Lattarini To: bug-automake@gnu.org Subject: Re: bug#8461: Defining `java_JAVA' doesn't cause errors even if $(javadir) is indefined Date: Mon, 19 Sep 2011 18:25:42 +0200 User-Agent: KMail/1.13.7 (Linux/2.6.30-2-686; KDE/4.6.5; i686; ; ) References: <201104092234.34030.stefano.lattarini@gmail.com> <201109182346.49818.stefano.lattarini@gmail.com> In-Reply-To: <201109182346.49818.stefano.lattarini@gmail.com> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_H02dOUdxS/+K+hY" Message-Id: <201109191825.43807.stefano.lattarini@gmail.com> X-Spam-Score: -3.9 (---) X-Debbugs-Envelope-To: 8461 Cc: 8461@debbugs.gnu.org, automake-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -3.9 (---) --Boundary-00=_H02dOUdxS/+K+hY Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Sunday 18 September 2011, Stefano Lattarini wrote: > tags 8461 patch > close 8461 > thanks > > Reference: > > > I've decided to go with the third option listed there; attached is the > patch I've pushed to maint. > > Regards, > Stefano > That change has caused a minor fallout in a test case, which I've fixed with the attached patch. Regards, Stefano --Boundary-00=_H02dOUdxS/+K+hY Content-Type: text/x-patch; charset="utf-8"; name="0001-tests-fix-spurious-failure-in-primary-prefix-valid-c.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="0001-tests-fix-spurious-failure-in-primary-prefix-valid-c.patch" =46rom d5ebf21cccd0597f53e7b3c4063dff4704e454a6 Mon Sep 17 00:00:00 2001 Message-Id: =46rom: Stefano Lattarini Date: Mon, 19 Sep 2011 18:21:25 +0200 Subject: [PATCH] tests: fix spurious failure in 'primary-prefix-valid-coupl= es.test' * tests/primary-prefix-valid-couples.test: After commit v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary combination by default anymore: one has to explicitly define $(javadir) to make it so. So just drop `java_JAVA' from our Makefile.am Also, since we are at it, ... (configure.in): ... remove AM_PROG_GCJ from here, as it's not really required. =2D-- ChangeLog | 11 +++++++++++ tests/primary-prefix-valid-couples.test | 2 -- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a697e6..6c66f9e 100644 =2D-- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2011-09-19 Stefano Lattarini + + tests: fix spurious failure in 'primary-prefix-valid-couples.test' + * tests/primary-prefix-valid-couples.test: After commit + v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary + combination by default anymore: one has to explicitly define + $(javadir) to make it so. So just drop `java_JAVA' from our + Makefile.am Also, since we are at it, ... + (configure.in): ... remove AM_PROG_GCJ from here, as it's not + really required. + 2011-09-18 Stefano Lattarini =20 java: complain if java_JAVA is used but $(javadir) is undefined diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix= =2Dvalid-couples.test index f326808..36ff5d8 100755 =2D-- a/tests/primary-prefix-valid-couples.test +++ b/tests/primary-prefix-valid-couples.test @@ -25,7 +25,6 @@ cat >> configure.in <<'END' AC_PROG_CC AC_PROG_RANLIB AC_PROG_LIBTOOL =2DAM_PROG_GCJ AM_PATH_PYTHON AM_PATH_LISPDIR END @@ -78,7 +77,6 @@ done echo "info_TEXINFOS =3D foo.texi" >> Makefile.am echo "lisp_LISP =3D foo.el" >> Makefile.am echo "python_PYTHON =3D foo.py" >> Makefile.am =2Decho "java_JAVA =3D foo.java" >> Makefile.am =20 awk '{print NR ":" $0}' Makefile.am # For debugging. =20 =2D-=20 1.7.2.3 --Boundary-00=_H02dOUdxS/+K+hY-- From unknown Sat Sep 06 02:03:47 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 18 Oct 2011 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator