diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-04-04 00:30:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-04-04 00:30:05 +0000 |
| commit | 76c6ea0c8be95f0f31cf63bb55e647c4539e7b12 (patch) | |
| tree | e7eff1dfe7f6d953e9d4f452f6d946837a9a4d07 /libjava/configure.ac | |
| parent | 46bdbc0012b7ac304f1810c23611d8c6f1f81186 (diff) | |
| download | gcc-76c6ea0c8be95f0f31cf63bb55e647c4539e7b12.zip gcc-76c6ea0c8be95f0f31cf63bb55e647c4539e7b12.tar.gz gcc-76c6ea0c8be95f0f31cf63bb55e647c4539e7b12.tar.bz2 | |
Makefile.in: Rebuilt.
fastjar
Removed
libjava
* Makefile.in: Rebuilt.
* Makefile.am (ZIP): Removed.
(libgcj-$(gcc_version).jar): Use $(JAR).
(src.zip): Likewise.
* configure: Rebuilt.
* configure.ac: Check for jar. Removed code to set ZIP.
From-SVN: r112654
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index 113b9ba..2731bf3 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -116,6 +116,10 @@ AC_CHECK_TOOL(AS, as) AC_CHECK_TOOL(LD, ld) AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_PROGS(JAR, [jar fastjar], false) +if test "$JAR" = false; then + AC_MSG_ERROR(jar program not found) +fi AC_PROG_INSTALL @@ -289,7 +293,6 @@ case "${which_gcj}" in built) GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" GCJH='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh' - ZIP='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar' ;; cross) if test "x${with_newlib}" = "xyes"; then @@ -299,20 +302,15 @@ case "${which_gcj}" in else GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/" fi - ZIP='$(target_noncanonical)-fastjar' GCJH='$(target_noncanonical)-gcjh' ;; path) GCJ="gcj -B`${PWDCMD-pwd}`/" - ## In this case, gcj is found outside the build tree. However, zip is - ## found in the build tree. - ZIP='$(top_builddir)/$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' GCJH=gcjh ;; esac AC_SUBST(GCJH) -AC_SUBST(ZIP) # Create it, so that compile/link tests don't fail test -f libgcj.spec || touch libgcj.spec |