diff options
| author | Tom Tromey <tromey@redhat.com> | 2007-01-31 17:38:55 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-31 17:38:55 +0000 |
| commit | a968c71490366bd7b72be57fd4daa4297bd024c9 (patch) | |
| tree | 015dab5fb146548d9880e6e3a2a888e288f7a5c1 /libjava/configure.ac | |
| parent | d1fc69e4a5bf5e21c141bb1b1b9302139d1a9f09 (diff) | |
| download | gcc-a968c71490366bd7b72be57fd4daa4297bd024c9.zip gcc-a968c71490366bd7b72be57fd4daa4297bd024c9.tar.gz gcc-a968c71490366bd7b72be57fd4daa4297bd024c9.tar.bz2 | |
configure, [...]: Rebuilt.
* configure, Makefile.in: Rebuilt.
* configure.ac (JAR): Check for -@ feature.
* Makefile.am (libgcj-$(gcc_version).jar): Use find -prune.
From-SVN: r121429
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index a3a9d80..ab637d4 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -117,6 +117,18 @@ AC_PROG_AWK AC_CHECK_PROGS([JAR], [jar fastjar gjar], no) AC_PATH_PROG([ZIP], [zip], no) AC_PATH_PROG([UNZIP], [unzip], unzip) + +# We need a jar that supports -@. This is a GNU extension. +if test "$JAR" != no; then + rm -f config-test.jar + echo $srcdir/configure.ac | $JAR -cf@ config-test.jar + if test -f config-test.jar; then + rm -f config-test.jar + else + JAR=no + fi +fi + # Prefer the jar we found, but fall back to our jar script. if test "$JAR" = no; then if test "$ZIP" = no; then |