From 0554d76402321b25cc952180e4d19436a9038d1a Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 29 Jul 2013 22:41:46 -0400
Subject: [PATCH] [ft] Add missing include

---
 build/configure.ac.pthread | 6 +++---
 src/cairo-ft-font.c        | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/configure.ac.pthread b/build/configure.ac.pthread
index 29c930da9..2d64e8bab 100644
--- a/build/configure.ac.pthread
+++ b/build/configure.ac.pthread
@@ -141,9 +141,9 @@ AC_DEFUN([CAIRO_CHECK_PTHREAD],[dnl
 		[$1_CFLAGS="$2";
 		 $1_LIBS="$3";
 		 $5],
-		[$1_CFLAGS="";
-		 $1_LIBS="";
-		 $6])
+		[$1_CFLAGS="$CFLAGS";
+		 $1_LIBS="$LIBS";
+		 $5])
 ])
 
 dnl CAIRO_CONFIGURE_PTHREADS(): Look for pthreads.
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 89d08e983..0c9a6deeb 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -54,6 +54,7 @@
 #include FT_FREETYPE_H
 #include FT_OUTLINE_H
 #include FT_IMAGE_H
+#include FT_BITMAP_H
 #include FT_TRUETYPE_TABLES_H
 #include FT_XFREE86_H
 #if HAVE_FT_GLYPHSLOT_EMBOLDEN