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-autom...@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
