2003-07-08 Jeff Johnston <jjohnstn@redhat.com>

        * configure.in: Reapply Inaoko's multilib patch from
        04-17-03.
        * configure: Regenerated.

diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 807fe31630850733bf227c574c5abb717e241fb6..c4894994f0fe79b50f09e8c429477eb5ff8f4908 100644 (file)
--- 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 216e58aa25c75ec15eb7d988d4d2eb5434b4a3d9..08285ab205403759edcecf43363bec0eb0e41bce 100755 (executable)
--- 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 c78c77953a3a421e23312222b5e6ff308ce1474c..cdc118bf4e5dd3e8b9973789f85a54cf940bea6c 100644 (file)
--- 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}/../..
+)