diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-20 23:39:44 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-20 23:39:44 +0000 |
| commit | 653cadd5186a49578c40ec23f596d5d9352d8da5 (patch) | |
| tree | b987d4bc7e61c91461ed05fdf7d4ea5fb0be5142 /libjava/configure.ac | |
| parent | cef3f52b70cc5462735cb99bf1bf36ea5ee2e949 (diff) | |
| download | gcc-653cadd5186a49578c40ec23f596d5d9352d8da5.tar.gz | |
* sources.am, Makefile.in: Rebuilt.
* Makefile.am (all_xlib_lo_files): Removed.
(all_libgcj_lo_files): Likewise.
(lib_gnu_awt_xlib_la_LIBADD): List correct .lo files.
(xlib_java_source_files): Removed.
(xlib_nat_headers): Updated.
* configure: Rebuilt.
* configure.ac: Create standard.omit.
* standard.omit.in: New file.
* standard.omit: Removed.
* scripts/makemake.tcl (gnu/gcj/xlib, gnu/awt/xlib): Now
'package'.
(emit_package_rule): Special case xlib peers.
(emit_source_var): Likewise.
Read standard.omit.in.
* gnu/awt/xlib/XToolkit.java (createEmbeddedWindow): New method.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102211 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index ff45f6eebf0..2f9f50840a0 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -175,12 +175,10 @@ for peer in $peerlibs ; do echo "*** xlib peers requested but no X library available" 1>&2 exit 1 else - # This code has bit-rotted a bit. - echo "*** xlib peers can't currently be compiled -- disabling" 1>&2 -# use_xlib_awt="yes" -# if test -z "$TOOLKIT"; then -# TOOLKIT=gnu.awt.xlib.XToolkit -# fi + use_xlib_awt="yes" + if test -z "$TOOLKIT"; then + TOOLKIT=gnu.awt.xlib.XToolkit + fi fi ;; gtk) @@ -208,6 +206,15 @@ done AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes) AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes) +# Create standard.omit based on decisions we just made. +cp $srcdir/standard.omit.in standard.omit +if test "$use_xlib_awt" != yes; then + echo gnu/awt/xlib >> standard.omit + echo gnu/gcj/xlib >> standard.omit +fi +if test "$use_gtk_awt" != yes; then + echo gnu/java/awt/peer/gtk >> standard.omit +fi if test -z "${with_multisubdir}"; then builddotdot=. |