From: Karl Berry <karl@freefriends.org>
Date: Mon, 28 Apr 2025 22:42:52 +0000 (-0700)
Subject: automake: algol68: also rename [AM_]A68FLAGS to [AM_]A68CFLAGS.
X-Git-Tag: v1.18~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9480254708dfcbce19c4196d4cb4c63fe587c6db;p=thirdparty%2Fautomake.git

automake: algol68: also rename [AM_]A68FLAGS to [AM_]A68CFLAGS.

From https://bugs.gnu.org/78033 (automake-patches).

* bin/automake.in (a68): change link and compile values.
* lib/Automake/Variable.pm: likewise rename.
* configure.ac: likewise rename.
* doc/automake.texi: likewise rename.
---

diff --git a/bin/automake.in b/bin/automake.in
index dd6fb183b..c0b2aea4c 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1026,9 +1026,9 @@ register_language ('name' => 'a68',
                    'Name' => 'Algol 68',
                    'config_vars' => ['A68C'],
                    'linker' => 'A68LINK',
-                   'link' => '$(A68LD) $(AM_A68FLAGS) $(A68FLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
+                   'link' => '$(A68LD) $(AM_A68CFLAGS) $(A68CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
 		   'flags' => ['A68FLAGS'],
-		   'compile' => '$(A68C) $(AM_A68FLAGS) $(A68FLAGS)',
+		   'compile' => '$(A68C) $(AM_A68CFLAGS) $(A68CFLAGS)',
 		   'ccer' => 'A68C',
 		   'compiler' => 'A68COMPILE',
 		   'compile_flag' => '-c',
diff --git a/configure.ac b/configure.ac
index 16cf104b2..0cfa093e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -567,7 +567,7 @@ fi
 
 # GNU Algol 68 compiler.
 AC_ARG_VAR([GNU_A68],    [GNU Algol 68 compiler])
-AC_ARG_VAR([GNU_A68FLAGS], [GNU Algol 68 compiler flags])
+AC_ARG_VAR([GNU_A68CFLAGS], [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])], [],
diff --git a/doc/automake.texi b/doc/automake.texi
index a94f72d74..bdd615e2d 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7200,11 +7200,11 @@ seen:
 @item A68C
 The name of the Algol 68 compiler.
 
-@item A68FLAGS
+@item A68CFLAGS
 Any flags to pass to the Algol 68 compiler.
 
-@item AM_A68FLAGS
-The maintainer's variant of @code{A68FLAGS}.
+@item AM_A68CFLAGS
+The maintainer's variant of @code{A68CFLAGS}.
 
 @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 bb1d4c983..2222b98e7 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -181,7 +181,7 @@ my %_ac_macro_for_var =
    CXXFLAGS => 'AC_PROG_CXX',
    F77 => 'AC_PROG_F77',
    A68 => 'AC_PROG_A68C',
-   A68FLAGS => 'AC_PROG_A68C',
+   A68CFLAGS => 'AC_PROG_A68C',
    FFLAGS => 'AC_PROG_F77',
    FC => 'AC_PROG_FC',
    FCFLAGS => 'AC_PROG_FC',