From e763eba74d05d9b8948cd5bfa05ab7056f4c52e8 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 21 Dec 2000 09:54:01 +0000
Subject: Change usage to say pango-config instead of glib-config. Add support
 for

2000-12-21  Alexander Larsson  <alexl@redhat.com>

	* pango-config.in:
	Change usage to say pango-config instead of glib-config.
	Add support for pangoft2.

	* modules/basic/Makefile.am:
	Compile and install pango-basic-ft2 if freetype was found.

	* modules/basic/basic-ft2.c:
	Remove lang engine. Make the glyph from the glyph index instead
	of the unicode index. The id is really BasicScriptEngineFT2.

	* pango/Makefile.am:
	Compile and install pangoft2 if freetype was found.

	* pango/pangoft2-fontcache.c (pango_ft2_font_cache_load):
	Init face->generic.data to 0, since this field will be used
	to cache the current size of the face.

	* pango/pangoft2-fontmap.c (pango_ft2_font_map_for_display):
	Use g_object_new instead of g_type_create_instance.
	(pango_ft2_font_entry_get_coverage): Use G_DIR_SEPARATOR_S
	instead of \\. (pango_ft2_font_entry_get_coverage): Init result
	to NULL. Don't write to file if open failed.

	* pango/pangoft2-private.h:
	Add PangoFT2GlyphInfo.

	* pango/pangoft2.c (pango_ft2_get_face): Export function, and make
	sure it sets the correct face size. (pango_ft2_load_font,
	pango_ft2_get_per_char, pango_ft2_font_get_kerning):
	PANGO_FT2_GLYPH_INDEX stores the glyph index, not the unicode value.
	(pango_ft2_font_get_glyph_extents): Cache glyph extents.
	(pango_ft2_has_glyph): Remove function.
	(pango_ft2_font_finalize): Free glyph info cache.

	* pango/pangoft2.h:
	Export pango_ft2_get_face, remove pango_ft2_has_glyph.
---
 pango-config.in | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'pango-config.in')

diff --git a/pango-config.in b/pango-config.in
index d7e71fe2..535969ec 100644
--- a/pango-config.in
+++ b/pango-config.in
@@ -7,7 +7,7 @@ exec_prefix_set=no
 usage()
 {
 	cat <<EOF
-Usage: glib-config [OPTIONS] [LIBRARIES]
+Usage: pango-config [OPTIONS] [LIBRARIES]
 Options:
 	[--prefix[=DIR]]
 	[--exec-prefix[=DIR]]
@@ -17,6 +17,8 @@ Options:
 Libraries:
 	pango
 	pangox
+	pangoxft
+	pangoft2
 EOF
 	exit $1
 }
@@ -69,6 +71,9 @@ while test $# -gt 0; do
     pangoxft)
       lib_pangoxft=yes
       ;;
+    pangoft2)
+      lib_pangoft2=yes
+      ;;
     *)
       usage 1 1>&2
       ;;
@@ -87,6 +92,9 @@ if test "$echo_cflags" = "yes"; then
 	if test "$lib_pangoxft" = "yes"; then
 		cflags="@X_CFLAGS@ @FREETYPE_CFLAGS@ $cflags"
 	fi
+	if test "$lib_pangoft2" = "yes"; then
+		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
@@ -99,5 +107,8 @@ if test "$echo_libs" = "yes"; then
 	if test "$lib_pangoxft" = "yes"; then
 		libs="@XFT_LIBS@ -lpangoxft $libs"
 	fi
+	if test "$lib_pangoft2" = "yes"; then
+		libs="@FREETYPE_LIBS@ -lpangoft2 $libs"
+	fi
 	echo -L@libdir@ $libs 
 fi
-- 
cgit v1.2.1