diff options
| author | Christian Thalinger <twisti@complang.tuwien.ac.at> | 2006-03-06 10:19:29 +0000 |
|---|---|---|
| committer | Christian Thalinger <twisti@complang.tuwien.ac.at> | 2006-03-06 10:19:29 +0000 |
| commit | 7418f4b042fb641277697611d834cf70dcd5590c (patch) | |
| tree | a9e2b9f04e8f49f4cbbf24a876c802781ad976e5 | |
| parent | 1cbd6579fd2f2a4200a984f3e0b98f23671db6f9 (diff) | |
| download | classpath-7418f4b042fb641277697611d834cf70dcd5590c.tar.gz | |
2006-03-06 Christian Thalinger <twisti@complang.tuwien.ac.at>
* configure.ac: Check for FREETYPE2. This is a reverted patch and
is required on Darwin.
* native/jni/gtk-peer/Makefile.am (AM_LDFLAGS): Added FREETYPE2.
(AM_CFLAGS): Likewise.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | native/jni/gtk-peer/Makefile.am | 6 |
3 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2006-03-06 Christian Thalinger <twisti@complang.tuwien.ac.at> + + * configure.ac: Check for FREETYPE2. This is a reverted patch and + is required on Darwin. + * native/jni/gtk-peer/Makefile.am (AM_LDFLAGS): Added FREETYPE2. + (AM_CFLAGS): Likewise. + 2006-03-06 David Gilbert <david.gilbert@object-refinery.com> * javax/swing/tree/FixedHeightLayoutCache.java: Reformatted and fixed diff --git a/configure.ac b/configure.ac index ff2c5a1db..10100c64a 100644 --- a/configure.ac +++ b/configure.ac @@ -377,12 +377,15 @@ if test "x${COMPILE_JNI}" = xyes; then PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0) fi + PKG_CHECK_MODULES(FREETYPE2, freetype2) PKG_CHECK_MODULES(PANGOFT2, pangoft2) - + AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) AC_SUBST(CAIRO_LIBS) AC_SUBST(CAIRO_CFLAGS) + AC_SUBST(FREETYPE2_LIBS) + AC_SUBST(FREETYPE2_CFLAGS) AC_SUBST(PANGOFT2_LIBS) AC_SUBST(PANGOFT2_CFLAGS) fi diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am index 46ea172f3..81de38b95 100644 --- a/native/jni/gtk-peer/Makefile.am +++ b/native/jni/gtk-peer/Makefile.am @@ -54,12 +54,12 @@ libgtkpeer_la_SOURCES = $(gtk_cairo_c_source_files) \ libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \ $(top_builddir)/native/jni/classpath/jcl.lo -AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ \ - @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -lX11 -lXtst +AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @FREETYPE2_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@ @CAIRO_CFLAGS@ @PANGOFT2_CFLAGS@ \ + @GTK_CFLAGS@ @CAIRO_CFLAGS@ @FREETYPE2_CFLAGS@ @PANGOFT2_CFLAGS@ \ @X_CFLAGS@ |