diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2006-06-01 12:25:19 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gcc.gnu.org> | 2006-06-01 12:25:19 +0000 |
| commit | 028098486c768c0f666bf4daa03cf8adfe230599 (patch) | |
| tree | ae81d1c6393a6aebe1c8b71eb9a09ee578238d12 /libjava/configure.ac | |
| parent | d5b0558fdac8245f6fa72cbf706abc67723356da (diff) | |
| download | gcc-028098486c768c0f666bf4daa03cf8adfe230599.zip gcc-028098486c768c0f666bf4daa03cf8adfe230599.tar.gz gcc-028098486c768c0f666bf4daa03cf8adfe230599.tar.bz2 | |
install.texi: Document that InfoZIP can replace jar.
gcc:
2006-06-01 Paolo Bonzini <bonzini@gnu.org>
* doc/install.texi: Document that InfoZIP can replace jar.
libjava:
2006-06-01 Paolo Bonzini <bonzini@gnu.org>
* configure.ac (ZIP, UNZIP): New programs.
(JAR): Fall back to bash script. Generate it.
(BASH_JAR): New conditional.
* Makefile.am (bin_SCRIPTS): New.
* jar.in: New file.
From-SVN: r114304
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index 61b7b3e..28702b0 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -116,9 +116,18 @@ AC_CHECK_TOOL(AS, as) AC_CHECK_TOOL(LD, ld) AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_PROGS(JAR, [jar fastjar], false) -if test "$JAR" = false; then - AC_MSG_ERROR(jar program not found) +AC_PROG_AWK +AC_CHECK_PROGS([JAR], [jar fastjar], 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 + AC_MSG_ERROR([cannot find neither zip nor jar, cannot continue]) + fi +else + # InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava + JAR=`pwd`/scripts/jar fi AC_PROG_INSTALL @@ -1458,6 +1467,8 @@ include/Makefile testsuite/Makefile ]) +AC_CONFIG_FILES([scripts/jar], [chmod +x scripts/jar]) + AC_CONFIG_COMMANDS([default], [# Only add multilib support code if we just rebuilt top-level Makefile. case " $CONFIG_FILES " in |