SOURCES: gcc-force_jar_wrapper.patch - simplification.

[sparky w pld-linux.org]

On Mon, Aug 07, 2006 at 03:38:59PM +0200, pluto wrote:
> Author: pluto                        Date: Mon Aug  7 13:38:59 2006 GMT
> Module: SOURCES                       Tag: HEAD
> ---- Log message:
> - simplification.

> @@ -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)

chyba coś namieszałeś...
JAR musi być ustawione na poprawny scrypt, a teraz będzie ustawione na
'no'

może tak:
AC_CHECK_PROGS([JAR], [SKIP-jar-TEST SKIP-fastjar-TEST], `pwd`/scripts/jar)
AM_CONDITIONAL(BASH_JAR, /bin/true)


-- 
 ____  Sparky{PI] -- Przemyslaw _  ___  _  _  ........... LANG...Pl..Ca..Es..En
/____) ___  ___  _ _ || Iskra  |  | _ \| |  | : WWW........ppcrcd.pld-linux.org
\____\| -_)'___| ||^'||//\\// <   |  _/| |  | : JID......sparky<at>jabberes.org
(____/||   (_-_|_||  ||\\ ||   |_ |_|  |_| _| : Mail....sparky<at>pld-linux.org