[cp-patches] Re: build failure - problems detecting freetype2 headers

[Christian Thalinger]

On Tue, Oct 18, 2005 at 10:41:11AM -0600, Tom Tromey wrote:
> The updated patch looks good to me.  Write a ChangeLog entry and
> email it and the patch to me, I'll check it in.

2005-10-19  Christian Thalinger  <address@hidden>

        * configure.ac: Also check for pangoft2 without cairo and
        additionally check for freetype2.
        * native/jni/gtk-peer/Makefile.am: Added X, pangoft2 and
        freetype2 CFLAGS and LDFLAGS.

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.111
diff -u -3 -p -r1.111 configure.ac
--- configure.ac        6 Oct 2005 06:24:11 -0000       1.111
+++ configure.ac        17 Oct 2005 22:41:42 -0000
@@ -373,12 +373,17 @@ fi

   if test "x${enable_gtk_cairo}" = xyes; then
     PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)
-    PKG_CHECK_MODULES(PANGOFT2, pangoft2)
   fi
+
+  PKG_CHECK_MODULES(PANGOFT2, pangoft2)
+  PKG_CHECK_MODULES(FREETYPE2, freetype2)
+
   AC_SUBST(CAIRO_LIBS)
   AC_SUBST(CAIRO_CFLAGS)
   AC_SUBST(PANGOFT2_LIBS)
   AC_SUBST(PANGOFT2_CFLAGS)
+  AC_SUBST(FREETYPE2_LIBS)
+  AC_SUBST(FREETYPE2_CFLAGS)
 fi

 CLASSPATH_WITH_JAVAH
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.29
diff -u -3 -p -r1.29 Makefile.am
--- native/jni/gtk-peer/Makefile.am     22 Aug 2005 10:36:14 -0000
1.29
+++ native/jni/gtk-peer/Makefile.am     17 Oct 2005 22:41:42 -0000
@@ -54,10 +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_LIBS@ -lXtst
+AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ \
+             @FREETYPE2_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@ @PANGOFT2_CFLAGS@ @FREETYPE2_CFLAGS@ \
+            @X_CFLAGS@