From unknown Sat Jun 14 19:14:58 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78518] [PATCH] algol68: rename A68C and A68CFLAGS back to A68 and A68FLAGS Resent-From: "Jose E. Marchesi" Original-Sender: "Debbugs-submit" Resent-CC: automake-patches@gnu.org Resent-Date: Tue, 20 May 2025 22:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78518 X-GNU-PR-Package: automake-patches X-GNU-PR-Keywords: patch To: 78518@debbugs.gnu.org X-Debbugs-Original-To: automake-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174778006517955 (code B ref -1); Tue, 20 May 2025 22:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 May 2025 22:27:45 +0000 Received: from localhost ([127.0.0.1]:38239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHVR2-0004fX-WB for submit@debbugs.gnu.org; Tue, 20 May 2025 18:27:45 -0400 Received: from lists.gnu.org ([2001:470:142::17]:54798) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHVQz-0004ek-QA for submit@debbugs.gnu.org; Tue, 20 May 2025 18:27:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uHVQu-0008Jt-5s for automake-patches@gnu.org; Tue, 20 May 2025 18:27:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uHVQt-0005Rf-T1 for automake-patches@gnu.org; Tue, 20 May 2025 18:27:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=XSkkLm7vOgITEDFyhInNEzE1zmi3mRlggvjc5dwr0EE=; b=rH6awprmWczrF+ p55+gP9CgiMfi+dI44zPMkKUqLhuUNN8RneElU9GNXVpjswD+gvC+r+9Bg7MyWkI0D0AYOqFz1UcW 2xSB00FBaamEmVhmA5h/rEpLmZWi995WUnyOLX1Hrj7OBxns+/dQlAyDaacDSaJoTPbvvyc92J+x7 dd1bPMp88N158u4ZCG9CIGZ3RG6Q/7N31yaG912joKz+Wk+V2sgEMZs1v+Jz21S2BhZcOHIA+ISbB 3XF2nlaa87dVocVcpJzWX8l92efPFa9tXJK+hQXQtFi34ctn5hZuJ2Sw7dXMj4vjAxdN2s5XFfNyo Li5cv8QX0l+B+LvsD/Pg==; From: "Jose E. Marchesi" Date: Wed, 21 May 2025 00:27:24 +0200 Message-ID: <87frgyhq9f.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is the result of the discussion at https://lists.gnu.org/archive/html/automake-patches/2025-05/msg00006.html * bin/automake.in: Rename A68C and A68CFLAGS to A68 and A68FLAGS. * doc/automake.texi: Likewise. * configure.ac: Rename GNU_A68C and GNU_A68FLAGS to GNU_A68 and GNU_A68FLAGS. * lib/Automake/Variable.pm: Likewise. * t/a68-demo.sh: Likewise. diff --git a/bin/automake.in b/bin/automake.in index c0b2aea4c..bb60a6355 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -1024,18 +1024,18 @@ register_language ('name' => 'java', # Algol 68 in GCC register_language ('name' => 'a68', 'Name' => 'Algol 68', - 'config_vars' => ['A68C'], + 'config_vars' => ['A68'], 'linker' => 'A68LINK', - 'link' => '$(A68LD) $(AM_A68CFLAGS) $(A68CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@', + 'link' => '$(A68LD) $(AM_A68FLAGS) $(A68FLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@', 'flags' => ['A68FLAGS'], - 'compile' => '$(A68C) $(AM_A68CFLAGS) $(A68CFLAGS)', - 'ccer' => 'A68C', + 'compile' => '$(A68) $(AM_A68FLAGS) $(A68FLAGS)', + 'ccer' => 'A68', 'compiler' => 'A68COMPILE', 'compile_flag' => '-c', 'output_flag' => '-o', - 'libtool_tag' => 'A68C', + 'libtool_tag' => 'A68', 'lder' => 'A68LD', - 'ld' => '$(A68C)', + 'ld' => '$(A68)', 'pure' => 1, 'extensions' => ['.a68']); @@ -5581,7 +5581,7 @@ EOF { # Hardcode the tags supported by Libtool 1.5. %libtool_tags = (CC => 1, CXX => 1, GCJ => 1, F77 => 1, - A68C => 1); + A68 => 1); } } } @@ -6201,12 +6201,12 @@ my %_am_macro_for_cond = ( AMDEP => "one of the compiler tests\n" . " AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC, AC_PROG_OBJCXX,\n" - . " AM_PROG_AS, AM_PROG_GCJ, AM_PROG_UPC, AM_PROG_A68C", + . " AM_PROG_AS, AM_PROG_GCJ, AM_PROG_UPC, AM_PROG_A68", am__fastdepCC => 'AC_PROG_CC', am__fastdepCCAS => 'AM_PROG_AS', am__fastdepCXX => 'AC_PROG_CXX', am__fastdepGCJ => 'AM_PROG_GCJ', - am__fastdepA68 => 'AM_PROG_A68C', + am__fastdepA68 => 'AM_PROG_A68', am__fastdepOBJC => 'AC_PROG_OBJC', am__fastdepOBJCXX => 'AC_PROG_OBJCXX', am__fastdepUPC => 'AM_PROG_UPC' diff --git a/configure.ac b/configure.ac index 0cfa093e8..e2422639b 100644 --- a/configure.ac +++ b/configure.ac @@ -567,10 +567,10 @@ fi # GNU Algol 68 compiler. AC_ARG_VAR([GNU_A68], [GNU Algol 68 compiler]) -AC_ARG_VAR([GNU_A68CFLAGS], [GNU Algol 68 compiler flags]) +AC_ARG_VAR([GNU_A68FLAGS], [GNU Algol 68 compiler flags]) AC_CHECK_TOOLS([GNU_A68], [ga68], [false]) if test "$GNU_A68" != false; then - AS_IF([AM_RUN_LOG([$GNU_A68 --version && $GNU_A68 -v])], [], + AS_IF([AM_RUN_LOG([$GNU_A68 --version])], [], [AC_MSG_WARN([botched installation for GNU Algol 68 compiler]) _AM_SKIP_COMP_TESTS([GNU Algol 68])]) fi diff --git a/doc/automake.texi b/doc/automake.texi index 608c0a8d6..042ef6599 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -7192,22 +7192,22 @@ source file. Automake includes support for Algol 68, using GCC. Any package including Algol 68 code must define the output variable -@code{A68C} in @file{configure.ac}; the simplest way to do this is to use -the @code{AC_PROG_A68C} macro (@pxref{Particular Programs, , Particular +@code{A68} in @file{configure.ac}; the simplest way to do this is to use +the @code{AC_PROG_A68} macro (@pxref{Particular Programs, , Particular Program Checks, autoconf, The Autoconf Manual}). A few additional variables are defined when an Algol 68 source file is seen: @vtable @code -@item A68C +@item A68 The name of the Algol 68 compiler. -@item A68CFLAGS +@item A68FLAGS Any flags to pass to the Algol 68 compiler. -@item AM_A68CFLAGS -The maintainer's variant of @code{A68CFLAGS}. +@item AM_A68FLAGS +The maintainer's variant of @code{A68FLAGS}. @item A68COMPILE The command used to compile an Algol 68 source file. The file name is diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index 2222b98e7..d454ff755 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -180,8 +180,8 @@ my %_ac_macro_for_var = CXX => 'AC_PROG_CXX', CXXFLAGS => 'AC_PROG_CXX', F77 => 'AC_PROG_F77', - A68 => 'AC_PROG_A68C', - A68CFLAGS => 'AC_PROG_A68C', + A68 => 'AC_PROG_A68', + A68FLAGS => 'AC_PROG_A68', FFLAGS => 'AC_PROG_F77', FC => 'AC_PROG_FC', FCFLAGS => 'AC_PROG_FC', diff --git a/t/a68-demo.sh b/t/a68-demo.sh index a69d2328b..38065a4a3 100644 --- a/t/a68-demo.sh +++ b/t/a68-demo.sh @@ -25,7 +25,7 @@ AC_INIT([GNU Algol 68 Demo], [1.0], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR([play.a68]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE -AC_PROG_A68C +AC_PROG_A68 AC_CONFIG_FILES([Makefile]) AC_OUTPUT END From unknown Sat Jun 14 19:14:58 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78518] [PATCH] algol68: rename A68C and A68CFLAGS back to A68 and A68FLAGS References: <87frgyhq9f.fsf@gnu.org> Resent-From: Karl Berry Original-Sender: "Debbugs-submit" Resent-CC: automake-patches@gnu.org Resent-Date: Wed, 21 May 2025 20:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78518 X-GNU-PR-Package: automake-patches X-GNU-PR-Keywords: patch To: jemarch@gnu.org Cc: 78518@debbugs.gnu.org, 78518-done@debbugs.gnu.org, 78033-done@debbugs.gnu.org, 78481-done@debbugs.gnu.org Received: via spool by 78518-submit@debbugs.gnu.org id=B78518.174785874621765 (code B ref 78518); Wed, 21 May 2025 20:20:02 +0000 Received: (at 78518) by debbugs.gnu.org; 21 May 2025 20:19:06 +0000 Received: from localhost ([127.0.0.1]:53308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHpu6-0005ep-9C for submit@debbugs.gnu.org; Wed, 21 May 2025 16:19:06 -0400 Received: from frenzy.freefriends.org ([198.99.81.75]:36450 helo=freefriends.org) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHptd-0005ac-AY; Wed, 21 May 2025 16:18:38 -0400 X-Envelope-From: karl@freefriends.org Received: from freefriends.org (localhost [127.0.0.1]) by freefriends.org (8.16.1/8.16.1) with ESMTPS id 54LKIa9K3194612 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 21 May 2025 14:18:36 -0600 Received: (from apache@localhost) by freefriends.org (8.16.1/8.14.7/Submit) id 54LKIaGk3194611; Wed, 21 May 2025 14:18:36 -0600 Date: Wed, 21 May 2025 14:18:36 -0600 Message-Id: <202505212018.54LKIaGk3194611@freefriends.org> From: Karl Berry In-Reply-To: <87frgyhq9f.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Installed, and closing this (and related bugs from the same discussion). Thanks Jose. -k From unknown Sat Jun 14 19:14:58 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: "Jose E. Marchesi" Subject: bug#78518: closed (Re: [bug#78518] [PATCH] algol68: rename A68C and A68CFLAGS back to A68 and A68FLAGS) Message-ID: References: <202505212018.54LKIaGk3194611@freefriends.org> <87frgyhq9f.fsf@gnu.org> X-Gnu-PR-Message: they-closed 78518 X-Gnu-PR-Package: automake-patches X-Gnu-PR-Keywords: patch Reply-To: 78518@debbugs.gnu.org Date: Wed, 21 May 2025 20:20:04 +0000 Content-Type: multipart/mixed; boundary="----------=_1747858804-22040-1" This is a multi-part message in MIME format... ------------=_1747858804-22040-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #78518: [PATCH] algol68: rename A68C and A68CFLAGS back to A68 and A68FLAGS which was filed against the automake-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 78518@debbugs.gnu.org. --=20 78518: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78518 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1747858804-22040-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 78518-done) by debbugs.gnu.org; 21 May 2025 20:19:05 +0000 Received: from localhost ([127.0.0.1]:53290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHpu1-0005dI-W1 for submit@debbugs.gnu.org; Wed, 21 May 2025 16:19:05 -0400 Received: from frenzy.freefriends.org ([198.99.81.75]:36450 helo=freefriends.org) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHptd-0005ac-AY; Wed, 21 May 2025 16:18:38 -0400 X-Envelope-From: karl@freefriends.org Received: from freefriends.org (localhost [127.0.0.1]) by freefriends.org (8.16.1/8.16.1) with ESMTPS id 54LKIa9K3194612 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 21 May 2025 14:18:36 -0600 Received: (from apache@localhost) by freefriends.org (8.16.1/8.14.7/Submit) id 54LKIaGk3194611; Wed, 21 May 2025 14:18:36 -0600 Date: Wed, 21 May 2025 14:18:36 -0600 Message-Id: <202505212018.54LKIaGk3194611@freefriends.org> From: Karl Berry To: jemarch@gnu.org Subject: Re: [bug#78518] [PATCH] algol68: rename A68C and A68CFLAGS back to A68 and A68FLAGS In-Reply-To: <87frgyhq9f.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78518-done Cc: 78518@debbugs.gnu.org, 78518-done@debbugs.gnu.org, 78033-done@debbugs.gnu.org, 78481-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Installed, and closing this (and related bugs from the same discussion). Thanks Jose. -k ------------=_1747858804-22040-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 20 May 2025 22:27:45 +0000 Received: from localhost ([127.0.0.1]:38239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHVR2-0004fX-WB for submit@debbugs.gnu.org; Tue, 20 May 2025 18:27:45 -0400 Received: from lists.gnu.org ([2001:470:142::17]:54798) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHVQz-0004ek-QA for submit@debbugs.gnu.org; Tue, 20 May 2025 18:27:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uHVQu-0008Jt-5s for automake-patches@gnu.org; Tue, 20 May 2025 18:27:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uHVQt-0005Rf-T1 for automake-patches@gnu.org; Tue, 20 May 2025 18:27:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=XSkkLm7vOgITEDFyhInNEzE1zmi3mRlggvjc5dwr0EE=; b=rH6awprmWczrF+ p55+gP9CgiMfi+dI44zPMkKUqLhuUNN8RneElU9GNXVpjswD+gvC+r+9Bg7MyWkI0D0AYOqFz1UcW 2xSB00FBaamEmVhmA5h/rEpLmZWi995WUnyOLX1Hrj7OBxns+/dQlAyDaacDSaJoTPbvvyc92J+x7 dd1bPMp88N158u4ZCG9CIGZ3RG6Q/7N31yaG912joKz+Wk+V2sgEMZs1v+Jz21S2BhZcOHIA+ISbB 3XF2nlaa87dVocVcpJzWX8l92efPFa9tXJK+hQXQtFi34ctn5hZuJ2Sw7dXMj4vjAxdN2s5XFfNyo Li5cv8QX0l+B+LvsD/Pg==; From: "Jose E. Marchesi" To: automake-patches@gnu.org Subject: [PATCH] algol68: rename A68C and A68CFLAGS back to A68 and A68FLAGS Date: Wed, 21 May 2025 00:27:24 +0200 Message-ID: <87frgyhq9f.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is the result of the discussion at https://lists.gnu.org/archive/html/automake-patches/2025-05/msg00006.html * bin/automake.in: Rename A68C and A68CFLAGS to A68 and A68FLAGS. * doc/automake.texi: Likewise. * configure.ac: Rename GNU_A68C and GNU_A68FLAGS to GNU_A68 and GNU_A68FLAGS. * lib/Automake/Variable.pm: Likewise. * t/a68-demo.sh: Likewise. diff --git a/bin/automake.in b/bin/automake.in index c0b2aea4c..bb60a6355 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -1024,18 +1024,18 @@ register_language ('name' => 'java', # Algol 68 in GCC register_language ('name' => 'a68', 'Name' => 'Algol 68', - 'config_vars' => ['A68C'], + 'config_vars' => ['A68'], 'linker' => 'A68LINK', - 'link' => '$(A68LD) $(AM_A68CFLAGS) $(A68CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@', + 'link' => '$(A68LD) $(AM_A68FLAGS) $(A68FLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@', 'flags' => ['A68FLAGS'], - 'compile' => '$(A68C) $(AM_A68CFLAGS) $(A68CFLAGS)', - 'ccer' => 'A68C', + 'compile' => '$(A68) $(AM_A68FLAGS) $(A68FLAGS)', + 'ccer' => 'A68', 'compiler' => 'A68COMPILE', 'compile_flag' => '-c', 'output_flag' => '-o', - 'libtool_tag' => 'A68C', + 'libtool_tag' => 'A68', 'lder' => 'A68LD', - 'ld' => '$(A68C)', + 'ld' => '$(A68)', 'pure' => 1, 'extensions' => ['.a68']); @@ -5581,7 +5581,7 @@ EOF { # Hardcode the tags supported by Libtool 1.5. %libtool_tags = (CC => 1, CXX => 1, GCJ => 1, F77 => 1, - A68C => 1); + A68 => 1); } } } @@ -6201,12 +6201,12 @@ my %_am_macro_for_cond = ( AMDEP => "one of the compiler tests\n" . " AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC, AC_PROG_OBJCXX,\n" - . " AM_PROG_AS, AM_PROG_GCJ, AM_PROG_UPC, AM_PROG_A68C", + . " AM_PROG_AS, AM_PROG_GCJ, AM_PROG_UPC, AM_PROG_A68", am__fastdepCC => 'AC_PROG_CC', am__fastdepCCAS => 'AM_PROG_AS', am__fastdepCXX => 'AC_PROG_CXX', am__fastdepGCJ => 'AM_PROG_GCJ', - am__fastdepA68 => 'AM_PROG_A68C', + am__fastdepA68 => 'AM_PROG_A68', am__fastdepOBJC => 'AC_PROG_OBJC', am__fastdepOBJCXX => 'AC_PROG_OBJCXX', am__fastdepUPC => 'AM_PROG_UPC' diff --git a/configure.ac b/configure.ac index 0cfa093e8..e2422639b 100644 --- a/configure.ac +++ b/configure.ac @@ -567,10 +567,10 @@ fi # GNU Algol 68 compiler. AC_ARG_VAR([GNU_A68], [GNU Algol 68 compiler]) -AC_ARG_VAR([GNU_A68CFLAGS], [GNU Algol 68 compiler flags]) +AC_ARG_VAR([GNU_A68FLAGS], [GNU Algol 68 compiler flags]) AC_CHECK_TOOLS([GNU_A68], [ga68], [false]) if test "$GNU_A68" != false; then - AS_IF([AM_RUN_LOG([$GNU_A68 --version && $GNU_A68 -v])], [], + AS_IF([AM_RUN_LOG([$GNU_A68 --version])], [], [AC_MSG_WARN([botched installation for GNU Algol 68 compiler]) _AM_SKIP_COMP_TESTS([GNU Algol 68])]) fi diff --git a/doc/automake.texi b/doc/automake.texi index 608c0a8d6..042ef6599 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -7192,22 +7192,22 @@ source file. Automake includes support for Algol 68, using GCC. Any package including Algol 68 code must define the output variable -@code{A68C} in @file{configure.ac}; the simplest way to do this is to use -the @code{AC_PROG_A68C} macro (@pxref{Particular Programs, , Particular +@code{A68} in @file{configure.ac}; the simplest way to do this is to use +the @code{AC_PROG_A68} macro (@pxref{Particular Programs, , Particular Program Checks, autoconf, The Autoconf Manual}). A few additional variables are defined when an Algol 68 source file is seen: @vtable @code -@item A68C +@item A68 The name of the Algol 68 compiler. -@item A68CFLAGS +@item A68FLAGS Any flags to pass to the Algol 68 compiler. -@item AM_A68CFLAGS -The maintainer's variant of @code{A68CFLAGS}. +@item AM_A68FLAGS +The maintainer's variant of @code{A68FLAGS}. @item A68COMPILE The command used to compile an Algol 68 source file. The file name is diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index 2222b98e7..d454ff755 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -180,8 +180,8 @@ my %_ac_macro_for_var = CXX => 'AC_PROG_CXX', CXXFLAGS => 'AC_PROG_CXX', F77 => 'AC_PROG_F77', - A68 => 'AC_PROG_A68C', - A68CFLAGS => 'AC_PROG_A68C', + A68 => 'AC_PROG_A68', + A68FLAGS => 'AC_PROG_A68', FFLAGS => 'AC_PROG_F77', FC => 'AC_PROG_FC', FCFLAGS => 'AC_PROG_FC', diff --git a/t/a68-demo.sh b/t/a68-demo.sh index a69d2328b..38065a4a3 100644 --- a/t/a68-demo.sh +++ b/t/a68-demo.sh @@ -25,7 +25,7 @@ AC_INIT([GNU Algol 68 Demo], [1.0], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR([play.a68]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE -AC_PROG_A68C +AC_PROG_A68 AC_CONFIG_FILES([Makefile]) AC_OUTPUT END ------------=_1747858804-22040-1--