diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-09-27 18:51:40 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-09-27 18:51:40 +0000 |
| commit | ab3fa9d34434e2aa491c216a3b9b20122179db64 (patch) | |
| tree | 95f0db25555ff83dd49d87814f1d578bb9ea4813 /libjava/configure.ac | |
| parent | f20731b7ca20be9dd32d7cf95ddeb9ef6baa4d1c (diff) | |
| download | gcc-ab3fa9d34434e2aa491c216a3b9b20122179db64.zip gcc-ab3fa9d34434e2aa491c216a3b9b20122179db64.tar.gz gcc-ab3fa9d34434e2aa491c216a3b9b20122179db64.tar.bz2 | |
configure, [...]: Rebuilt.
* configure, Makefile.in: Rebuilt.
* sources.am: Rebuilt.
* scripts/makemake.tcl (emit_bc_rule): Special-case qt.
* configure.ac (TOOLKIT): Handle Qt peers properly.
From-SVN: r104706
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index a6f7b9c..2517ac8 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -168,6 +168,7 @@ AC_ARG_ENABLE(java-awt, peerlibs="`echo ${enable_java_awt} | tr ',' ' '`" use_xlib_awt="" use_gtk_awt="" +use_qt_awt="" # The default toolkit to use is the first one specified. TOOLKIT= AC_SUBST(TOOLKIT) @@ -187,7 +188,7 @@ for peer in $peerlibs ; do ;; gtk) if test "$no_x" = yes; then - echo "*** xlib peers requested but no X library available" 1>&2 + echo "*** gtk peers requested but no X library available" 1>&2 exit 1 else use_gtk_awt=yes @@ -196,9 +197,22 @@ for peer in $peerlibs ; do fi fi ;; + qt) + if test "$no_x" = yes; then + # Perhaps we should admit the possibility of embedded Qt. + echo "*** Qt peers requested but no X library available" 1>&2 + exit 1 + else + use_qt_awt=yes + if test -z "$TOOLKIT"; then + TOOLKIT=gnu.java.awt.peer.qt.QtToolkit + fi + fi + ;; no) use_xlib_awt= use_gtk_awt= + use_qt_awt= break ;; *) @@ -209,6 +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) # Create standard.omit based on decisions we just made. cp $srcdir/standard.omit.in standard.omit @@ -219,6 +234,9 @@ fi if test "$use_gtk_awt" != yes; then echo gnu/java/awt/peer/gtk >> 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=. @@ -315,6 +333,9 @@ ac_configure_args="$ac_configure_args --with-glibj=build" if test "$use_gtk_awt" != yes; then ac_configure_args="$ac_configure_args --disable-gtk-peer" fi +if test "$use_qt_awt" != yes; then + ac_configure_args="$ac_configure_args --disable-qt-peer" +fi dnl --with-gcj=$GCJ dnl --with-javah=$GCJH dnl gjdoc? |