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 | |
| 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')
| -rwxr-xr-x | libjava/configure | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libjava/configure b/libjava/configure index 0e87e5c..31c43db 100755 --- a/libjava/configure +++ b/libjava/configure @@ -4198,6 +4198,18 @@ else echo "${ECHO_T}no" >&6 fi + +# 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 @@ -6012,7 +6024,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 6015 "configure"' > conftest.$ac_ext + echo '#line 6027 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7054,7 +7066,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 7057 "configure" +#line 7069 "configure" struct S { ~S(); }; void bar(); void foo() |