- simplification.

Changed files:
    gcc-force_jar_wrapper.patch -> 1.3

diff --git a/gcc-force_jar_wrapper.patch b/gcc-force_jar_wrapper.patch
index 5dbf28bfcdd28996722d5a4f1662ba3da055f1e3..e9ebc87635cb4f257e2738fbba686d632d96f272 100644 (file)
--- a/gcc-force_jar_wrapper.patch
+++ b/gcc-force_jar_wrapper.patch
@@ -1,20 +1,11 @@
 --- trunk/libjava/configure.ac.orig    2006-07-06 11:12:25.000000000 +0200
 +++ trunk/libjava/configure.ac 2006-07-06 19:56:51.347768250 +0200
-@@ -143,14 +143,12 @@
+@@ -143,7 +143,7 @@
  AC_CHECK_TOOL(AR, ar)
  AC_CHECK_TOOL(RANLIB, ranlib, :)
  AC_PROG_AWK
 -AC_CHECK_PROGS([JAR], [jar fastjar], no)
-+AC_SUBST([JAR])
++AC_CHECK_PROGS([JAR], [SKIP-jar-TEST SKIP-fastjar-TEST], no)
  AC_PATH_PROG([ZIP], [zip], no)
  AC_PATH_PROG([UNZIP], [unzip], unzip)
--AM_CONDITIONAL(BASH_JAR, test "$JAR" = no)
-+AM_CONDITIONAL(BASH_JAR, /bin/true)
- if test "$ZIP" = no; then
--  if test "$JAR" = no; then
--    AC_MSG_ERROR([cannot find neither zip nor jar, cannot continue])
--  fi
-+  AC_MSG_ERROR([cannot find zip, cannot continue])
- else
-   # InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava
-   JAR=`pwd`/scripts/jar
+ AM_CONDITIONAL(BASH_JAR, test "$JAR" = no)