configure: Rebuilt.

	* configure: Rebuilt.
	* configure.in: Only add multilib support code if we just rebuilt
	top-level Makefile.

From-SVN: r42693

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2e88c1bc2abece49dbfa706a7e879cc1cafe2910..ba8529ee0e8855e4cf5e46960c056af7c67b5256 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-29  Tom Tromey  <tromey@redhat.com>
+
+       * configure: Rebuilt.
+       * configure.in: Only add multilib support code if we just rebuilt
+       top-level Makefile.
+
 2001-05-29  Andrew Haley  <aph@redhat.com>
 
         * include/i386-signal.h (MAKE_THROW_FRAME): Don't fix up frame

diff --git a/libjava/configure b/libjava/configure
index 9576bfc7ac9ca7a12710c4aba8394b5151c5aa19..770ff689cf299021d0c52a00c2879441f1ace372 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -7299,9 +7299,12 @@ for am_file in include/config.h gcj/libgcj-config.h; do
   esac
   am_indx=`expr "$am_indx" + 1`
 done
-if test -n "$CONFIG_FILES"; then
-  ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
-fi
+# Only add multilib support code if we just rebuilt top-level Makefile.
+case " $CONFIG_FILES " in
+ *" Makefile "*)
+   ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
+   ;;
+esac
 
 # Make subdirectories and `.d' files.  Look in both srcdir and
 # builddir for the .java files.

diff --git a/libjava/configure.in b/libjava/configure.in
index 0c36ee1b4404333cfac1bdeb4009501e0cbf4b17..bdd933922c870f5f13ed68479de227e7173d2a86 100644 (file)
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -820,9 +820,12 @@ AC_SUBST(here)
 AC_SUBST(GCJFLAGS)
 
 AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile,
-[if test -n "$CONFIG_FILES"; then
-  ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
-fi
+[# Only add multilib support code if we just rebuilt top-level Makefile.
+case " $CONFIG_FILES " in
+ *" Makefile "*)
+   ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
+   ;;
+esac
 
 # Make subdirectories and `.d' files.  Look in both srcdir and
 # builddir for the .java files.