diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 73e1014f266f796c0ebe56b4c732851f75086dba..fea13dd31319200567a17c9fd7af483db39a3209 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-17  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure.in(ZIP, GCJH): Remove white space around '=' in variable
+	assignment.
+	* configure: Regenerated.
+
 2004-07-16  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* configure.in: Use build_noncanonical rather than build_alias.
diff --git a/libjava/configure b/libjava/configure
index 97d23453daa55596db4979e9029cebf1b638f2b1..0a6368c8b6431e7c3c1199d19451591935faa32f 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -7183,8 +7183,8 @@ fi
 case "${which_gcj}" in
    built)
       GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
-      GCJH = '$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh'
-      ZIP = '$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
+      GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh'
+      ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
    ;;
    cross)
       if test "x${with_newlib}" = "xyes"; then
@@ -7194,15 +7194,15 @@ case "${which_gcj}" in
       else
          GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
       fi
-      ZIP = jar
-      GCJH = '$(target_noncanonical)-gcjh'
+      ZIP=jar
+      GCJH='$(target_noncanonical)-gcjh'
    ;;
    path)
       GCJ="gcj -B`${PWDCMD-pwd}`/"
       ## 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
+      ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
+      GCJH=gcjh
    ;;
 esac
 
diff --git a/libjava/configure.in b/libjava/configure.in
index 83fb94ae51192a44bdb7c14eecdab3ae48ec0a6b..63112ad86f2be8e137e525a6b7b22b38ed4d6f26 100644
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -1089,8 +1089,8 @@ fi
 case "${which_gcj}" in
    built)
       GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
-      GCJH = '$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh'
-      ZIP = '$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
+      GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh'
+      ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
    ;;
    cross)
       if test "x${with_newlib}" = "xyes"; then
@@ -1100,15 +1100,15 @@ case "${which_gcj}" in
       else
          GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
       fi
-      ZIP = jar
-      GCJH = '$(target_noncanonical)-gcjh'
+      ZIP=jar
+      GCJH='$(target_noncanonical)-gcjh'
    ;;
    path)
       GCJ="gcj -B`${PWDCMD-pwd}`/"
       ## 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
+      ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
+      GCJH=gcjh
    ;;
 esac