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.

2 files changed, 11 insertions, 3 deletions

diff --git a/libgloss/mn10300/configure b/libgloss/mn10300/configure
index f3d1b6b84..172c4fd38 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 13dc069ce..2c9bd8381 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}