Makefile.am: Set ZIP and GCJH directly using autoconf.

	* Makefile.am: Set ZIP and GCJH directly using autoconf.
	* Makefile.in, include/Makefile.in, testsuite/Makefile.in,
	gcj/Makefile.in: Regenerate.
	* configure.in: Set ZIP and GCJH.  Remove redundant condition
	in AM_CONDITIONAL(NATIVE,...)
	* configure: Regenerate.

From-SVN: r84832

libjava/ChangeLog

+2004-07-16  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.am: Set ZIP and GCJH directly using autoconf.
+	* Makefile.in, include/Makefile.in, testsuite/Makefile.in,
+	gcj/Makefile.in: Regenerate.
+	* configure.in: Set ZIP and GCJH.  Remove redundant condition
+	in AM_CONDITIONAL(NATIVE,...)
+	* configure: Regenerate.
+
 2004-07-15  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* configure.in: Use target_noncanonical rather than

libjava/Makefile.am

@@ -71,22 +71,8 @@ bin_SCRIPTS = addr2name.awk
 ## Compilers and compilation flags.
 ##
 
-## CANADIAN is a misnomer.  Really we check to see if we must pick up
-## the tools from the path.
-if CANADIAN
-if NULL_TARGET
-## In this case, gcj is found outside the build tree.  However, zip is
-## found in the build tree.
-ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
-GCJH = gcjh
-else
-ZIP = jar
-GCJH = $(target_noncanonical)-gcjh
-endif
-else # CANADIAN
-GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh
-ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
-endif # CANADIAN
+GCJH = @GCJH@
+ZIP = @ZIP@
 
 ## The compiler with whatever flags we want for both -c and -C
 ## compiles.

libjava/Makefile.in

@@ -196,12 +196,9 @@ propdir = $(libdir)
 @NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry
 
 bin_SCRIPTS = addr2name.awk
-@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
-@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
-@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
-@CANADIAN_TRUE@@NULL_TARGET_TRUE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_TRUE@gcjh
-@CANADIAN_TRUE@@NULL_TARGET_FALSE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(target_noncanonical)-gcjh
-@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh
+
+GCJH = @GCJH@
+ZIP = @ZIP@
 
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
 
@@ -3075,7 +3072,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DATA =  $(jar_DATA) $(pkgconfig_DATA) $(toolexecmainlib_DATA)
 
 DIST_COMMON =  README COPYING ChangeLog Makefile.am Makefile.in NEWS \
-THANKS acinclude.m4 aclocal.m4 configure configure.in \
+THANKS TODO acinclude.m4 aclocal.m4 configure configure.in \
 libgcj-test.spec.in libgcj.pc.in libgcj.spec.in
 
 

libjava/configure.in

@@ -1093,7 +1093,7 @@ case "${which_gcj}" in
       GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
    ;;
    cross)
-      # See the comment in Makefile.am about CANADIAN being a misnomer
+      # See the comment below about CANADIAN being a misnomer
       CANADIAN=yes
       NULL_TARGET=no
       if test "x${with_newlib}" = "xyes"; then
@@ -1105,13 +1105,33 @@ case "${which_gcj}" in
       fi
    ;;
    path)
-      # See the comment in Makefile.am about CANADIAN being a misnomer
+      # See the comment below about CANADIAN being a misnomer
       CANADIAN=yes
       NULL_TARGET=yes
       GCJ="gcj -B`${PWDCMD-pwd}`/"
    ;;
 esac
 
+## CANADIAN is a misnomer.  Really we check to see if we must pick up
+## the tools from the path.
+if test $CANADIAN = yes ; then
+  if test $NULL_TARGET = yes ; then
+    ## In this case, gcj is found outside the build tree.  However, zip is
+    ## found in the build tree.
+    ZIP = '$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
+    GCJH = gcjh
+  else
+    ZIP = jar
+    GCJH = '$(target_noncanonical)-gcjh'
+  fi
+else # CANADIAN
+  GCJH = '$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh'
+  ZIP = '$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
+fi # CANADIAN
+
+AC_SUBST(GCJH)
+AC_SUBST(ZIP)
+
 # Create it, so that compile/link tests don't fail
 test -f libgcj.spec || touch libgcj.spec
 
@@ -1163,9 +1183,7 @@ AC_SUBST(CHECKREFSPEC)
 AC_SUBST(EXCEPTIONSPEC)
 AC_SUBST(IEEESPEC)
 
-AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes)
-AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes)
-AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes)
+AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes)
 AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes)
 AC_SUBST(GCC_UNWIND_INCLUDE)
 

libjava/gcj/Makefile.in

@@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@
 GCINCS = @GCINCS@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
+GCJH = @GCJH@
 GCJVERSION = @GCJVERSION@
 GCLIBS = @GCLIBS@
 GCOBJS = @GCOBJS@
@@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@
 TOOLKIT = @TOOLKIT@
 VERSION = @VERSION@
 ZINCS = @ZINCS@
+ZIP = @ZIP@
 ZLIBS = @ZLIBS@
 ZLIBSPEC = @ZLIBSPEC@
 ZLIBTESTSPEC = @ZLIBTESTSPEC@

libjava/include/Makefile.in

@@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@
 GCINCS = @GCINCS@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
+GCJH = @GCJH@
 GCJVERSION = @GCJVERSION@
 GCLIBS = @GCLIBS@
 GCOBJS = @GCOBJS@
@@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@
 TOOLKIT = @TOOLKIT@
 VERSION = @VERSION@
 ZINCS = @ZINCS@
+ZIP = @ZIP@
 ZLIBS = @ZLIBS@
 ZLIBSPEC = @ZLIBSPEC@
 ZLIBTESTSPEC = @ZLIBTESTSPEC@

libjava/testsuite/Makefile.in

@@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@
 GCINCS = @GCINCS@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
+GCJH = @GCJH@
 GCJVERSION = @GCJVERSION@
 GCLIBS = @GCLIBS@
 GCOBJS = @GCOBJS@
@@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@
 TOOLKIT = @TOOLKIT@
 VERSION = @VERSION@
 ZINCS = @ZINCS@
+ZIP = @ZIP@
 ZLIBS = @ZLIBS@
 ZLIBSPEC = @ZLIBSPEC@
 ZLIBTESTSPEC = @ZLIBTESTSPEC@