From a86bd318e2424d879d784ee7b29d6536d7a17c18 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Sun, 16 Mar 2014 06:58:59 -0700
Subject: [PATCH] Merge configure.host into configure.ac

configure.host only has a single entry, and shows no signs of needing
more added.
---
 Makefile.am    |  2 +-
 configure.ac   |  6 +++++-
 configure.host | 11 -----------
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 configure.host

diff --git a/Makefile.am b/Makefile.am
index 25e2121c0..2d8b4dcb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = include testsuite man
 
-EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host	\
+EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj			\
 	 src/aarch64/ffi.c src/aarch64/ffitarget.h src/aarch64/sysv.S	\
 	 src/alpha/ffi.c src/alpha/osf.S			\
 	 src/alpha/ffitarget.h src/arc/ffi.c src/arc/arcompact.S	\
diff --git a/configure.ac b/configure.ac
index 90a11f608..3557f22fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,11 @@ AC_CONFIG_HEADERS([fficonfig.h])
 AC_CANONICAL_SYSTEM
 target_alias=${target_alias-$host_alias}
 
-. ${srcdir}/configure.host
+case "${host}" in
+  frv*-elf)
+    LDFLAGS=`echo $LDFLAGS | sed "s/\-B[^ ]*libgloss\/frv\///"`\ -B`pwd`/../libgloss/frv/
+    ;;
+esac
 
 AX_ENABLE_BUILDDIR
 
diff --git a/configure.host b/configure.host
deleted file mode 100644
index f52457b39..000000000
--- a/configure.host
+++ /dev/null
@@ -1,11 +0,0 @@
-# configure.host
-#
-# This shell script handles all host based configuration for libffi.
-# 
-
-# THIS TABLE IS SORTED.  KEEP IT THAT WAY.
-case "${host}" in
-  frv*-elf)
-    LDFLAGS=`echo $LDFLAGS | sed "s/\-B[^ ]*libgloss\/frv\///"`\ -B`pwd`/../libgloss/frv/
-    ;;
-esac