2006-05-10 Jeff Johnston <jjohnstn@redhat.com>

        * Makefile.in: Pass some additional flags in FLAGS_TO_PASS.
        * configure.in: Add additional flags when creating Makefile.
        * configure: Regenerated.
        * arm/configure
        * arm/configure.in: Set with_multisubdir when creating Makefile.
        * cris/configure.in: Ditto.
        * d30v/configure.in: Ditto.
        * frv/configure.in: Ditto.
        * i386/configure.in: Ditto.
        * iq2000/configure.in: Ditto.
        * libnosys/configure.in: Ditto.
        * m32c/configure.in: Ditto.
        * m32r/configure.in: Ditto.
        * m68hc11/configure.in: Ditto.
        * m68k/configure.in: Ditto.
        * mcore/configure.in: Ditto.
        * mips/configure.in: Ditto.
        * mn10200/configure.in: Ditto.
        * mn10300/configure.in: Ditto.
        * mt/configure.in: Ditto.
        * pa/configure.in: Ditto.
        * rs6000/configure.in: Ditto.
        * sparc/configure.in: Ditto.
        * cris/configure: Regenerated.
        * d30v/configure: Ditto.
        * frv/configure: Ditto.
        * i386/configure: Ditto.
        * iq2000/configure: Ditto.
        * libnosys/configure: Ditto.
        * m32c/configure: Ditto.
        * m32r/configure: Ditto.
        * m68hc11/configure: Ditto.
        * m68k/configure: Ditto.
        * mcore/configure: Ditto.
        * mips/configure: Ditto.
        * mn10200/configure: Ditto.
        * mn10300/configure: Ditto.
        * mt/configure: Ditto.
        * pa/configure: Ditto.
        * rs6000/configure: Ditto.
        * sparc/configure: Ditto.

42 files changed, 119 insertions, 6 deletions

diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 8383e84..f23d2b6 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,47 @@
+2006-05-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Makefile.in: Pass some additional flags in FLAGS_TO_PASS.
+	* configure.in: Add additional flags when creating Makefile.
+	* configure: Regenerated.
+	* arm/configure
+	* arm/configure.in: Set with_multisubdir when creating Makefile.
+	* cris/configure.in: Ditto.
+	* d30v/configure.in: Ditto.
+	* frv/configure.in: Ditto.
+	* i386/configure.in: Ditto.
+	* iq2000/configure.in: Ditto.
+	* libnosys/configure.in: Ditto.
+	* m32c/configure.in: Ditto.
+	* m32r/configure.in: Ditto.
+	* m68hc11/configure.in: Ditto.
+	* m68k/configure.in: Ditto.
+	* mcore/configure.in: Ditto.
+	* mips/configure.in: Ditto.
+	* mn10200/configure.in: Ditto.
+	* mn10300/configure.in: Ditto.
+	* mt/configure.in: Ditto.
+	* pa/configure.in: Ditto.
+	* rs6000/configure.in: Ditto.
+	* sparc/configure.in: Ditto.
+	* cris/configure: Regenerated.
+	* d30v/configure: Ditto.
+	* frv/configure: Ditto.
+	* i386/configure: Ditto.
+	* iq2000/configure: Ditto.
+	* libnosys/configure: Ditto.
+	* m32c/configure: Ditto.
+	* m32r/configure: Ditto.
+	* m68hc11/configure: Ditto.
+	* m68k/configure: Ditto.
+	* mcore/configure: Ditto.
+	* mips/configure: Ditto.
+	* mn10200/configure: Ditto.
+	* mn10300/configure: Ditto.
+	* mt/configure: Ditto.
+	* pa/configure: Ditto.
+	* rs6000/configure: Ditto.
+	* sparc/configure: Ditto.
+
 2006-04-19  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* configure.in: Modified to support autoconf 2.59.
diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in
index 62a8f5b..f17aedf 100644
--- a/libgloss/Makefile.in
+++ b/libgloss/Makefile.in
@@ -83,6 +83,9 @@ FLAGS_TO_PASS = \
 	"exec_prefix=$(exec_prefix)" \
 	"prefix=$(prefix)" \
 	"tooldir=$(tooldir)" \
+	"infodir=$(infodir)" \
+	"libdir=$(libdir)" \
+	"top_toollibdir=$(toollibdir)" \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
diff --git a/libgloss/arm/configure b/libgloss/arm/configure
index e0e6cba..725ffe6 100644
--- a/libgloss/arm/configure
+++ b/libgloss/arm/configure
@@ -2552,6 +2552,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/arm/configure.in b/libgloss/arm/configure.in
index 4c57e7e..970952f 100644
--- a/libgloss/arm/configure.in
+++ b/libgloss/arm/configure.in
@@ -73,6 +73,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/configure b/libgloss/configure
index 3b37041..5ed759c 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -2506,6 +2506,12 @@ host_makefile_frag_path=$host_makefile_frag
 
 
 
+if test "${multilib}" = "yes"; then
+  multilib_arg="--enable-multilib"
+else
+  multilib_arg=
+fi
+
 # for now, only add multilibs for specific targets
           ac_config_files="$ac_config_files Makefile"
 
@@ -3080,6 +3086,8 @@ with_multisubdir=${with_multisubdir}
 ac_configure_args="--enable-multilib ${ac_configure_args}"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
+CC="${CC}"
+LDFLAGS=${LDFLAGS}
 
 
 _ACEOF
@@ -3472,7 +3480,10 @@ s,@INSTALL@,$ac_INSTALL,;t t
 
   # Run the commands associated with the file.
   case $ac_file in
-    Makefile ) . ${libgloss_topdir}/config-ml.in ;;
+    Makefile ) if test -n "$CONFIG_FILES"; then
+  unset ac_file
+  . ${libgloss_topdir}/config-ml.in
+fi ;;
   esac
 done
 _ACEOF
diff --git a/libgloss/configure.in b/libgloss/configure.in
index 4234d7c..67d11c4 100644
--- a/libgloss/configure.in
+++ b/libgloss/configure.in
@@ -148,15 +148,26 @@ host_makefile_frag_path=$host_makefile_frag
 AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
+if test "${multilib}" = "yes"; then
+  multilib_arg="--enable-multilib"
+else
+  multilib_arg=
+fi
+
 # for now, only add multilibs for specific targets
-AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+AC_CONFIG_FILES([Makefile],
+[if test -n "$CONFIG_FILES"; then
+  unset ac_file
+  . ${libgloss_topdir}/config-ml.in
+fi],
 srcdir=${srcdir}
 target=${target}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="--enable-multilib ${ac_configure_args}"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
+CC="${CC}"
+LDFLAGS=${LDFLAGS}
 )
 AC_OUTPUT
 
diff --git a/libgloss/cris/configure b/libgloss/cris/configure
index 18a3094..4870655 100755
--- a/libgloss/cris/configure
+++ b/libgloss/cris/configure
@@ -2520,6 +2520,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/cris/configure.in b/libgloss/cris/configure.in
index 27fda19..3604c94 100644
--- a/libgloss/cris/configure.in
+++ b/libgloss/cris/configure.in
@@ -47,6 +47,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/d30v/configure b/libgloss/d30v/configure
index e9dcc0e..14760be 100755
--- a/libgloss/d30v/configure
+++ b/libgloss/d30v/configure
@@ -2521,6 +2521,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/d30v/configure.in b/libgloss/d30v/configure.in
index 9d810fb..04169f1 100644
--- a/libgloss/d30v/configure.in
+++ b/libgloss/d30v/configure.in
@@ -47,6 +47,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/frv/configure b/libgloss/frv/configure
index e9dcc0e..14760be 100755
--- a/libgloss/frv/configure
+++ b/libgloss/frv/configure
@@ -2521,6 +2521,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/frv/configure.in b/libgloss/frv/configure.in
index 9d810fb..04169f1 100644
--- a/libgloss/frv/configure.in
+++ b/libgloss/frv/configure.in
@@ -47,6 +47,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/i386/configure b/libgloss/i386/configure
index 760486a..1b0923e 100755
--- a/libgloss/i386/configure
+++ b/libgloss/i386/configure
@@ -2532,6 +2532,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/i386/configure.in b/libgloss/i386/configure.in
index 3cec5c8..b1e5855 100644
--- a/libgloss/i386/configure.in
+++ b/libgloss/i386/configure.in
@@ -71,6 +71,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/iq2000/configure b/libgloss/iq2000/configure
index 3627854..e7dc387 100755
--- a/libgloss/iq2000/configure
+++ b/libgloss/iq2000/configure
@@ -2531,6 +2531,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/iq2000/configure.in b/libgloss/iq2000/configure.in
index eb13bf2..9cbd7e2 100644
--- a/libgloss/iq2000/configure.in
+++ b/libgloss/iq2000/configure.in
@@ -70,6 +70,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/libnosys/configure b/libgloss/libnosys/configure
index 2fb835d..0db0d9b 100755
--- a/libgloss/libnosys/configure
+++ b/libgloss/libnosys/configure
@@ -2701,6 +2701,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/libnosys/configure.in b/libgloss/libnosys/configure.in
index e23ad99..41e0758 100644
--- a/libgloss/libnosys/configure.in
+++ b/libgloss/libnosys/configure.in
@@ -194,6 +194,7 @@ AC_CONFIG_FILES(Makefile,
 ac_file=Makefile . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/m32c/configure b/libgloss/m32c/configure
index e9dcc0e..14760be 100755
--- a/libgloss/m32c/configure
+++ b/libgloss/m32c/configure
@@ -2521,6 +2521,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/m32c/configure.in b/libgloss/m32c/configure.in
index 9d810fb..04169f1 100644
--- a/libgloss/m32c/configure.in
+++ b/libgloss/m32c/configure.in
@@ -47,6 +47,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/m32r/configure b/libgloss/m32r/configure
index 59fefc0..d0e5b87 100755
--- a/libgloss/m32r/configure
+++ b/libgloss/m32r/configure
@@ -2562,6 +2562,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${srcdir}/../..
diff --git a/libgloss/m32r/configure.in b/libgloss/m32r/configure.in
index 06c670f..aa3cf0c 100644
--- a/libgloss/m32r/configure.in
+++ b/libgloss/m32r/configure.in
@@ -39,6 +39,7 @@ AC_CONFIG_FILES(Makefile,
 . ${srcdir}/../../config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${srcdir}/../..
diff --git a/libgloss/m68hc11/configure b/libgloss/m68hc11/configure
index 2f54956..9b8fa61 100755
--- a/libgloss/m68hc11/configure
+++ b/libgloss/m68hc11/configure
@@ -2521,6 +2521,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/m68hc11/configure.in b/libgloss/m68hc11/configure.in
index bbeefd3..b2c1125 100644
--- a/libgloss/m68hc11/configure.in
+++ b/libgloss/m68hc11/configure.in
@@ -47,6 +47,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/m68k/configure b/libgloss/m68k/configure
index 7a22f4a..5f07ab9 100755
--- a/libgloss/m68k/configure
+++ b/libgloss/m68k/configure
@@ -2525,6 +2525,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/m68k/configure.in b/libgloss/m68k/configure.in
index 5f00377..65fe68d 100644
--- a/libgloss/m68k/configure.in
+++ b/libgloss/m68k/configure.in
@@ -63,6 +63,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/mcore/configure b/libgloss/mcore/configure
index 34ff2f5..f4e1149 100755
--- a/libgloss/mcore/configure
+++ b/libgloss/mcore/configure
@@ -2531,6 +2531,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/mcore/configure.in b/libgloss/mcore/configure.in
index 6b6dc2a..767af17 100644
--- a/libgloss/mcore/configure.in
+++ b/libgloss/mcore/configure.in
@@ -57,6 +57,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/mips/configure b/libgloss/mips/configure
index 140a1d0..fbdd776 100755
--- a/libgloss/mips/configure
+++ b/libgloss/mips/configure
@@ -2576,6 +2576,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/mips/configure.in b/libgloss/mips/configure.in
index f668eee..1e0f74b 100644
--- a/libgloss/mips/configure.in
+++ b/libgloss/mips/configure.in
@@ -115,6 +115,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/mn10200/configure b/libgloss/mn10200/configure
index 5b121e6..f1f663c 100755
--- a/libgloss/mn10200/configure
+++ b/libgloss/mn10200/configure
@@ -2531,6 +2531,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/mn10200/configure.in b/libgloss/mn10200/configure.in
index 0a1e7b0..a559e4e 100644
--- a/libgloss/mn10200/configure.in
+++ b/libgloss/mn10200/configure.in
@@ -70,6 +70,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/mn10300/configure b/libgloss/mn10300/configure
index f3d1b6b..172c4fd 100755
--- a/libgloss/mn10300/configure
+++ b/libgloss/mn10300/configure
@@ -2540,6 +2540,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
@@ -2922,7 +2923,10 @@ s,@INSTALL@,$ac_INSTALL,;t t
 
   # Run the commands associated with the file.
   case $ac_file in
-    Makefile ) . ${libgloss_topdir}/config-ml.in ;;
+    Makefile ) if test -n "$CONFIG_FILES"; then
+  unset ac_file
+  . ${libgloss_topdir}/config-ml.in
+fi ;;
   esac
 done
 _ACEOF
diff --git a/libgloss/mn10300/configure.in b/libgloss/mn10300/configure.in
index 13dc069..2c9bd83 100644
--- a/libgloss/mn10300/configure.in
+++ b/libgloss/mn10300/configure.in
@@ -75,10 +75,14 @@ AC_SUBST(part_specific_obj)
 AC_SUBST(script_list)
 AC_SUBST(bsp_list)
 
-AC_CONFIG_FILES(Makefile,
-. ${libgloss_topdir}/config-ml.in,
+AC_CONFIG_FILES([Makefile],
+[if test -n "$CONFIG_FILES"; then
+  unset ac_file
+  . ${libgloss_topdir}/config-ml.in
+fi],
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/mt/configure b/libgloss/mt/configure
index e9dcc0e..14760be 100755
--- a/libgloss/mt/configure
+++ b/libgloss/mt/configure
@@ -2521,6 +2521,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/mt/configure.in b/libgloss/mt/configure.in
index 9d810fb..04169f1 100644
--- a/libgloss/mt/configure.in
+++ b/libgloss/mt/configure.in
@@ -47,6 +47,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/pa/configure b/libgloss/pa/configure
index 2b2edb7..32797fc 100755
--- a/libgloss/pa/configure
+++ b/libgloss/pa/configure
@@ -2524,6 +2524,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/pa/configure.in b/libgloss/pa/configure.in
index e4b3ded..d8f9d55 100644
--- a/libgloss/pa/configure.in
+++ b/libgloss/pa/configure.in
@@ -63,6 +63,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/rs6000/configure b/libgloss/rs6000/configure
index a86a488..7435ab0 100755
--- a/libgloss/rs6000/configure
+++ b/libgloss/rs6000/configure
@@ -2521,6 +2521,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/rs6000/configure.in b/libgloss/rs6000/configure.in
index 90f9e00..caa192f 100644
--- a/libgloss/rs6000/configure.in
+++ b/libgloss/rs6000/configure.in
@@ -47,6 +47,7 @@ AC_CONFIG_FILES(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/sparc/configure b/libgloss/sparc/configure
index 43e913b..7899cec 100755
--- a/libgloss/sparc/configure
+++ b/libgloss/sparc/configure
@@ -2527,6 +2527,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}
diff --git a/libgloss/sparc/configure.in b/libgloss/sparc/configure.in
index a7b9f8e..d4f02d2 100644
--- a/libgloss/sparc/configure.in
+++ b/libgloss/sparc/configure.in
@@ -77,6 +77,7 @@ AC_OUTPUT(Makefile,
 . ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
+with_multisubdir=${with_multisubdir}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 libgloss_topdir=${libgloss_topdir}