configure.in: Add --enable-gtk-cairo check.
authorGraydon Hoare <graydon@gcc.gnu.org>
Wed, 31 Dec 2003 08:58:31 +0000 (08:58 +0000)
committerGraydon Hoare <graydon@gcc.gnu.org>
Wed, 31 Dec 2003 08:58:31 +0000 (08:58 +0000)
commit8fe7789eddcc6ff9517e5768a573fc89d95b102b
tree242b3e4088e49dd2c4f8cc0dcf7bb9282753348f
parent4f0c9c8a876450531bcfa8989d327efdbd0cd93c
configure.in: Add --enable-gtk-cairo check.

2003-12-16  Graydon Hoare  <graydon@redhat.com>

* configure.in: Add --enable-gtk-cairo check.
* configure: Regenerate.
* Makefile.am: Conditionally link against cairo.
* Makefile.in: Regenerate.
* acinclude.m4: Include PKG_CHECK_MODULES.
* aclocal.m4: Regenerate.
* gnu/java/awt/peer/gtk/GtkToolkit.java (useGraphics2D): New method.
(getFontMetrics, getClasspathFontPeer):
* gnu/java/awt/peer/gtk/GtkCanvasPeer.java (getGraphics):
* gnu/java/awt/peer/gtk/GtkComponentPeer.java (createImage):
* gnu/java/awt/peer/gtk/GtkContainerPeer.java (getGraphics):
* gnu/java/awt/peer/gtk/GtkFramePeer.java (getGraphics):
Switch behavior depending on GtkToolkit.useGraphics2D().
* gnu/java/awt/peer/gtk/GtkFontPeer.java: Extend ClasspathFontPeer.
* java/awt/Font.java: Switch to peer model.
* jni/gtk-peer/gtkcairopeer.h: Definitions of cairo stuff.
* jni/gtk-peer/gdkfont.h: Include gtkcairopeer.h.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Include gtkcairopeer.h.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c: Un-include gtkpeer.h.

From-SVN: r75260
17 files changed:
libjava/Makefile.am
libjava/Makefile.in
libjava/acinclude.m4
libjava/aclocal.m4
libjava/configure
libjava/configure.in
libjava/gnu/java/awt/peer/gtk/GtkCanvasPeer.java
libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java
libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java
libjava/gnu/java/awt/peer/gtk/GtkFontPeer.java
libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java
libjava/gnu/java/awt/peer/gtk/GtkToolkit.java
libjava/java/awt/Font.java
libjava/jni/gtk-peer/gdkfont.h
libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c
libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
libjava/jni/gtk-peer/gtkcairopeer.h [new file with mode: 0644]