From: Tom Tromey <tromey@redhat.com>
Date: Tue, 29 May 2001 21:31:23 +0000 (+0000)
Subject: configure: Rebuilt.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb019738e2fc8c00673b7e3798c7ffe54cae3168;p=gcc.git

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 2e88c1bc2ab..ba8529ee0e8 100644
--- 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 9576bfc7ac9..770ff689cf2 100755
--- 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 0c36ee1b440..bdd933922c8 100644
--- 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.