[cp-patches] FYI: Remove freetype2 configure checks

[Mark Wielaard]

Hi,

As discussed on the main list the checks for freetype2 are not necessary
and might break on (really) old gtk+ installations. This patch removes
them.

2005-11-07  Mark Wielaard  <address@hidden>

        * configure.ac: Don't check or replace FREETYPE2.
        * native/jni/gtk-peer/Makefile.am: Remove FREETYPE2_LIBS and
        FREETYPE2_CFLAGS.

Committed,

Mark

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.117
diff -u -r1.117 configure.ac
--- configure.ac        4 Nov 2005 21:06:57 -0000       1.117
+++ configure.ac        7 Nov 2005 10:14:04 -0000
@@ -353,7 +353,6 @@
     fi
 
     PKG_CHECK_MODULES(PANGOFT2, pangoft2)
-    PKG_CHECK_MODULES(FREETYPE2, freetype2)
   
     AC_SUBST(GTK_CFLAGS)
     AC_SUBST(GTK_LIBS)
@@ -361,8 +360,6 @@
     AC_SUBST(CAIRO_CFLAGS)
     AC_SUBST(PANGOFT2_LIBS)
     AC_SUBST(PANGOFT2_CFLAGS)
-    AC_SUBST(FREETYPE2_LIBS)
-    AC_SUBST(FREETYPE2_CFLAGS)
   fi
 
   dnl Check for AWT related Qt4
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.31
diff -u -r1.31 Makefile.am
--- native/jni/gtk-peer/Makefile.am     23 Oct 2005 16:59:07 -0000      1.31
+++ native/jni/gtk-peer/Makefile.am     7 Nov 2005 10:14:04 -0000
@@ -55,11 +55,11 @@
                       $(top_builddir)/native/jni/classpath/jcl.lo
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ \
-             @FREETYPE2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -lX11 -lXtst
+             @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@ @FREETYPE2_CFLAGS@ \
+            @GTK_CFLAGS@ @CAIRO_CFLAGS@ @PANGOFT2_CFLAGS@ \
             @X_CFLAGS@

signature.asc
Description: This is a digitally signed message part