diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-06-07 21:46:24 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2006-06-07 21:46:24 +0000 |
| commit | ade710a51ffc2b4657fb33e94de5025ef513fe05 (patch) | |
| tree | 3059efcfea3de62c60cdca8f76c6d16830f5258a /libjava/configure.ac | |
| parent | dd286892c4b4a6135ed6550ae8b710891f1806da (diff) | |
| download | gcc-ade710a51ffc2b4657fb33e94de5025ef513fe05.zip gcc-ade710a51ffc2b4657fb33e94de5025ef513fe05.tar.gz gcc-ade710a51ffc2b4657fb33e94de5025ef513fe05.tar.bz2 | |
makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-qt.lo.
2006-06-07 Thomas Fitzsimmons <fitzsim@redhat.com>
* scripts/makemake.tcl (emit_bc_rule): Do not skip
gnu-java-awt-peer-qt.lo.
* configure.ac (QT_AWT): Remove conditional.
Do not add gnu/java/awt/peer/qt to standard.omit.
* classpath/native/jni/qt-peer/Makefile.am: Install libqtpeer.so
in GCJ's versioned library directory.
* classpath/gnu/java/awt/peer/qt/QtToolkit.java (initToolkit):
Load libqtpeer.so unconditionally.
* gij.cc (main): Do not re-exec gij.
* Makefile.am: Remove lib-gnu-java-awt-peer-qt.lo build logic.
(gij_LDFLAGS): Point -rpath at GCJ's versioned library directory
when linking gij.
From-SVN: r114473
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index a02e25f..e12af73 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -236,7 +236,6 @@ for peer in $peerlibs ; do done AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes) -AM_CONDITIONAL(QT_AWT, test "$use_qt_awt" = yes) # Create standard.omit based on decisions we just made. cp $srcdir/standard.omit.in standard.omit @@ -244,9 +243,6 @@ if test "$use_xlib_awt" != yes; then echo gnu/awt/xlib >> standard.omit echo gnu/gcj/xlib >> standard.omit fi -if test "$use_qt_awt" != yes; then - echo gnu/java/awt/peer/qt >> standard.omit -fi if test -z "${with_multisubdir}"; then builddotdot=. |