From 453d974e763ed84a79816877b9635ff5a72ccae0 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@gnome.org>
Date: Wed, 30 Apr 2008 16:59:52 +0000
Subject: [PATCH] =?utf8?q?Bug=20530685=20=E2=80=93=20Pango=20no=20longer?=
 =?utf8?q?=20using=20cairo=20as=20a=20backend=20as=20of=20pango=201.19.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

2008-04-30  Behdad Esfahbod  <behdad@gnome.org>

        Bug 530685 – Pango no longer using cairo as a backend as of pango 1.19.4

        * configure.in: Be more verbose about cairo font backends found.


svn path=/trunk/; revision=2621
---
 ChangeLog    |  6 ++++++
 configure.in | 34 +++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c6c8232..95faf2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-30  Behdad Esfahbod  <behdad@gnome.org>
+
+	Bug 530685 – Pango no longer using cairo as a backend as of pango 1.19.4
+
+	* configure.in: Be more verbose about cairo font backends found.
+
 2008-04-28  Behdad Esfahbod  <behdad@gnome.org>
 
 	* pango-view/viewer-main.c (main): Wait for convert(1) to finish.
diff --git a/configure.in b/configure.in
index ae2c6a0..a04f12c 100644
--- a/configure.in
+++ b/configure.in
@@ -333,20 +333,23 @@ if $have_cairo ; then
   LDFLAGS="$LDFLAGS $INSTALLED_CAIRO_LIBS"
 
   have_cairo=false
-
-  if $have_win32; then
-    PKG_CHECK_EXISTS(cairo-win32 >= $cairo_required, have_cairo_win32=true, :)
-  fi
-  if $have_cairo_win32; then
-    AC_DEFINE(HAVE_CAIRO_WIN32, 1, [Whether Cairo can use the Win32 GDI for fonts])
-    have_cairo=true
-  fi
+  cairo_font_backends=""
 
   if $have_freetype; then
     PKG_CHECK_EXISTS(cairo-ft >= $cairo_required, have_cairo_freetype=true, :)
   fi
   if $have_cairo_freetype; then
     AC_DEFINE(HAVE_CAIRO_FREETYPE, 1, [Whether Cairo can use FreeType for fonts])
+    cairo_font_backends="freetype $cairo_font_backends"
+    have_cairo=true
+  fi
+
+  if $have_win32; then
+    PKG_CHECK_EXISTS(cairo-win32 >= $cairo_required, have_cairo_win32=true, :)
+  fi
+  if $have_cairo_win32; then
+    AC_DEFINE(HAVE_CAIRO_WIN32, 1, [Whether Cairo can use the Win32 GDI for fonts])
+    cairo_font_backends="win32 $cairo_font_backends"
     have_cairo=true
   fi
 
@@ -355,9 +358,18 @@ if $have_cairo ; then
   fi
   if $have_cairo_atsui; then
     AC_DEFINE(HAVE_CAIRO_ATSUI, 1, [Whether Cairo can use ATSUI for fonts])
+    cairo_font_backends="quartz $cairo_font_backends"
     have_cairo=true
   fi
 
+  AC_MSG_CHECKING([which cairo font backends could be used])
+  if $have_cairo ; then
+    AC_MSG_RESULT([$cairo_font_backends])
+  else
+    AC_MSG_RESULT([none])
+    AC_MSG_NOTICE([Disabling cairo support])
+  fi
+
   if $have_cairo ; then
     AC_DEFINE(HAVE_CAIRO, 1, [Have usable Cairo library and font backend])
 
@@ -952,11 +964,11 @@ AC_CONFIG_FILES([tests/runtests.sh],
 AC_OUTPUT
 
 backends=""
-if $have_freetype && $have_fontconfig ; then backends="$backends FreeType"; fi
-if $have_x ; then backends="$backends X"; fi
-if $have_xft ; then backends="$backends Xft"; fi
 if $have_cairo ; then backends="$backends Cairo"; fi
 if $have_win32 ; then backends="$backends Win32"; fi
+if $have_xft ; then backends="$backends Xft"; fi
+if $have_freetype && $have_fontconfig ; then backends="$backends FreeType"; fi
+if $have_x ; then backends="$backends X"; fi
    
 echo "configuration:
 	backends:$backends"
-- 
2.7.4