[PATCH 2/8] libgloss: merge i386 configure script up a level

[Mike Frysinger]

Move the minor i386-specific logic to a dedicated variable so we can
merge its configure logic up a level.
---
 libgloss/Makefile.in       |    8 +-
 libgloss/configure         |   17 +-
 libgloss/configure.ac      |    4 +-
 libgloss/i386/Makefile.in  |    9 +-
 libgloss/i386/acinclude.m4 |   10 +
 libgloss/i386/aclocal.m4   |  384 ----
 libgloss/i386/configure    | 3938 ------------------------------------
 libgloss/i386/configure.ac |   58 -
 8 files changed, 37 insertions(+), 4391 deletions(-)
 create mode 100644 libgloss/i386/acinclude.m4
 delete mode 100644 libgloss/i386/aclocal.m4
 delete mode 100755 libgloss/i386/configure
 delete mode 100644 libgloss/i386/configure.ac

diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 486492b7bf0d..20f15a88b023 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -52,7 +52,8 @@ case "${target}" in
 	config_testsuite=true
 	;;
   i[[3456]]86-*-elf* | i[[3456]]86-*-coff*)
-	AC_CONFIG_SUBDIRS([i386])
+	AC_CONFIG_FILES([i386/Makefile])
+	subdirs="$subdirs i386"
 	;;
   m32r-*-*)
 	AC_CONFIG_FILES([m32r/Makefile])
@@ -321,6 +322,7 @@ dnl
   rm -f conftest* ])
 AC_DEFINE_UNQUOTED(__SYMBOL_PREFIX, "$libc_cv_symbol_prefix", [symbol prefix])
 
+m4_include([i386/acinclude.m4])
 m4_include([libnosys/acinclude.m4])
 
 dnl We have to assign the same value to other variables because autoconf
diff --git a/libgloss/i386/Makefile.in b/libgloss/i386/Makefile.in
index 4fabce42aefc..7ed0b075f72e 100644
--- a/libgloss/i386/Makefile.in
+++ b/libgloss/i386/Makefile.in
@@ -101,7 +101,7 @@ clean mostlyclean:
 	rm -f a.out core *.i *~ *.o *-test *.srec *.dis *.map *.x
 
 distclean maintainer-clean realclean: clean
-	rm -f Makefile config.status a.out
+	rm -f Makefile a.out
 
 .PHONY: install info install-info clean-info
 install:
@@ -123,8 +123,5 @@ test.o:	${srcdir}/test.c
 # these are for the BSPs
 ${CRT0}: cygmon-crt0.S
 
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
+Makefile: Makefile.in ../config.status
+	cd .. && $(SHELL) config.status
diff --git a/libgloss/i386/acinclude.m4 b/libgloss/i386/acinclude.m4
new file mode 100644
index 000000000000..75bca476d18a
--- /dev/null
+++ b/libgloss/i386/acinclude.m4
@@ -0,0 +1,10 @@
+I386_CPPFLAGS=
+case "${target}" in
+  i[[3456]]86-*-coff)
+    I386_CPPFLAGS="-DCOFF"
+    ;;
+  i[[3456]]86-*-aout)
+    I386_CPPFLAGS="-DAOUT"
+    ;;
+esac
+AC_SUBST(I386_CPPFLAGS)
diff --git a/libgloss/i386/configure.ac b/libgloss/i386/configure.ac
deleted file mode 100644
index ac1518648146..000000000000
--- a/libgloss/i386/configure.ac
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 1995, 1996 Cygnus Support
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-#
-# Process this file with autoconf to produce a configure script.
-#
-AC_INIT(cygmon-salib.c)
-
-AC_CONFIG_AUX_DIR(../..)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-I386_CPPFLAGS=
-case "$target" in
-    *coff)
-	I386_CPPFLAGS="-DCOFF"
-	;;
-    *aout)
-	I386_CPPFLAGS="-DAOUT"
-	;;
-esac
-AC_SUBST(I386_CPPFLAGS)
-
-LIB_AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-LIB_AM_PROG_AS
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AM_ENABLE_MULTILIB(, ../..)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-- 
2.34.1