* configure: Rebuilt.

	* configure.ac: Use multi_basedir instead of libgcj_basedir.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120901 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4cecf1b..a44076f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-18  Tom Tromey  <tromey@redhat.com>
+
+       * configure: Rebuilt.
+       * configure.ac: Use multi_basedir instead of libgcj_basedir.
+

 2007-01-18  Gary Benson  <gbenson@redhat.com>
 
        * gnu/java/nio/natVMPipeEcos.cc:
 2007-01-18  Gary Benson  <gbenson@redhat.com>
 
        * gnu/java/nio/natVMPipeEcos.cc:

diff --git a/libjava/configure b/libjava/configure
index 7cd8c71..9b550a2 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -6928,8 +6928,8 @@ if test "${with_ecj_jar+set}" = set; then
   withval="$with_ecj_jar"
   ECJ_JAR=$withval
 else
   withval="$with_ecj_jar"
   ECJ_JAR=$withval
 else

-  if test -f $libgcj_basedir/../ecj.jar; then
-          ECJ_BUILD_JAR=$libgcj_basedir/../ecj.jar
+  if test -f $multi_basedir/ecj.jar; then
+          ECJ_BUILD_JAR=$multi_basedir/ecj.jar

           ECJ_JAR='$(jardir)/ecj.jar'
           install_ecj_jar=yes
         fi
           ECJ_JAR='$(jardir)/ecj.jar'
           install_ecj_jar=yes
         fi

diff --git a/libjava/configure.ac b/libjava/configure.ac
index 5f2eb63..baef81d 100644 (file)
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -478,8 +478,8 @@ ECJ_JAR=
 AC_ARG_WITH(ecj-jar,
        AS_HELP_STRING([--with-ecj-jar=FILE], [use preinstalled ecj jar]),
        [ECJ_JAR=$withval],
 AC_ARG_WITH(ecj-jar,
        AS_HELP_STRING([--with-ecj-jar=FILE], [use preinstalled ecj jar]),
        [ECJ_JAR=$withval],

-       [if test -f $libgcj_basedir/../ecj.jar; then
-          ECJ_BUILD_JAR=$libgcj_basedir/../ecj.jar
+       [if test -f $multi_basedir/ecj.jar; then
+          ECJ_BUILD_JAR=$multi_basedir/ecj.jar

           ECJ_JAR='$(jardir)/ecj.jar'
           install_ecj_jar=yes
         fi])
           ECJ_JAR='$(jardir)/ecj.jar'
           install_ecj_jar=yes
         fi])