Index: configure
--- configure.orig	2015-10-18 06:33:15.000000000 +0200
+++ configure	2015-10-19 23:49:31.935761091 +0200
@@ -30945,7 +30945,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FreeType header files are version 2.4.5 or higher" >&5
 $as_echo_n "checking whether FreeType header files are version 2.4.5 or higher... " >&6; }
 old_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS=$FREETYPE_CPPFLAGS
+CPPFLAGS="$FREETYPE_CPPFLAGS $CPPFLAGS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -30971,7 +30971,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FreeType library is version 2.4.5 or higher" >&5
 $as_echo_n "checking whether FreeType library is version 2.4.5 or higher... " >&6; }
 old_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS=$FREETYPE_CPPFLAGS
+CPPFLAGS="$FREETYPE_CPPFLAGS $CPPFLAGS"
 old_LIBS="$LIBS"
 LIBS=$FREETYPE_LIBS
 ac_ext=c
Index: frontend/Makefile.in
--- frontend/Makefile.in.orig	2015-10-18 06:33:21.000000000 +0200
+++ frontend/Makefile.in	2015-10-19 23:47:46.975736981 +0200
@@ -1067,7 +1067,7 @@
               -I$(top_srcdir)/gnulib/src \
               $(FREETYPE_CPPFLAGS)
 
-LDADD = $(top_builddir)/lib/libttfautohint.la \
+LDADD = $(top_builddir)/lib/libttfautohint.la -lharfbuzz \
         $(top_builddir)/gnulib/src/libgnu.la \
         $(LTLIBINTL) \
         $(LTLIBTHREAD) \
