[packages/gcc.git] / gcc-force_jar_wrapper.patch

--- 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,7 +143,7 @@
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_PROG_AWK
-AC_CHECK_PROGS([JAR], [jar fastjar], no)
+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)
Commit	Line	Data
c3f49da3 PS	1	--- trunk/libjava/configure.ac.orig 2006-07-06 11:12:25.000000000 +0200
c3f49da3 PS	2	+++ trunk/libjava/configure.ac 2006-07-06 19:56:51.347768250 +0200
6ead7b7d	3	@@ -143,7 +143,7 @@
c3f49da3 PS	4	AC_CHECK_TOOL(AR, ar)
	5	AC_CHECK_TOOL(RANLIB, ranlib, :)
	6	AC_PROG_AWK
	7	-AC_CHECK_PROGS([JAR], [jar fastjar], no)
6ead7b7d	8	+AC_CHECK_PROGS([JAR], [SKIP-jar-TEST SKIP-fastjar-TEST], no)
c3f49da3 PS	9	AC_PATH_PROG([ZIP], [zip], no)
c3f49da3 PS	10	AC_PATH_PROG([UNZIP], [unzip], unzip)
6ead7b7d	11	AM_CONDITIONAL(BASH_JAR, test "$JAR" = no)