[Bug classpath/22889] pangoft2 required even without cairo support

[twisti at complang dot tuwien dot ac dot at]

------- Comment #2 from twisti at complang dot tuwien dot ac dot at  2005-10-17 
22:48 -------
This is the current patch which fixes the build on darwin with opendarwin
installed.  It seems that we also have to check for freetype2 stuff and add it
to 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@


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22889