5 files changed, 33 insertions, 32 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 64d5c35b969..24f74956332 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -5488,13 +5488,13 @@ $as_echo "$as_me: Using \`harfbuzz' headers and library from TL tree" >&6;}
   fi
 fi
 if test "x$with_system_harfbuzz" = xyes; then
-  if test "x$with_system_freetyp2" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetyp2' headers and library" >&5
-$as_echo "$as_me:   ->  installed \`freetyp2' headers and library" >&6;}
-    with_system_freetyp2=yes
-    ac_configure_args="$ac_configure_args '--with-system-freetyp2'"
-  elif test "x$with_system_freetyp2" != xyes; then
-    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetyp2'" "$LINENO" 5
+  if test "x$with_system_freetype2" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
+$as_echo "$as_me:   ->  installed \`freetype2' headers and library" >&6;}
+    with_system_freetype2=yes
+    ac_configure_args="$ac_configure_args '--with-system-freetype2'"
+  elif test "x$with_system_freetype2" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetype2'" "$LINENO" 5
   fi
   if test "x$with_system_icu" = x; then
     { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
@@ -5507,7 +5507,7 @@ $as_echo "$as_me:   ->  installed \`icu' headers and library" >&6;}
 fi
 
 test "x$need_harfbuzz" = xyes && {
-  need_freetyp2=yes
+  need_freetype2=yes
   need_icu=yes
 }
 
diff --git a/Build/source/libs/cairo/cairo-1.12.8-PATCHES/TL-Changes b/Build/source/libs/cairo/cairo-1.12.8-PATCHES/TL-Changes
index 1b294bf1737..e6383399ef1 100644
--- a/Build/source/libs/cairo/cairo-1.12.8-PATCHES/TL-Changes
+++ b/Build/source/libs/cairo/cairo-1.12.8-PATCHES/TL-Changes
@@ -30,6 +30,7 @@ Removed the empty directories:
 	doc/public/html/
 	doc/public/tmpl/
 	doc/public/xml/
+	test/reference/
 
 Executed:
 	ACLOCAL=aclocal-1.11 AUTOMAKE=automake-1.11 autoreconf
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 356681868b8..e012d158156 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -4675,13 +4675,13 @@ $as_echo "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
 fi
 if test "x$with_system_harfbuzz" = xyes; then
-  if test "x$with_system_freetyp2" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetyp2' headers and library" >&5
-$as_echo "$as_me:   ->  installed \`freetyp2' headers and library" >&6;}
-    with_system_freetyp2=yes
-    ac_configure_args="$ac_configure_args '--with-system-freetyp2'"
-  elif test "x$with_system_freetyp2" != xyes; then
-    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetyp2'" "$LINENO" 5
+  if test "x$with_system_freetype2" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
+$as_echo "$as_me:   ->  installed \`freetype2' headers and library" >&6;}
+    with_system_freetype2=yes
+    ac_configure_args="$ac_configure_args '--with-system-freetype2'"
+  elif test "x$with_system_freetype2" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetype2'" "$LINENO" 5
   fi
   if test "x$with_system_icu" = x; then
     { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
@@ -4694,7 +4694,7 @@ $as_echo "$as_me:   ->  installed \`icu' headers and library" >&6;}
 fi
 
 test "x$need_harfbuzz" = xyes && {
-  need_freetyp2=yes
+  need_freetype2=yes
   need_icu=yes
 }
 
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 4aaae7f9eaf..03f65f9fad2 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -4694,13 +4694,13 @@ $as_echo "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
 fi
 if test "x$with_system_harfbuzz" = xyes; then
-  if test "x$with_system_freetyp2" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetyp2' headers and library" >&5
-$as_echo "$as_me:   ->  installed \`freetyp2' headers and library" >&6;}
-    with_system_freetyp2=yes
-    ac_configure_args="$ac_configure_args '--with-system-freetyp2'"
-  elif test "x$with_system_freetyp2" != xyes; then
-    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetyp2'" "$LINENO" 5
+  if test "x$with_system_freetype2" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
+$as_echo "$as_me:   ->  installed \`freetype2' headers and library" >&6;}
+    with_system_freetype2=yes
+    ac_configure_args="$ac_configure_args '--with-system-freetype2'"
+  elif test "x$with_system_freetype2" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetype2'" "$LINENO" 5
   fi
   if test "x$with_system_icu" = x; then
     { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
@@ -4713,7 +4713,7 @@ $as_echo "$as_me:   ->  installed \`icu' headers and library" >&6;}
 fi
 
 test "x$need_harfbuzz" = xyes && {
-  need_freetyp2=yes
+  need_freetype2=yes
   need_icu=yes
 }
 
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 2822ac6d023..191c990c78f 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -4670,13 +4670,13 @@ $as_echo "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
 fi
 if test "x$with_system_harfbuzz" = xyes; then
-  if test "x$with_system_freetyp2" = x; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetyp2' headers and library" >&5
-$as_echo "$as_me:   ->  installed \`freetyp2' headers and library" >&6;}
-    with_system_freetyp2=yes
-    ac_configure_args="$ac_configure_args '--with-system-freetyp2'"
-  elif test "x$with_system_freetyp2" != xyes; then
-    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetyp2'" "$LINENO" 5
+  if test "x$with_system_freetype2" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`freetype2' headers and library" >&5
+$as_echo "$as_me:   ->  installed \`freetype2' headers and library" >&6;}
+    with_system_freetype2=yes
+    ac_configure_args="$ac_configure_args '--with-system-freetype2'"
+  elif test "x$with_system_freetype2" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetype2'" "$LINENO" 5
   fi
   if test "x$with_system_icu" = x; then
     { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`icu' headers and library" >&5
@@ -4689,7 +4689,7 @@ $as_echo "$as_me:   ->  installed \`icu' headers and library" >&6;}
 fi
 
 test "x$need_harfbuzz" = xyes && {
-  need_freetyp2=yes
+  need_freetype2=yes
   need_icu=yes
 }