From f07407335503e5612dcf07cc8f44e1781367d263 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 28 May 2008 12:01:38 -0400
Subject: [PATCH] [configure.in] Dont let a missing FcFini disable the freetype
 font backend!

---
 configure.in            | 7 ++++---
 src/cairo-os2-surface.c | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index b1a65f989..b3383a560 100644
--- a/configure.in
+++ b/configure.in
@@ -564,12 +564,13 @@ FREETYPE_MIN_VERSION=9.7.3
 
 CAIRO_BACKEND_ENABLE(ft, FreeType font, freetype, FT_FONT, auto, [
   ft_REQUIRES="fontconfig"
-  PKG_CHECK_MODULES(FONTCONFIG, $ft_REQUIRES,
-		    [_CHECK_FUNCS_WITH_FLAGS(FcFini, [$FONTCONFIG_CFLAGS], [$FONTCONFIG_LIBS],,
-		    [AC_MSG_RESULT(no); use_ft="no (requires fontconfig)"])],
+  PKG_CHECK_MODULES(FONTCONFIG, $ft_REQUIRES,,
 		    [AC_MSG_RESULT(no); use_ft="no (requires fontconfig)"])
 
   if test "x$use_ft" = "xyes"; then
+
+    _CHECK_FUNCS_WITH_FLAGS(FcFini, [$FONTCONFIG_CFLAGS], [$FONTCONFIG_LIBS])
+
     PKG_CHECK_MODULES(FREETYPE, freetype2 >= $FREETYPE_MIN_VERSION,
                       [freetype_pkgconfig=yes],
 		      [AC_MSG_RESULT(no)
diff --git a/src/cairo-os2-surface.c b/src/cairo-os2-surface.c
index 276398e4b..f485cfe15 100644
--- a/src/cairo-os2-surface.c
+++ b/src/cairo-os2-surface.c
@@ -145,8 +145,10 @@ cairo_os2_fini (void)
     CAIRO_MUTEX_FINALIZE ();
 
 #if CAIRO_HAS_FT_FONT
+# if HAVE_FCFINI
     /* Uninitialize FontConfig */
     FcFini ();
+# endif
 #endif
 
 #ifdef __WATCOMC__