2004-07-18 Matthias Klose <doko@debian.org>

[pf3gnuchains/gcc-fork.git] / libjava / configure.in

diff --git a/libjava/configure.in b/libjava/configure.in
index 83fb94a..a1bcd64 100644 (file)
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -43,6 +43,8 @@ AC_CANONICAL_SYSTEM
 _GCC_TOPLEV_NONCANONICAL_BUILD
 _GCC_TOPLEV_NONCANONICAL_TARGET
 
+AC_SUBST(target_noncanonical)
+
 # This works around the fact that libtool configuration may change LD
 # for this particular configuration, but some shells, instead of
 # keeping the changes in LD private, export them just because LD is
@@ -1089,8 +1091,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 +1102,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