From b0cb8c44603a6d2fd43fdab7c8a04d19ed5cd06e Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 4 Apr 2006 00:30:05 +0000
Subject: 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112654 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/configure.ac | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'libjava/configure.ac')

diff --git a/libjava/configure.ac b/libjava/configure.ac
index 113b9ba97c2..2731bf3fc37 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
-- 
cgit v1.2.3