[MULTIBOOT2 SPEC PATCH v4 05/27] multiboot2: Remove CCAS workarounds for pre-2005 Automake

[Hans Ulrich Niedermann]

The "recent automake" remark is from 2001, and the AM_PROG_AS
issues with CCAS and CCASFLAGS appear to have been solved in
the first half of the 2000s.

Just to make sure, require Automake 1.10.1 which was tagged
on 2008-08-19 which is a similar vintage as the Autoconf 2.63
version which we already require.

Signed-off-by: Hans Ulrich Niedermann <address@hidden>

diff --git a/configure.ac b/configure.ac
index 5b5c84d1e..37b220d0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AC_PREREQ([2.63])
 AC_INIT([Multiboot], [2.0], [address@hidden])
 AC_CONFIG_SRCDIR([doc/multiboot.texi])
 AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.10.1])
 
 #
 # Programs
@@ -26,10 +26,6 @@ AC_CHECK_TOOL([CC], [gcc])
 AC_PROG_CC
 AM_PROG_AS
 
-dnl Because recent automake complains about AS, set it here.
-CCAS="$CC"
-AC_SUBST([CCAS])
-
 dnl Build the example Multiboot2 kernel.
 AC_ARG_ENABLE([example-kernel], [dnl
 AS_HELP_STRING([--enable-example-kernel],
@@ -38,10 +34,6 @@ AS_HELP_STRING([--enable-example-kernel],
 AM_CONDITIONAL([BUILD_EXAMPLE_KERNEL],
                [test "x$enable_example_kernel" = xyes])
 
-dnl Because recent automake complains about CCASFLAGS, set it here.
-CCASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)'
-AC_SUBST([CCASFLAGS])
-
 CFLAGS="-nostdlib $CFLAGS"
 
 dnl Output.
-- 
2.26.2