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

[gcc-bugzilla at gcc dot gnu dot org]

Darwin complains about missing pangoft2 symbols during linking of gtk-peer. And
some symbols are missing from libX11, which is not listed in LDFLAGS (and i
don't know why).

This patch made it work.

Index: configure.ac
===================================================================
RCS file: /ahome/cacao/cacaocvs/cacao/src/classpath/configure.ac,v
retrieving revision 1.13
diff -u -3 -p -r1.13 configure.ac
--- configure.ac        28 Feb 2005 19:01:43 -0000      1.13
+++ configure.ac        7 Mar 2005 11:19:31 -0000
@@ -254,8 +254,8 @@ if test "x${COMPILE_JNI}" = xyes; then
   if test "x${enable_gtk_cairo}" = xyes
   then
     PKG_CHECK_MODULES(CAIRO, cairo)
-    PKG_CHECK_MODULES(PANGOFT2, pangoft2)
   fi
+  PKG_CHECK_MODULES(PANGOFT2, pangoft2)
   AC_SUBST(CAIRO_LIBS)
   AC_SUBST(CAIRO_CFLAGS)
   AC_SUBST(PANGOFT2_LIBS)

Index: Makefile.am
===================================================================
RCS file:
/ahome/cacao/cacaocvs/cacao/src/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.13
diff -u -3 -p -r1.13 Makefile.am
--- Makefile.am 5 Mar 2005 17:13:54 -0000       1.13
+++ Makefile.am 7 Mar 2005 11:20:58 -0000
@@ -53,10 +53,11 @@ libgtkpeer_la_SOURCES = $(gtk_cairo_c_so

 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo

-AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@
@X_LIBS@ -lXtst
+AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_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@ @PANGOFT2_CFLAGS@ @X_CFLAGS@


-- 


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