diff options
| author | Graydon Hoare <graydon@gcc.gnu.org> | 2003-12-31 08:58:31 +0000 |
|---|---|---|
| committer | Graydon Hoare <graydon@gcc.gnu.org> | 2003-12-31 08:58:31 +0000 |
| commit | 8fe7789eddcc6ff9517e5768a573fc89d95b102b (patch) | |
| tree | 242b3e4088e49dd2c4f8cc0dcf7bb9282753348f /libjava/configure.in | |
| parent | 4f0c9c8a876450531bcfa8989d327efdbd0cd93c (diff) | |
| download | gcc-8fe7789eddcc6ff9517e5768a573fc89d95b102b.tar.gz gcc-8fe7789eddcc6ff9517e5768a573fc89d95b102b.tar.bz2 gcc-8fe7789eddcc6ff9517e5768a573fc89d95b102b.zip | |
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
Diffstat (limited to 'libjava/configure.in')
| -rw-r--r-- | libjava/configure.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libjava/configure.in b/libjava/configure.in index 9dad92c8e10..134fe1e2f11 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -405,6 +405,18 @@ done AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes) AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes) +dnl determine whether to enable the cairo GTK Graphics2D backend +AC_ARG_ENABLE(gtk-cairo, [ --enable-gtk-cairo build the cairo Graphics2D implementation on GTK]) +AM_CONDITIONAL(GTK_CAIRO, test "x${enable_gtk_cairo}" = xyes) +if test "x${enable_gtk_cairo}" = xyes +then + PKG_CHECK_MODULES(CAIRO, cairo) + PKG_CHECK_MODULES(PANGOFT2, pangoft2) +fi +AC_SUBST(CAIRO_LIBS) +AC_SUBST(CAIRO_CFLAGS) +AC_SUBST(PANGOFT2_LIBS) +AC_SUBST(PANGOFT2_CFLAGS) dnl FIXME: this should be _libs on some hosts. libsubdir=.libs |