diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-03-15 19:02:23 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-03-15 19:02:23 +0000 |
| commit | 872efdd9a527e472e5f2724138344fdef3839df4 (patch) | |
| tree | 6bc28e0f5ea0b1108b26a10a42b798e1e3451263 /configure.in | |
| parent | 549537e6de0601117aa323006d1a9264fad1503d (diff) | |
| download | gdk-pixbuf-872efdd9a527e472e5f2724138344fdef3839df4.tar.gz | |
Delete.
2001-03-14 Havoc Pennington <hp@redhat.com>
* gtk/gtkdata.h, gtk/gtkdata.c: Delete.
* gtk/gtk.h: remove gtkdata.h
* gtk/Makefile.am: remove gtkdata
* gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy"
not "disconnect" on the adjustments.
* gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not
GtkData
* gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject
not GtkData
* configure.in: handle case where X render exists, but Pango lacks
Xft support.
2001-03-14 Havoc Pennington <hp@redhat.com>
* Makefile.am (gdk-pixbuf-marshal.c): Use different temporary file
from gdk-pixbuf-marshal.h, fixes parallel makes.
2001-03-14 Havoc Pennington <hp@redhat.com>
* gtk/gtk-docs.sgml: remove gtkdata, gtktreemodelsimple
* gtk/gtk.types: remove gtk_data_get_type
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 12faa999a..baabd2581 100644 --- a/configure.in +++ b/configure.in @@ -440,6 +440,12 @@ if test "x$gdktarget" = "xx11"; then AC_CHECK_LIB(Xft, XftFontOpen, have_xft=true, :, -lXrender -lXext $X_LIBS $FREETYPE_LIBS) ,:,-lXext $X_LIBS) + ## be sure we also have Pango built with xft support + if ! $PKG_CONFIG --exists pangoxft ; then + have_xft=false + AC_MSG_WARN([X render extension found, but Pango lacks Xft support]) + fi + if $have_xft = 'true' ; then X_LIBS="-lXft -lXrender -lXext $FREETYPE_LIBS $X_LIBS" AC_DEFINE(HAVE_XFT) @@ -447,7 +453,7 @@ if test "x$gdktarget" = "xx11"; then fi AC_SUBST(XFT_LIBS) - AM_CONDITIONAL(HAVE_XFT, $have_xft) + AM_CONDITIONAL(HAVE_XFT, $have_xft) # Check for XIM support. |