[PATCH] libgloss: finish migration to AM_PROG_AS

[Mike Frysinger]

When merging iq2000 up a level, it included a partial conversion to
AM_PROG_AS in the common directory.  Finish it for all directories
to kill off the custom LIB_AM_PROG_AS which we no longer need since
we require Automake 1.15 now.
---
 libgloss/Makefile.in          |   3 +-
 libgloss/aarch64/aclocal.m4   | 420 +++++++++++++++++++++++++++++++++-
 libgloss/aarch64/configure    | 338 ++++++++++++++++++++++++++-
 libgloss/aarch64/configure.ac |   4 +-
 libgloss/acinclude.m4         |   7 -
 libgloss/aclocal.m4           |   1 -
 libgloss/arm/aclocal.m4       | 420 +++++++++++++++++++++++++++++++++-
 libgloss/arm/configure        | 338 ++++++++++++++++++++++++++-
 libgloss/arm/configure.ac     |   4 +-
 libgloss/configure            | 273 +++++++++++-----------
 libgloss/configure.ac         |   4 +-
 11 files changed, 1633 insertions(+), 179 deletions(-)
 delete mode 100644 libgloss/acinclude.m4

diff --git a/libgloss/aarch64/configure.ac b/libgloss/aarch64/configure.ac
index 1e8fce7cca03..cd91c2212d05 100644
--- a/libgloss/aarch64/configure.ac
+++ b/libgloss/aarch64/configure.ac
@@ -10,14 +10,12 @@ AC_PROG_INSTALL
 
 AC_NO_EXECUTABLES
 AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
+AM_PROG_AS
 AR=${AR-ar}
 AC_SUBST(AR)
 LD=${LD-ld}
 AC_SUBST(LD)
 AC_PROG_RANLIB
-LIB_AM_PROG_AS
 
 case "${target}" in
   *-*-elf)
diff --git a/libgloss/acinclude.m4 b/libgloss/acinclude.m4
deleted file mode 100644
index d792f66b1e30..000000000000
--- a/libgloss/acinclude.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_DEFUN([LIB_AM_PROG_AS],
-[# By default we simply use the C compiler to build assembly code.
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
-AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
-])
diff --git a/libgloss/arm/configure.ac b/libgloss/arm/configure.ac
index 5c6fb8920ce5..2affeb9716c9 100644
--- a/libgloss/arm/configure.ac
+++ b/libgloss/arm/configure.ac
@@ -30,14 +30,12 @@ AC_PROG_INSTALL
 
 AC_NO_EXECUTABLES
 AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
+AM_PROG_AS
 AR=${AR-ar}
 AC_SUBST(AR)
 LD=${LD-ld}
 AC_SUBST(LD)
 AC_PROG_RANLIB
-LIB_AM_PROG_AS
 
 case "${target}" in
   *-*-elf | *-*-eabi* | *-*-tirtos*)
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 895ca4289115..c6b09c0548ae 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -249,15 +249,13 @@ dnl fi
 AM_CONDITIONAL(CONFIG_LIBNOSYS, test x$config_libnosys = xtrue)
 
 AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
+AM_PROG_AS
 AC_CHECK_PROG(AR, ar, ar, :)
 AR=${AR-ar}
 AC_SUBST(AR)
 LD=${LD-ld}
 AC_SUBST(LD)
 AC_PROG_RANLIB
-AM_PROG_AS
 
 AC_DEFINE(HAVE_GNU_LD, 1, [Using GNU LD])
 
-- 
2.34.1