On Fri, 2006-02-17 at 11:47 +0100, Mark Wielaard wrote:
> So it seems we need to revert the patch in the first message.
> Could you prepare such a patch and test it on those two systems?
Sorry for the long delay. Here is a patch tested on powerpc-darwin and
x86_64-linux. I guess this one should also be applied to the release
branch (if not too late).
Commited.
TWISTI
2006-03-06 Christian Thalinger <[EMAIL PROTECTED]>
* 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.
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.136
diff -u -3 -p -r1.136 configure.ac
--- configure.ac 4 Mar 2006 22:09:24 -0000 1.136
+++ configure.ac 6 Mar 2006 10:13:59 -0000
@@ -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
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.34
diff -u -3 -p -r1.34 Makefile.am
--- native/jni/gtk-peer/Makefile.am 25 Jan 2006 10:40:12 -0000 1.34
+++ native/jni/gtk-peer/Makefile.am 6 Mar 2006 10:13:59 -0000
@@ -54,12 +54,12 @@ libgtkpeer_la_SOURCES = $(gtk_cairo_c_so
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@
