diff options
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index 773814d..a62805c 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -117,14 +117,14 @@ AC_PROG_AWK AC_CHECK_PROGS([JAR], [jar fastjar gjar], no) AC_PATH_PROG([ZIP], [zip], no) AC_PATH_PROG([UNZIP], [unzip], unzip) -AM_CONDITIONAL(BASH_JAR, test "$JAR" = no) -if test "$ZIP" = no; then - if test "$JAR" = no; then +# Prefer the jar we found, but fall back to our jar script. +if test "$JAR" = no; then + if test "$ZIP" = no; then AC_MSG_ERROR([cannot find neither zip nor jar, cannot continue]) + else + # InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava + JAR=`pwd`/scripts/jar fi -else - # InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava - JAR=`pwd`/scripts/jar fi AC_PROG_INSTALL |