[ecj] Patch: FYI: use 'gjavah' now

[Tom Tromey <tromey at redhat dot com>]

I'm checking this in on the gcj-eclipse branch.

With the next Classpath merge, we'll pick up Classpath's gcjh
replacement, which is called 'gjavah'.  This patch updates the libjava
Makefile and the test suite to invoke gjavah appropriately.

If you previously had a 'gcjh1' executable, you'll want to rename it
now.  Also you may want to use a more up-to-date Classpath build;
while testing this patch I fixed a couple gjavah bugs.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* testsuite/libjava.jni/jni.exp (gcj_jni_build_header): Use
	-force.
	* testsuite/lib/libjava.exp (find_gcjh): Find 'gjavah' instead.
	* testsuite/libjava.cni/cni.exp (gcj_cni_build_headers): Pass -cni
	and -force to gcjh.
	* Makefile.in: Rebuilt.
	* Makefile.am (MYGCJH): Use gjavah.

Index: testsuite/libjava.cni/cni.exp
===================================================================
--- testsuite/libjava.cni/cni.exp	(revision 117705)
+++ testsuite/libjava.cni/cni.exp	(working copy)
@@ -28,6 +28,8 @@
 
 # Build header files given name of .java file.  Return 0 on failure.
 proc gcj_cni_build_headers {file} {
+  global libgcj_jar
+
   set gcjh [find_gcjh]
   set jvscan [find_jvscan]
 
@@ -40,8 +42,10 @@
   }
 
   foreach file [split $class_out] {
+    set cmd "$gcjh -cni -force -classpath .:$libgcj_jar $file"
+    verbose $cmd
     set x [string trim [libjava_prune_warnings \
-			  [lindex [local_exec "$gcjh $file" "" "" 300] 1]]]
+			  [lindex [local_exec $cmd "" "" 300] 1]]]
     if {$x != ""} {
       verbose "local_exec failed: $x" 2
       fail "$file header generation"
Index: testsuite/libjava.jni/jni.exp
===================================================================
--- testsuite/libjava.jni/jni.exp	(revision 117705)
+++ testsuite/libjava.jni/jni.exp	(working copy)
@@ -60,10 +60,16 @@
 
 # Build a header file from a .class file.  Return 0 on failure.
 proc gcj_jni_build_header {file} {
+  global libgcj_jar
+
   set gcjh [find_gcjh]
   set file [file rootname $file]
+
+  set cmd "$gcjh -jni -force -classpath .:$libgcj_jar $file"
+  verbose $cmd
+
   set x [string trim [libjava_prune_warnings \
-			[lindex [local_exec "$gcjh -jni $file" "" "" 300] 1]]]
+			[lindex [local_exec $cmd "" "" 300] 1]]]
   if {$x != ""} {
     verbose "local_exec failed: $x" 2
     fail "$file header generation"
Index: testsuite/lib/libjava.exp
===================================================================
--- testsuite/lib/libjava.exp	(revision 117705)
+++ testsuite/lib/libjava.exp	(working copy)
@@ -82,7 +82,7 @@
 
 # Find `gcjh'.
 proc find_gcjh {} {
-    return [libjava_find_program gcjh]
+    return [libjava_find_program gjavah]
 }
 
 proc find_javac {} {
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 117829)
+++ Makefile.am	(working copy)
@@ -396,7 +396,7 @@
 
 generic_header_files = $(ordinary_header_files) $(xlib_nat_headers)
 
-MYGCJH = gcjh1
+MYGCJH = gjavah
 
 $(generic_header_files): gcjh.stamp