diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-09-30 20:46:59 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-09-30 20:46:59 +0000 |
| commit | e0f7b2609b4f970bfa7082b0cf3a96a509493c14 (patch) | |
| tree | 6ac7ac7a156fcf9633fef967b394187985e5f56f /libjava/configure | |
| parent | 21905d1b4319b962f26f87d57e8fa4f00f0aeedb (diff) | |
| download | gcc-e0f7b2609b4f970bfa7082b0cf3a96a509493c14.zip gcc-e0f7b2609b4f970bfa7082b0cf3a96a509493c14.tar.gz gcc-e0f7b2609b4f970bfa7082b0cf3a96a509493c14.tar.bz2 | |
re PR libgcj/24051 (libjava failed to configure)
libjava:
PR libgcj/24051:
* Makefile.in: Rebuilt.
* Makefile.am (toolexeclib_LTLIBRARIES): Add Qt library if
requested.
(lib_gnu_java_awt_peer_qt_la_SOURCES): New variable.
(lib_gnu_java_awt_peer_qt_la_LIBADD): Likewise.
(lib_gnu_java_awt_peer_qt_la_DEPENDENCIES): Likewise.
(lib_gnu_java_awt_peer_qt_la_LDFLAGS): Likewise.
(lib_gnu_java_awt_peer_qt_la_LINK): Likewise.
* configure: Rebuilt.
* configure.ac: Pass --enable-qt-peers when qt is requested.
libjava/classpath:
PR libgcj/24051:
* Makefile.in: Rebuilt.
* Makefile.am (ACLOCAL_AMFLAGS): Added -I ../../config
* configure: Rebuilt.
* configure.ac: Use GCC_NO_EXECUTABLES
From-SVN: r104833
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libjava/configure b/libjava/configure index 02f2460..71c5084 100755 --- a/libjava/configure +++ b/libjava/configure @@ -4772,6 +4772,9 @@ if test "$use_gtk_awt" != yes; then fi if test "$use_qt_awt" != yes; then ac_configure_args="$ac_configure_args --disable-qt-peer" +else + # We need this as qt is disabled by default in classpath. + ac_configure_args="$ac_configure_args --enable-qt-peer" fi # Only use libltdl for non-newlib builds. @@ -5586,7 +5589,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 5589 "configure"' > conftest.$ac_ext + echo '#line 5592 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6589,7 +6592,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 6592 "configure" +#line 6595 "configure" struct S { ~S(); }; void bar(); void foo() |