diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8f881c9ad60cab6a79e7930fc595e628a415eea8..cf14e137a79d39d2b107e6f9bce05937b2a93edb 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-09-29 Andreas Tobler <a.tobler@schweiz.ch> + + * configure.ac: Fix typo. + * configure: Regenerate. + 2005-09-28 Geoffrey Keating <geoffk@apple.com> * sysdep/powerpc/locks.h: Use 64-bit versions of primitives when diff --git a/libjava/configure b/libjava/configure index 8b3a80b23bceba46e9132804478c6ff27e3df772..02f2460211f2215e44301ff12b99b9cbb89c2ab4 100755 --- a/libjava/configure +++ b/libjava/configure @@ -4654,7 +4654,7 @@ fi -if test "$use_gtk_awt" = yes; then +if test "$use_qt_awt" = yes; then QT_AWT_TRUE= QT_AWT_FALSE='#' else diff --git a/libjava/configure.ac b/libjava/configure.ac index fbd2a3d15e7c4fdeb51c4ec4a02989ae7668d768..eb3f301a48a402cfd097652af845f7ee8a44f403 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -223,7 +223,7 @@ done AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes) AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes) -AM_CONDITIONAL(QT_AWT, test "$use_gtk_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