libjava.exp fix

[Richard Henderson <rth at redhat dot com>]

I need the following in order for "make check" to do anything
at all besides complain repeatedly about missing java.lang.

Ok to commit?


r~


	* lib/libjava.exp (bytecompile_file): Only unset CLASSPATH if
	a new classpath has been provided.
	(libjava_arguments): Use .jar extension for libgcj.

Index: lib/libjava.exp
===================================================================
RCS file: /cvs/gcc/egcs/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.21
diff -c -p -d -r1.21 libjava.exp
*** libjava.exp	2000/12/16 19:02:54	1.21
--- libjava.exp	2001/01/16 00:36:30
*************** proc bytecompile_file { file objdir {cla
*** 82,89 ****
      set dirname [file dirname $file]
  
      set javac [find_javac]
-     catch {unset env(CLASSPATH)}
      if {$classpath != ""} then {
          set env(CLASSPATH) $classpath
      }
      set here [pwd]
--- 82,89 ----
      set dirname [file dirname $file]
  
      set javac [find_javac]
      if {$classpath != ""} then {
+         catch {unset env(CLASSPATH)}
          set env(CLASSPATH) $classpath
      }
      set here [pwd]
*************** proc libjava_arguments {{mode compile}} 
*** 253,261 ****
      setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path"
  
      # Set the CLASSPATH environment variable
!     verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj.zip"
      global env
!     set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj.zip"
  
      global wrapper_file wrap_compile_flags;
      lappend args "additional_flags=$wrap_compile_flags";
--- 253,261 ----
      setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path"
  
      # Set the CLASSPATH environment variable
!     verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar"
      global env
!     set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar"
  
      global wrapper_file wrap_compile_flags;
      lappend args "additional_flags=$wrap_compile_flags";