--- configure.orig	2015-04-12 11:22:39 UTC
+++ configure
@@ -5685,7 +5685,16 @@ $as_echo "$as_me:   ->  installed \`zlib' headers and 
     as_fn_error $? "Sorry, \`--with-system-teckit' requires \`--with-system-zlib'" "$LINENO" 5
   fi
 fi
+# Check whether --with-teckit-includes was given.
+if test "${with_teckit_includes+set}" = set; then :
+  withval=$with_teckit_includes;
+fi
 
+# Check whether --with-teckit-libdir was given.
+if test "${with_teckit_libdir+set}" = set; then :
+  withval=$with_teckit_libdir;
+fi
+
 test "x$need_teckit" = xyes && {
   need_zlib=yes
 }
@@ -21198,8 +21207,8 @@ else
   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
 fi
 if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+  FREETYPE2_INCLUDES=`pkg-config freetype2 --cflags`
+  FREETYPE2_LIBS=`pkg-config freetype2 --libs`
 elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
 fi
@@ -21284,11 +21293,12 @@ elif test "x$need_graphite2:$with_system_graphite2" = 
   as_fn_error $? "did not find graphite2" "$LINENO" 5
 fi
 
-if $PKG_CONFIG teckit; then
-  TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags`
-  TECKIT_LIBS=`$PKG_CONFIG teckit --libs`
-elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then
-  as_fn_error $? "did not find teckit" "$LINENO" 5
+if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then
+  TECKIT_INCLUDES="-I$with_teckit_includes"
+fi
+TECKIT_LIBS="-lTECkit"
+if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then
+  TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS"
 fi
 
 if test -n "$ac_tool_prefix"; then
