From 6ffa65f461d8a78d9190c0d9903a9ecd7273774a Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 20 Dec 2000 04:41:36 +0000 Subject: Since Xft may only be available statically without shlib deps, check for Tue Dec 19 22:47:16 2000 Owen Taylor * configure.in pango-config.in pangoxft.pc.in modules/basic/Makefile.am: Since Xft may only be available statically without shlib deps, check for FreeType libs explicitly and include them when linking, otherwise things won't work. Also, define FREETYPE_CFLAGS from freetype-config --cflags. * modules/basic/basic-xft.c pango/pangoxft-font{,map}.c: Fool Xft into not converting glyph indices by loading the face unencoded then calling FT_Set_Charmap ourselves. * pango/Makefile.am pango/pango-ot.h pango/opentype/* :Add start of opentype handling - most of the actually meat of the code here is the OpenType layout code from FreeType 1 ported to freetype2 and adapted slighlty for our purposes. Also, includes a incomplete OpenType-table-dumping code useful for figuring out what is going on. * pango/pangoxft.h pango/pangoxft-font.h: Add calls for getting FT_Face and PangoOTInfo from PangoXftFont. * modules/arabic/{Makefile.am,arabic-ot.[ch],arabic-xft.c}: Initial support for rendering Arabic with OpenType fonts. --- pango-config.in | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pango-config.in') diff --git a/pango-config.in b/pango-config.in index 725d43cb..d7e71fe2 100644 --- a/pango-config.in +++ b/pango-config.in @@ -84,6 +84,9 @@ if test "$echo_exec_prefix" = "yes"; then fi if test "$echo_cflags" = "yes"; then cflags="@GLIB_CFLAGS@" + if test "$lib_pangoxft" = "yes"; then + cflags="@X_CFLAGS@ @FREETYPE_CFLAGS@ $cflags" + fi # Put $cflags first, in case $includes contains a # location with GLib 1.2 headers, but we build with GLib 2.0. echo $cflags $includes -- cgit v1.2.1