2008-09-18  Jakub Jelinek  <jakub@redhat.com>

	* shift.c (shift_up, shift_down): Fix type of end_of_entries.
	* compress.c (end_of_entries): Likewise.

	* configure.ac: Prefer newly built fastjar.
	* configure: Likewise.

--- fastjar/shift.c.jj	2008-09-18 08:03:25.000000000 -0400
+++ fastjar/shift.c	2008-09-18 08:04:09.000000000 -0400
@@ -46,7 +46,7 @@ USA.  */
 int
 shift_up (int fd, off_t begin, off_t amount, struct zipentry *ze)
 {
-  extern off_t end_of_entries;
+  extern ub4 end_of_entries;
   int len, moved = 0;
   ub1 buffer[BUFFER_SIZE];
   off_t where, end, save;
@@ -114,7 +114,7 @@ shift_up (int fd, off_t begin, off_t amo
 int
 shift_down (int fd, off_t begin, off_t amount, struct zipentry *ze)
 {
-  extern off_t end_of_entries;
+  extern ub4 end_of_entries;
   int off, len, moved = 0;
   ub1 buffer[BUFFER_SIZE];
   off_t where, save;
--- fastjar/compress.c.jj	2007-06-22 07:03:46.000000000 -0400
+++ fastjar/compress.c	2008-09-18 08:04:27.000000000 -0400
@@ -115,7 +115,7 @@
 int write_data (int, void *, size_t, struct zipentry *);
 
 extern int seekable;
-extern off_t end_of_entries;
+extern ub4 end_of_entries;
 
 static z_stream zs;
 
--- libjava/configure.ac.jj	2008-09-18 05:14:01.000000000 -0400
+++ libjava/configure.ac	2008-09-18 08:16:57.000000000 -0400
@@ -342,7 +342,8 @@ AC_SUBST(GCJH)
 # Create it, so that compile/link tests don't fail
 test -f libgcj.spec || touch libgcj.spec
 
-
+# Prefer newly built fastjar over the installed one
+JAR=$built_gcc_dir/../fastjar/fastjar
 
 # Set up to configure Classpath.
 # FIXME: no supported way to pass args in autoconf.
--- libjava/configure.jj	2008-09-18 05:14:02.000000000 -0400
+++ libjava/configure	2008-09-18 08:16:42.000000000 -0400
@@ -5016,7 +5016,8 @@ esac
 # Create it, so that compile/link tests don't fail
 test -f libgcj.spec || touch libgcj.spec
 
-
+# Prefer newly built fastjar over the installed one
+JAR=$built_gcc_dir/../fastjar/fastjar
 
 # Set up to configure Classpath.
 # FIXME: no supported way to pass args in autoconf.