Hello all,
this patch checks for Xrender and adds the LIB and CFLAGS bits to
native/jni/gtk-peer. W/o I'm not able to link on darwin-ppc.
Without this check I get unresolved symbols from
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c for
XRenderQueryExtension. And I will get more unresolved when Sven's patch
gets in.
Is this ok or do we need some more testing?
Thanks,
Andreas
2006-05-28 Andreas Tobler <[EMAIL PROTECTED]>
* configure.ac: Add Xrender check, substitute XRENDER_LIBS and
XRENDER_CFLAGS.
* native/jni/gtk-peer/Makefile.am (AM_LDFLAGS): Add XRENDER_LIBS.
(AM_CFLAGS): Add XRENDER_CFLAGS.
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.153
diff -u -r1.153 configure.ac
--- configure.ac 27 May 2006 21:10:46 -0000 1.153
+++ configure.ac 28 May 2006 20:30:25 -0000
@@ -406,6 +406,7 @@
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0)
PKG_CHECK_MODULES(FREETYPE2, freetype2)
PKG_CHECK_MODULES(PANGOFT2, pangoft2)
+ PKG_CHECK_MODULES(XRENDER, xrender >= 0.6)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
@@ -413,6 +414,8 @@
AC_SUBST(FREETYPE2_CFLAGS)
AC_SUBST(PANGOFT2_LIBS)
AC_SUBST(PANGOFT2_CFLAGS)
+ AC_SUBST(XRENDER_CFLAGS)
+ AC_SUBST(XRENDER_LIBS)
fi
dnl Check for AWT related Qt4
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- native/jni/gtk-peer/Makefile.am 26 May 2006 16:14:03 -0000 1.38
+++ native/jni/gtk-peer/Makefile.am 28 May 2006 20:30:25 -0000
@@ -45,12 +45,12 @@
libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
$(top_builddir)/native/jni/classpath/jcl.lo
-AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
+AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ @XRENDER_LIBS@ \
@PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -lX11 -lXtst
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
# Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk
# headers contain broken prototypes (by design, see gtkitemfactory.h).
-AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \
- @GTK_CFLAGS@ @FREETYPE2_CFLAGS@ @PANGOFT2_CFLAGS@ \
+AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GTK_CFLAGS@ \
+ @FREETYPE2_CFLAGS@ @XRENDER_CFLAGS@ @PANGOFT2_CFLAGS@ \
@X_CFLAGS@
