Patch: FYI: PR 24051 fix

[Tom Tromey]

I'm checking this in.

This works around PR 24051.

It also fixes a couple of buglets in how we build the Qt peers.
However, it doesn't fully fix the problem, since I think that we won't
know how to actually link the Qt peer library if it is built.

I think this is acceptable for the time being as the Qt peers are off
by default and require a version of Qt that few people have anyway.
Anybody venturing into this area has to really want it ...

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	PR libgcj/24051:
	* Makefile.in: Rebuilt.
	* Makefile.am (toolexeclib_LTLIBRARIES): Add Qt library if
	requested.
	(lib_gnu_java_awt_peer_qt_la_SOURCES): New variable.
	(lib_gnu_java_awt_peer_qt_la_LIBADD): Likewise.
	(lib_gnu_java_awt_peer_qt_la_DEPENDENCIES): Likewise.
	(lib_gnu_java_awt_peer_qt_la_LDFLAGS): Likewise.
	(lib_gnu_java_awt_peer_qt_la_LINK): Likewise.
	* configure: Rebuilt.
	* configure.ac: Pass --enable-qt-peers when qt is requested.

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.501
diff -u -r1.501 Makefile.am
--- Makefile.am 23 Sep 2005 21:30:20 -0000 1.501
+++ Makefile.am 30 Sep 2005 20:42:33 -0000
@@ -41,6 +41,10 @@
 toolexeclib_LTLIBRARIES += lib-gnu-java-awt-peer-gtk.la libgcjawt.la
 endif
 
+if QT_AWT
+toolexeclib_LTLIBRARIES += lib-gnu-java-awt-peer-qt.la
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgcj.pc
 
@@ -273,6 +277,18 @@
 	$(LIBGCJ_LD_SYMBOLIC)
 libgcjawt_la_LINK = $(LIBLINK)
 
+lib_gnu_java_awt_peer_qt_la_SOURCES =
+lib_gnu_java_awt_peer_qt_la_LIBADD = \
+	gnu-java-awt-peer-qt.lo \
+	classpath/native/jni/qt-peer/libqtpeer.la
+lib_gnu_java_awt_peer_qt_la_DEPENDENCIES = gnu-java-awt-peer-qt.lo \
+	classpath/native/jni/qt-peer/libqtpeer.la \
+	libgcj-$(gcc_version).jar libgcj.la libgcj.spec
+## The mysterious backslash in the grep pattern is consumed by make.
+lib_gnu_java_awt_peer_qt_la_LDFLAGS = \
+        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst
+lib_gnu_java_awt_peer_qt_la_LINK = $(LIBLINK)
+
 lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files)
 lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo
 lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.ac,v
retrieving revision 1.43
diff -u -r1.43 configure.ac
--- configure.ac 29 Sep 2005 05:00:39 -0000 1.43
+++ configure.ac 30 Sep 2005 20:42:34 -0000
@@ -335,6 +335,9 @@
 fi
 if test "$use_qt_awt" != yes; then
   ac_configure_args="$ac_configure_args --disable-qt-peer"
+else
+  # We need this as qt is disabled by default in classpath.
+  ac_configure_args="$ac_configure_args --enable-qt-peer"
 fi
 dnl --with-gcj=$GCJ
 dnl --with-javah=$GCJH
Index: classpath/ChangeLog.gcj
from  Tom Tromey  <tromey@redhat.com>

	PR libgcj/24051:
	* Makefile.in: Rebuilt.
	* Makefile.am (ACLOCAL_AMFLAGS): Added -I ../../config
	* configure: Rebuilt.
	* configure.ac: Use GCC_NO_EXECUTABLES

Index: classpath/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/classpath/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- classpath/Makefile.am 23 Sep 2005 21:30:30 -0000 1.4
+++ classpath/Makefile.am 30 Sep 2005 20:42:34 -0000
@@ -5,7 +5,7 @@
 DIST_SUBDIRS = lib doc external include native resource scripts examples
 
 ## GCJ LOCAL: we need an extra -I here.
-ACLOCAL_AMFLAGS = -I m4 -I ../..
+ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config
 
 native: lib
 
Index: classpath/configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libjava/classpath/configure.ac,v
retrieving revision 1.4
diff -u -r1.4 configure.ac
--- classpath/configure.ac 23 Sep 2005 21:30:30 -0000 1.4
+++ classpath/configure.ac 30 Sep 2005 20:42:34 -0000
@@ -169,13 +169,17 @@
 dnl -----------------------------------------------------------
 dnl Checks for programs.
 dnl -----------------------------------------------------------
-AC_PROG_CXX
+
+dnl GCC LOCAL
+GCC_NO_EXECUTABLES
+
 dnl Initialize libtool
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 dnl AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_CXX
 
 if test "x${COMPILE_JNI}" = xyes; then
   AC_HEADER_STDC