From 9365047aba7ff624508b4475b6fc3e523d419057 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 20 Jul 2005 23:39:44 +0000
Subject: sources.am, [...]: Rebuilt.

	* 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.

From-SVN: r102211
---
 libjava/configure.ac | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'libjava/configure.ac')

diff --git a/libjava/configure.ac b/libjava/configure.ac
index ff45f6e..2f9f508 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=.
-- 
cgit v1.1