This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: Patch: PR 20029
On Mon, 2005-02-21 at 18:38 -0600, Michael Koch wrote:
> A configure check is definitely needed. Even when the version of X is
> recent enough its likely that the developement files needed for XTest
> are not installed (at least on Debian where whole X stuff is separated
> into much small packages).
Here is a new patch that includes the same configure check as GNU
Classpath. The check is only performed if --enable-java-awt=gtk is
given. OK?
Tom
2005-02-21 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/20029:
* Makefile.am (lib_gnu_java_awt_peer_gtk_la_CFLAGS): Add X_CFLAGS.
(lib_gnu_java_awt_peer_gtk_la_LDFLAGS): Add X_LIBS and -lXtst.
* Makefile.in: Regenerate.
* configure.ac: Check for libXtst.
* configure: Regenerate.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.451
diff -u -r1.451 Makefile.am
--- Makefile.am 19 Feb 2005 18:47:10 -0000 1.451
+++ Makefile.am 22 Feb 2005 02:30:16 -0000
@@ -456,13 +456,13 @@
lib_gnu_java_awt_peer_gtk_la_CFLAGS = \
-Ijniinclude -I$(srcdir)/jni/classpath \
-I$(srcdir)/jni/gtk-peer $(PEDANTIC_CFLAGS) $(GTK_CFLAGS) $(LIBART_CFLAGS) \
- $(CAIRO_CFLAGS) $(PANGOFT2_CFLAGS)
+ $(X_CFLAGS) $(CAIRO_CFLAGS) $(PANGOFT2_CFLAGS)
lib_gnu_java_awt_peer_gtk_la_GCJFLAGS = $(AM_GCJFLAGS) -fjni
lib_gnu_java_awt_peer_gtk_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = $(gtk_jni_headers) libgcj-@gcc_version@.jar libgcj.la libgcj.spec
## The mysterious backslash in the grep pattern is consumed by make.
lib_gnu_java_awt_peer_gtk_la_LDFLAGS = \
- -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
+ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) $(X_LIBS) -lXtst
lib_gnu_java_awt_peer_gtk_la_LINK = $(LIBLINK)
libjawt_la_SOURCES = jawt.c
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.ac,v
retrieving revision 1.18
diff -u -r1.18 configure.ac
--- configure.ac 8 Feb 2005 21:51:34 -0000 1.18
+++ configure.ac 22 Feb 2005 02:30:16 -0000
@@ -1014,6 +1014,11 @@
PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
AC_SUBST(LIBART_CFLAGS)
AC_SUBST(LIBART_LIBS)
+
+ # We require the XTest Extension to support java.awt.Robot.
+ AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
+ [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
+ [${X_LIBS}])
fi
# On Solaris, and maybe other architectures, the Boehm collector