From 3a67f1e92a9b01857b96b6fe646acb441de95ec5 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Tue, 8 Jul 2003 16:06:09 +0000
Subject: 2003-07-08  Jeff Johnston  <jjohnstn@redhat.com>

        * configure.in: Reapply Inaoko's multilib patch from
        04-17-03.
        * configure: Regenerated.
---
 libgloss/ChangeLog         |  6 ++++++
 libgloss/m32r/configure    | 11 +++++++++--
 libgloss/m32r/configure.in |  9 ++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'libgloss')

diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 807fe3163..c4894994f 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* configure.in: Reapply Inaoko's multilib patch from
+	04-17-03.
+	* configure: Regenerated.
+
 2003-06-23  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
 
 	* m32r/crt0.S (_start): Allow _stack to be placed anywhere 
diff --git a/libgloss/m32r/configure b/libgloss/m32r/configure
index 216e58aa2..08285ab20 100755
--- a/libgloss/m32r/configure
+++ b/libgloss/m32r/configure
@@ -1067,7 +1067,8 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile
+. ${srcdir}/../../config-ml.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1166,7 +1167,8 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile
+. ${srcdir}/../../config-ml.in"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -1230,6 +1232,11 @@ cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
+srcdir=${srcdir}
+target=${target}
+ac_configure_args="${ac_configure_args} --enable-multilib"
+CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+libgloss_topdir=${srcdir}/../..
 
 exit 0
 EOF
diff --git a/libgloss/m32r/configure.in b/libgloss/m32r/configure.in
index c78c77953..cdc118bf4 100644
--- a/libgloss/m32r/configure.in
+++ b/libgloss/m32r/configure.in
@@ -72,4 +72,11 @@ host_makefile_frag_path=$host_makefile_frag
 AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile
+. ${srcdir}/../../config-ml.in,
+srcdir=${srcdir}
+target=${target}
+ac_configure_args="${ac_configure_args} --enable-multilib"
+CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+libgloss_topdir=${srcdir}/../..
+)
-- 
cgit v1.2.3