[committed] Do things more 'autoconfily' in configure.in/Makefile.am

[neroden at twcny dot rr dot com (Nathanael Nerode)]

No logic change here.  Committed.

	* 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.

Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.190
diff -u -r1.190 configure.in
--- configure.in	16 Jul 2004 05:36:34 -0000	1.190
+++ configure.in	16 Jul 2004 21:01:55 -0000
@@ -1093,7 +1093,7 @@
       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 @@
       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(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)
 
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.390
diff -u -r1.390 Makefile.am
--- Makefile.am	16 Jul 2004 05:36:33 -0000	1.390
+++ Makefile.am	16 Jul 2004 21:01:58 -0000
@@ -71,22 +71,8 @@
 ## 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.

-- 
There are none so blind as those who will not see.