diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-18 15:53:37 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-18 15:53:37 +0000 |
| commit | 84778dc063a57f9da95cf8a262ff112338a4294c (patch) | |
| tree | b300e72d34601f07e9fee59ed7faf0ae38bbf457 /libjava | |
| parent | 6fa78c7b5c8339560e02cf1270e974214ca75496 (diff) | |
| download | ppe42-gcc-84778dc063a57f9da95cf8a262ff112338a4294c.tar.gz ppe42-gcc-84778dc063a57f9da95cf8a262ff112338a4294c.zip | |
* 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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rwxr-xr-x | libjava/configure | 4 | ||||
| -rw-r--r-- | libjava/configure.ac | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4cecf1bfdba..a44076f4f7b 100644 --- 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: diff --git a/libjava/configure b/libjava/configure index 7cd8c71a03d..9b550a2ca0d 100755 --- 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 - 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 diff --git a/libjava/configure.ac b/libjava/configure.ac index 5f2eb63b28d..baef81de3f2 100644 --- 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], - [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]) |
