build fix for freetype2 and macosx (preliminary)

git-svn-id: svn://tug.org/texlive/trunk@12798 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2009-04-22 18:17:33 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2009-04-22 18:17:33 +0000
commit: 633c2bc993d2ad14ecf137836f22eef08805a3b5 (patch)
tree: 784c479c7046d0dbf7cbfb9446c7762b5e1bb494 /Build
parent: 62b00fcce4ced507597a1c9b18116b781f0d1a9e (diff)
32 files changed, 724 insertions, 447 deletions
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index fc8d9545e27..e699cb75502 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -180,6 +180,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FT2_CONFIG = @FT2_CONFIG@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
diff --git a/Build/source/configure b/Build/source/configure
index 34d2a5cf59f..4b886c4dc5d 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -792,6 +792,7 @@ LIBOBJS
 subdirs
 build_kpathsea_FALSE
 build_kpathsea_TRUE
+FT2_CONFIG
 CXXCPP
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
@@ -1015,8 +1016,6 @@ with_system_gd
 with_gd_includes
 with_gd_libdir
 with_system_freetype2
-with_freetype2_includes
-with_freetype2_libdir
 with_system_freetype
 with_freetype_includes
 with_freetype_libdir
@@ -1817,11 +1816,7 @@ Optional Packages:
   --with-gd-includes=DIR  gd headers installed in DIR
   --with-gd-libdir=DIR    gd library installed in DIR
   --with-system-freetype2 use installed freetype2 headers and library
-  --with-freetype2-includes=DIR
-                          freetype2 headers installed in DIR (both -IDIR and
-                          -IDIR/freetype2)
-  --with-freetype2-libdir=DIR
-                          freetype2 library installed in DIR
+                          (requires freetype-config)
   --with-system-freetype  use installed freetype headers and library
   --with-freetype-includes=DIR
                           freetype headers installed in DIR
@@ -3650,16 +3645,6 @@ test "x$need_gd" = xyes && {
 if test "${with_system_freetype2+set}" = set; then
   withval=$with_system_freetype2;
 fi
-
-# Check whether --with-freetype2-includes was given.
-if test "${with_freetype2_includes+set}" = set; then
-  withval=$with_freetype2_includes;
-fi
-
-# Check whether --with-freetype2-libdir was given.
-if test "${with_freetype2_libdir+set}" = set; then
-  withval=$with_freetype2_libdir;
-fi
 if test "x$with_system_freetype2" = x; then
   if test -f $srcdir/libs/freetype2/configure; then
     { $as_echo "$as_me:$LINENO: Assuming \`freetype2' headers and library from TL tree" >&5
@@ -3682,22 +3667,6 @@ $as_echo "$as_me: Using \`freetype2' headers and library from TL tree" >&6;}
     ac_configure_args="$ac_configure_args '--without-system-freetype2'"
   fi
 fi
-if test "x$with_system_freetype2" = xyes; then
-  if test "x$with_system_zlib" = x; then
-    { $as_echo "$as_me:$LINENO:   ->  installed \`zlib' headers and library" >&5
-$as_echo "$as_me:   ->  installed \`zlib' headers and library" >&6;}
-    with_system_zlib=yes
-    ac_configure_args="$ac_configure_args '--with-system-zlib'"
-  elif test "x$with_system_zlib" != xyes; then
-    { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5
-$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-test "x$need_freetype2" = xyes && {
-  need_zlib=yes
-}
 
 
 ## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/
@@ -5902,13 +5871,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5905: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5874: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5908: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5877: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5911: output\"" >&5)
+  (eval echo "\"\$as_me:5880: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7114,7 +7083,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7117 "configure"' > conftest.$ac_ext
+  echo '#line 7086 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9161,11 +9130,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9164: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9133: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9168: \$? = $ac_status" >&5
+   echo "$as_me:9137: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9500,11 +9469,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9503: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9472: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9507: \$? = $ac_status" >&5
+   echo "$as_me:9476: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9605,11 +9574,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9608: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9577: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9612: \$? = $ac_status" >&5
+   echo "$as_me:9581: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9660,11 +9629,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9663: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9632: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9667: \$? = $ac_status" >&5
+   echo "$as_me:9636: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12460,7 +12429,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12463 "configure"
+#line 12432 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12556,7 +12525,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12559 "configure"
+#line 12528 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18952,11 +18921,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18955: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18924: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18959: \$? = $ac_status" >&5
+   echo "$as_me:18928: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19051,11 +19020,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19054: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19023: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19058: \$? = $ac_status" >&5
+   echo "$as_me:19027: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19103,11 +19072,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19106: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19075: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19110: \$? = $ac_status" >&5
+   echo "$as_me:19079: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20137,12 +20106,105 @@ if test "x$with_freetype_libdir" != x && test "x$with_freetype_libdir" != xyes;
   FREETYPE_LIBS="-L$with_freetype_libdir $FREETYPE_LIBS"
 fi
 
-if test "x$with_freetype2_includes" != x && test "x$with_freetype2_includes" != xyes; then
-  FREETYPE2_INCLUDES="-I$with_freetype2_includes/freetype2 -I$with_freetype2_includes"
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}freetype-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_FT2_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$FT2_CONFIG"; then
+  ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
 fi
-FREETYPE2_LIBS="-lfreetype"
-if test "x$with_freetype2_libdir" != x && test "x$with_freetype2_libdir" != xyes; then
-  FREETYPE2_LIBS="-L$with_freetype2_libdir $FREETYPE2_LIBS"
+FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
+if test -n "$FT2_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $FT2_CONFIG" >&5
+$as_echo "$FT2_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_FT2_CONFIG"; then
+  ac_ct_FT2_CONFIG=$FT2_CONFIG
+  # Extract the first word of "freetype-config", so it can be a program name with args.
+set dummy freetype-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_FT2_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_FT2_CONFIG"; then
+  ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
+if test -n "$ac_ct_FT2_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_FT2_CONFIG" >&5
+$as_echo "$ac_ct_FT2_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_FT2_CONFIG" = x; then
+    FT2_CONFIG=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    FT2_CONFIG=$ac_ct_FT2_CONFIG
+  fi
+else
+  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+fi
+
+if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
+  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+else
+  { { $as_echo "$as_me:$LINENO: error: Can not use installed freetype2 headers and library" >&5
+$as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 243aa4c8b5c..189c6d7e4f2 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -774,6 +774,7 @@ enable_mktextex_default
 with_system_teckit
 with_teckit_includes
 with_teckit_libdir
+with_graphite
 with_system_graphite
 with_graphite_includes
 with_graphite_libdir
@@ -781,8 +782,6 @@ with_system_gd
 with_gd_includes
 with_gd_libdir
 with_system_freetype2
-with_freetype2_includes
-with_freetype2_libdir
 with_system_freetype
 with_freetype_includes
 with_freetype_libdir
@@ -1552,6 +1551,7 @@ Optional Packages:
                           teckit headers installed in DIR
   --with-teckit-libdir=DIR
                           teckit library installed in DIR
+  --without-graphite      build XeTeX without graphite support
   --with-system-graphite  use installed graphite headers and library
   --with-graphite-includes=DIR
                           graphite headers installed in DIR
@@ -1561,11 +1561,7 @@ Optional Packages:
   --with-gd-includes=DIR  gd headers installed in DIR
   --with-gd-libdir=DIR    gd library installed in DIR
   --with-system-freetype2 use installed freetype2 headers and library
-  --with-freetype2-includes=DIR
-                          freetype2 headers installed in DIR (both -IDIR and
-                          -IDIR/freetype2)
-  --with-freetype2-libdir=DIR
-                          freetype2 library installed in DIR
+                          (requires freetype-config)
   --with-system-freetype  use installed freetype headers and library
   --with-freetype-includes=DIR
                           freetype headers installed in DIR
@@ -2177,11 +2173,11 @@ if test "x$enable_multiplatform" = xyes; then
 fi
 
 
-## ac/withenable.ac
+## ac/withenable.ac: configure.ac fragment for the TeX Live top-level
 
-## utils/ac/withenable.ac
+## utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/
 
-## utils/dialog/ac/withenable.ac
+## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/
 ## configure options and TL libraries required for dialog
 # Check whether --enable-dialog was given.
 if test "${enable_dialog+set}" = set; then
@@ -2196,7 +2192,7 @@ $as_echo "$as_me: Assuming \`--enable-dialog=$enable_dialog'" >&6;}
 esac
 
 
-## utils/pdfopen/ac/withenable.ac
+## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/
 ## configure options and TL libraries required for pdfopen
 # Check whether --enable-pdfopen was given.
 if test "${enable_pdfopen+set}" = set; then
@@ -2211,7 +2207,7 @@ $as_echo "$as_me: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&6;}
 esac
 
 
-## utils/ps2eps/ac/withenable.ac
+## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/
 ## configure options and TL libraries required for ps2eps
 # Check whether --enable-ps2eps was given.
 if test "${enable_ps2eps+set}" = set; then
@@ -2226,7 +2222,7 @@ $as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
 esac
 
 
-## utils/psutils/ac/withenable.ac
+## utils/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/psutils/
 ## configure options and TL libraries required for psutils
 # Check whether --enable-psutils was given.
 if test "${enable_psutils+set}" = set; then
@@ -2241,7 +2237,7 @@ $as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
 esac
 
 
-## utils/t1utils/ac/withenable.ac
+## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/
 ## configure options and TL libraries required for t1utils
 # Check whether --enable-t1utils was given.
 if test "${enable_t1utils+set}" = set; then
@@ -2256,7 +2252,7 @@ $as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
 esac
 
 
-## utils/tpic2pdftex/ac/withenable.ac
+## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/
 ## configure options and TL libraries required for tpic2pdftex
 # Check whether --enable-tpic2pdftex was given.
 if test "${enable_tpic2pdftex+set}" = set; then
@@ -2271,7 +2267,7 @@ $as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
 esac
 
 
-## utils/vlna/ac/withenable.ac
+## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/
 ## configure options and TL libraries required for vlna
 # Check whether --enable-vlna was given.
 if test "${enable_vlna+set}" = set; then
@@ -2287,7 +2283,7 @@ esac
 
 
 
-## texk/ac/withenable.ac
+## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/
 
 ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options and TL libraries required for web2c
@@ -2459,7 +2455,7 @@ if test "${enable_web_progs+set}" = set; then
 fi
 
 
-## texk/afm2pl/ac/withenable.ac
+## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
 ## configure options and TL libraries required for afm2pl
 # Check whether --enable-afm2pl was given.
 if test "${enable_afm2pl+set}" = set; then
@@ -2478,7 +2474,7 @@ test "x$enable_afm2pl" = xno || {
 }
 
 
-## texk/bibtex8/ac/withenable.ac
+## texk/bibtex8/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex8/
 ## configure options and TL libraries required for bibtex8
 # Check whether --enable-bibtex8 was given.
 if test "${enable_bibtex8+set}" = set; then
@@ -2497,7 +2493,7 @@ test "x$enable_bibtex8" = xno || {
 }
 
 
-## texk/cjkutils/ac/withenable.ac
+## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/
 ## configure options and TL libraries required for cjkutils
 # Check whether --enable-cjkutils was given.
 if test "${enable_cjkutils+set}" = set; then
@@ -2516,7 +2512,7 @@ test "x$enable_cjkutils" = xno || {
 }
 
 
-## texk/detex/ac/withenable.ac
+## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/
 ## configure options and TL libraries required for detex
 # Check whether --enable-detex was given.
 if test "${enable_detex+set}" = set; then
@@ -2535,7 +2531,7 @@ test "x$enable_detex" = xno || {
 }
 
 
-## texk/devnag/ac/withenable.ac
+## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/
 ## configure options and TL libraries required for devnag
 # Check whether --enable-devnag was given.
 if test "${enable_devnag+set}" = set; then
@@ -2550,7 +2546,7 @@ $as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
 esac
 
 
-## texk/dtl/ac/withenable.ac
+## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
 ## configure options and TL libraries required for dtl
 # Check whether --enable-dtl was given.
 if test "${enable_dtl+set}" = set; then
@@ -2569,7 +2565,7 @@ test "x$enable_dtl" = xno || {
 }
 
 
-## texk/dvi2tty/ac/withenable.ac
+## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/
 ## configure options and TL libraries required for dvi2tty
 # Check whether --enable-dvi2tty was given.
 if test "${enable_dvi2tty+set}" = set; then
@@ -2588,7 +2584,7 @@ test "x$enable_dvi2tty" = xno || {
 }
 
 
-## texk/dvidvi/ac/withenable.ac
+## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/
 ## configure options and TL libraries required for dvidvi
 # Check whether --enable-dvidvi was given.
 if test "${enable_dvidvi+set}" = set; then
@@ -2607,7 +2603,7 @@ test "x$enable_dvidvi" = xno || {
 }
 
 
-## texk/dviljk/ac/withenable.ac
+## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/
 ## configure options and TL libraries required for dviljk
 # Check whether --enable-dviljk was given.
 if test "${enable_dviljk+set}" = set; then
@@ -2626,7 +2622,7 @@ test "x$enable_dviljk" = xno || {
 }
 
 
-## texk/dvipdfm/ac/withenable.ac
+## texk/dvipdfm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm/
 ## configure options and TL libraries required for dvipdfm
 # Check whether --enable-dvipdfm was given.
 if test "${enable_dvipdfm+set}" = set; then
@@ -2646,7 +2642,7 @@ test "x$enable_dvipdfm" = xno || {
 }
 
 
-## texk/dvipdfmx/ac/withenable.ac
+## texk/dvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfmx/
 ## configure options and TL libraries required for dvipdfmx
 # Check whether --enable-dvipdfmx was given.
 if test "${enable_dvipdfmx+set}" = set; then
@@ -2666,7 +2662,7 @@ test "x$enable_dvipdfmx" = xno || {
 }
 
 
-## texk/dvipng/ac/withenable.ac
+## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
 ## configure options and TL libraries required for dvipng
 # Check whether --enable-dvipng was given.
 if test "${enable_dvipng+set}" = set; then
@@ -2687,7 +2683,7 @@ test "x$enable_dvipng" = xno || {
   need_t1lib=yes
 }
 
-## texk/dvipng/ac/dvipng.ac
+## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
 ## configure options for dvipng
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then
@@ -2707,7 +2703,7 @@ fi
 
 
 
-## texk/dvipos/ac/withenable.ac
+## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/
 ## configure options and TL libraries required for dvipos
 # Check whether --enable-dvipos was given.
 if test "${enable_dvipos+set}" = set; then
@@ -2726,7 +2722,7 @@ test "x$enable_dvipos" = xno || {
 }
 
 
-## texk/dvipsk/ac/withenable.ac
+## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/
 ## configure options and TL libraries required for dvipsk
 # Check whether --enable-dvipsk was given.
 if test "${enable_dvipsk+set}" = set; then
@@ -2745,7 +2741,7 @@ test "x$enable_dvipsk" = xno || {
 }
 
 
-## texk/gsftopk/ac/withenable.ac
+## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
 ## configure options and TL libraries required for gsftopk
 # Check whether --enable-gsftopk was given.
 if test "${enable_gsftopk+set}" = set; then
@@ -2764,7 +2760,7 @@ test "x$enable_gsftopk" = xno || {
 }
 
 
-## texk/lacheck/ac/withenable.ac
+## texk/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lacheck/
 ## configure options and TL libraries required for lacheck
 # Check whether --enable-lacheck was given.
 if test "${enable_lacheck+set}" = set; then
@@ -2783,7 +2779,7 @@ test "x$enable_lacheck" = xno || {
 }
 
 
-## texk/lcdf-typetools/ac/withenable.ac
+## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/
 ## configure options and TL libraries required for lcdf-typetools
 # Check whether --enable-lcdf-typetools was given.
 if test "${enable_lcdf_typetools+set}" = set; then
@@ -2801,7 +2797,7 @@ test "x$enable_lcdf_typetools" = xno || {
   need_kpathsea=yes
 }
 
-## texk/lcdf-typetools/ac/lcdf-typetools.ac
+## texk/lcdf-typetools/ac/lcdf-typetools.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/
 ## configure options for lcdf-typetools
 # Check whether --enable-cfftot1 was given.
 if test "${enable_cfftot1+set}" = set; then
@@ -2863,7 +2859,7 @@ fi
 
 
 
-## texk/makeindexk/ac/withenable.ac
+## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/
 ## configure options and TL libraries required for makeindexk
 # Check whether --enable-makeindexk was given.
 if test "${enable_makeindexk+set}" = set; then
@@ -2882,7 +2878,7 @@ test "x$enable_makeindexk" = xno || {
 }
 
 
-## texk/musixflx/ac/withenable.ac
+## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/
 ## configure options and TL libraries required for musixflx
 # Check whether --enable-musixflx was given.
 if test "${enable_musixflx+set}" = set; then
@@ -2897,7 +2893,7 @@ $as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;}
 esac
 
 
-## texk/ps2pkm/ac/withenable.ac
+## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/
 ## configure options and TL libraries required for ps2pkm
 # Check whether --enable-ps2pkm was given.
 if test "${enable_ps2pkm+set}" = set; then
@@ -2916,7 +2912,7 @@ test "x$enable_ps2pkm" = xno || {
 }
 
 
-## texk/seetexk/ac/withenable.ac
+## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/
 ## configure options and TL libraries required for seetexk
 # Check whether --enable-seetexk was given.
 if test "${enable_seetexk+set}" = set; then
@@ -2935,7 +2931,7 @@ test "x$enable_seetexk" = xno || {
 }
 
 
-## texk/tex4htk/ac/withenable.ac
+## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/
 ## configure options and TL libraries required for tex4htk
 # Check whether --enable-tex4htk was given.
 if test "${enable_tex4htk+set}" = set; then
@@ -2954,7 +2950,7 @@ test "x$enable_tex4htk" = xno || {
 }
 
 
-## texk/ttf2pk/ac/withenable.ac
+## texk/ttf2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk/
 ## configure options and TL libraries required for ttf2pk
 # Check whether --enable-ttf2pk was given.
 if test "${enable_ttf2pk+set}" = set; then
@@ -2974,7 +2970,7 @@ test "x$enable_ttf2pk" = xno || {
 }
 
 
-## texk/ttfdump/ac/withenable.ac
+## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/
 ## configure options and TL libraries required for ttfdump
 # Check whether --enable-ttfdump was given.
 if test "${enable_ttfdump+set}" = set; then
@@ -2993,7 +2989,7 @@ test "x$enable_ttfdump" = xno || {
 }
 
 
-## texk/xdv2pdf/ac/withenable.ac
+## texk/xdv2pdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdv2pdf/
 ## configure options and TL libraries required for xdv2pdf
 # Check whether --enable-xdv2pdf was given.
 if test "${enable_xdv2pdf+set}" = set; then
@@ -3012,7 +3008,7 @@ test "x$enable_xdv2pdf" = xno || {
 }
 
 
-## texk/xdvik/ac/withenable.ac
+## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
 ## configure options and TL libraries required for xdvik
 # Check whether --enable-xdvik was given.
 if test "${enable_xdvik+set}" = set; then
@@ -3031,7 +3027,7 @@ test "x$enable_xdvik" = xno || {
   need_t1lib=yes
 }
 
-## texk/xdvik/ac/xdvik.ac
+## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
 ## configure options for xdvik
 
 # Check whether --with-xdvi-x-toolkit was given.
@@ -3041,7 +3037,7 @@ fi
 
 
 
-## texk/xdvipdfmx/ac/withenable.ac
+## texk/xdvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvipdfmx/
 ## configure options and TL libraries required for xdvipdfmx
 # Check whether --enable-xdvipdfmx was given.
 if test "${enable_xdvipdfmx+set}" = set; then
@@ -3062,7 +3058,7 @@ test "x$enable_xdvipdfmx" = xno || {
 }
 
 
-## texk/tetex/ac/withenable.ac
+## texk/tetex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tetex/
 ## configure options and TL libraries required for tetex
 # Check whether --enable-tetex was given.
 if test "${enable_tetex+set}" = set; then
@@ -3077,7 +3073,7 @@ $as_echo "$as_me: Assuming \`--enable-tetex=$enable_tetex'" >&6;}
 esac
 
 
-## texk/texlive/ac/withenable.ac
+## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
 ## configure options and TL libraries required for texlive
 # Check whether --enable-texlive was given.
 if test "${enable_texlive+set}" = set; then
@@ -3183,13 +3179,13 @@ case $enable_mktextex_default in
 esac
 
 
-## libs/ac/withenable.ac
+## libs/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/
 
 ## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
 ## configure options and TL libraries required for icu (modified for XeTeX)
 
 
-## libs/teckit/ac/withenable.ac
+## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
 ## configure options and TL libraries required for teckit
 
 # Check whether --with-system-teckit was given.
@@ -3236,7 +3232,15 @@ test "x$need_teckit" = xyes && {
 }
 
 
-## libs/graphite/ac/withenable.ac
+## libs/graphite/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/
+## XeTeX can be built without graphite support
+
+# Check whether --with-graphite was given.
+if test "${with_graphite+set}" = set; then
+  withval=$with_graphite;
+fi
+
+test "x$with_graphite" = xno && need_graphite=no
 ## configure options and TL libraries required for graphite
 
 # Check whether --with-system-graphite was given.
@@ -3267,11 +3271,11 @@ $as_echo "$as_me: Assuming installed \`graphite' headers and library" >&6;}
 fi
 
 
-## libs/xpdf/ac/withenable.ac
+## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
 ## configure options and TL libraries required for xpdf
 
 
-## libs/gd/kpse/withenable.ac
+## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
 ## configure options and TL libraries required for gd
 
 # Check whether --with-system-gd was given.
@@ -3318,23 +3322,13 @@ test "x$need_gd" = xyes && {
 }
 
 
-## libs/freetype2/ac/withenable.ac
+## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
 ## configure options and TL libraries required for freetype2
 
 # Check whether --with-system-freetype2 was given.
 if test "${with_system_freetype2+set}" = set; then
   withval=$with_system_freetype2;
 fi
-
-# Check whether --with-freetype2-includes was given.
-if test "${with_freetype2_includes+set}" = set; then
-  withval=$with_freetype2_includes;
-fi
-
-# Check whether --with-freetype2-libdir was given.
-if test "${with_freetype2_libdir+set}" = set; then
-  withval=$with_freetype2_libdir;
-fi
 if test "x$with_system_freetype2" = x; then
   if test -f $srcdir/../libs/freetype2/configure; then
     { $as_echo "$as_me:$LINENO: Assuming \`freetype2' headers and library from TL tree" >&5
@@ -3347,25 +3341,9 @@ $as_echo "$as_me: Assuming installed \`freetype2' headers and library" >&6;}
   fi
   ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'"
 fi
-if test "x$with_system_freetype2" = xyes; then
-  if test "x$with_system_zlib" = x; then
-    { $as_echo "$as_me:$LINENO:   ->  installed \`zlib' headers and library" >&5
-$as_echo "$as_me:   ->  installed \`zlib' headers and library" >&6;}
-    with_system_zlib=yes
-    ac_configure_args="$ac_configure_args '--with-system-zlib'"
-  elif test "x$with_system_zlib" != xyes; then
-    { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5
-$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-test "x$need_freetype2" = xyes && {
-  need_zlib=yes
-}
 
 
-## libs/freetype/ac/withenable.ac
+## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/
 ## configure options and TL libraries required for freetype
 
 # Check whether --with-system-freetype was given.
@@ -3396,7 +3374,7 @@ $as_echo "$as_me: Assuming installed \`freetype' headers and library" >&6;}
 fi
 
 
-## libs/t1lib/ac/withenable.ac
+## libs/t1lib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/t1lib/
 ## configure options and TL libraries required for t1lib
 
 # Check whether --with-system-t1lib was given.
@@ -3427,11 +3405,11 @@ $as_echo "$as_me: Assuming installed \`t1lib' headers and library" >&6;}
 fi
 
 
-## libs/obsdcompat/ac/withenable.ac
+## libs/obsdcompat/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/obsdcompat/
 ## configure options and TL libraries required for obsdcompat
 
 
-## libs/libpng/kpse/withenable.ac
+## libs/libpng/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
 ## configure options and TL libraries required for libpng
 
 # Check whether --with-system-libpng was given.
@@ -3478,7 +3456,7 @@ test "x$need_libpng" = xyes && {
 }
 
 
-## libs/zlib/ac/withenable.ac
+## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
 ## configure options and TL libraries required for zlib
 
 # Check whether --with-system-zlib was given.
diff --git a/Build/source/libs/freetype/Makefile.am b/Build/source/libs/freetype/Makefile.am
index 0dd6397767a..e5842f97d36 100644
--- a/Build/source/libs/freetype/Makefile.am
+++ b/Build/source/libs/freetype/Makefile.am
@@ -14,7 +14,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 ## DISTFILES contains a directory and files in that directory.
 EXTRA_DIST = $(FREETYPE_TREE)
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn`
 
@@ -31,8 +31,8 @@ ft-build/Makefile:
 	    --prefix=$(abs_builddir)/ft-install \
 	    --includedir=$(abs_builddir)
 
-## Unfortunately the FreeType build system installs the headers after the library;
-## to get our dependencies right we wait for a second and then touch the library.
+# Unfortunately the FreeType build system installs the headers after the library;
+# to get our dependencies right we wait for a second and then touch the library.
 libttf.a: ft-build/Makefile
 	rm -rf ft-install
 	cd ft-build/lib \
@@ -41,7 +41,6 @@ libttf.a: ft-build/Makefile
 	mv ft-install/lib/libttf.a .
 	sleep 1
 	touch libttf.a
-	rm -rf ft-install
 
 clean-local:
 	rm -rf libttf.a freetype ft-build ft-install
diff --git a/Build/source/libs/freetype/Makefile.in b/Build/source/libs/freetype/Makefile.in
index 4120063de74..3ce20b9fd07 100644
--- a/Build/source/libs/freetype/Makefile.in
+++ b/Build/source/libs/freetype/Makefile.in
@@ -416,6 +416,7 @@ uninstall-am:
 	pdf-am ps ps-am uninstall uninstall-am
 
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn`
 
@@ -428,6 +429,8 @@ ft-build/Makefile:
 	    --prefix=$(abs_builddir)/ft-install \
 	    --includedir=$(abs_builddir)
 
+# Unfortunately the FreeType build system installs the headers after the library;
+# to get our dependencies right we wait for a second and then touch the library.
 libttf.a: ft-build/Makefile
 	rm -rf ft-install
 	cd ft-build/lib \
@@ -436,7 +439,6 @@ libttf.a: ft-build/Makefile
 	mv ft-install/lib/libttf.a .
 	sleep 1
 	touch libttf.a
-	rm -rf ft-install
 
 clean-local:
 	rm -rf libttf.a freetype ft-build ft-install
diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am
index edfe538a56e..5f6bbe0fdf4 100644
--- a/Build/source/libs/freetype2/Makefile.am
+++ b/Build/source/libs/freetype2/Makefile.am
@@ -14,7 +14,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 ## DISTFILES contains a directory and files in that directory.
 EXTRA_DIST = $(FREETYPE_TREE)
 
-## in case of an SVN repository
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn`
 
@@ -31,6 +31,7 @@ ft-build/Makefile:
 	    --with-old-mac-fonts \
 	    --without-zlib \
 	    --prefix=$(abs_builddir)/ft-install \
+	    --libdir=$(abs_builddir) \
 	    --includedir=$(abs_builddir)
 
 # On MacOSX, using our zlib from TL results in a .a that is unusable; ld
@@ -40,22 +41,18 @@ ft-build/Makefile:
 # be lost, even though it is not the cleanest solution.
 #	    --with-zlib $(ZLIB_FLAGS_FOR_FREETYPE) \
 #
-
-## Unfortunately the FreeType build system installs the headers after the library;
-## get our dependencies right we wait for a second and then touch the library.
+# Unfortunately the FreeType build system installs the headers after the library;
+# to get our dependencies right we wait for a second and then touch the library.
 libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND)
 	rm -rf ft-install
 	cd ft-build \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) install
-	mv ft-install/lib/libfreetype.a .
+	ft-install/bin/freetype-config --cflags >ft-includes
+	ft-install/bin/freetype-config --libs >ft-libs
 	sleep 1
-	touch libfreetype.a
-	rm -rf ft-install
-
-## Rebuild zlib
-@ZLIB_RULE@
+	@for f in libfreetype.*; do touch $$f; done
 
 clean-local:
-	rm -rf libfreetype.a ft2build.h freetype2 ft-build ft-install
+	rm -rf freetype* ft2build.h ft-* libfreetype.* pkgconfig
 
diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in
index 9ce9c30555b..c8e60494663 100644
--- a/Build/source/libs/freetype2/Makefile.in
+++ b/Build/source/libs/freetype2/Makefile.in
@@ -40,9 +40,7 @@ DIST_COMMON = $(am__configure_deps) \
 	../../build-aux/ltmain.sh ../../build-aux/missing \
 	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -97,10 +95,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-ZLIB_DEPEND = @ZLIB_DEPEND@
-ZLIB_FLAGS_FOR_FREETYPE = @ZLIB_FLAGS_FOR_FREETYPE@
-ZLIB_INCLUDES = @ZLIB_INCLUDES@
-ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -422,6 +416,7 @@ uninstall-am:
 	pdf-am ps ps-am uninstall uninstall-am
 
 
+# in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn`
 
@@ -434,6 +429,7 @@ ft-build/Makefile:
 	    --with-old-mac-fonts \
 	    --without-zlib \
 	    --prefix=$(abs_builddir)/ft-install \
+	    --libdir=$(abs_builddir) \
 	    --includedir=$(abs_builddir)
 
 # On MacOSX, using our zlib from TL results in a .a that is unusable; ld
@@ -443,21 +439,20 @@ ft-build/Makefile:
 # be lost, even though it is not the cleanest solution.
 #	    --with-zlib $(ZLIB_FLAGS_FOR_FREETYPE) \
 #
-
+# Unfortunately the FreeType build system installs the headers after the library;
+# to get our dependencies right we wait for a second and then touch the library.
 libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND)
 	rm -rf ft-install
 	cd ft-build \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) install
-	mv ft-install/lib/libfreetype.a .
+	ft-install/bin/freetype-config --cflags >ft-includes
+	ft-install/bin/freetype-config --libs >ft-libs
 	sleep 1
-	touch libfreetype.a
-	rm -rf ft-install
-
-@ZLIB_RULE@
+	@for f in libfreetype.*; do touch $$f; done
 
 clean-local:
-	rm -rf libfreetype.a ft2build.h freetype2 ft-build ft-install
+	rm -rf freetype* ft2build.h ft-* libfreetype.* pkgconfig
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/libs/freetype2/ac/withenable.ac b/Build/source/libs/freetype2/ac/withenable.ac
index 1ac95763640..26d7144f440 100644
--- a/Build/source/libs/freetype2/ac/withenable.ac
+++ b/Build/source/libs/freetype2/ac/withenable.ac
@@ -4,4 +4,6 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
 ## configure options and TL libraries required for freetype2
-KPSE_WITH_LIB([freetype2], [zlib], , , [both -IDIR and -IDIR/freetype2])
+dnl Due to Mac OS X problems we use the internal zlib code.
+dnl KPSE_WITH_LIB([freetype2], [zlib], [nodirs])
+KPSE_WITH_LIB([freetype2], , [nodirs], [requires freetype-config])
diff --git a/Build/source/libs/freetype2/aclocal.m4 b/Build/source/libs/freetype2/aclocal.m4
index addc3e47032..a249a8e6d87 100644
--- a/Build/source/libs/freetype2/aclocal.m4
+++ b/Build/source/libs/freetype2/aclocal.m4
@@ -616,5 +616,3 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([../../m4/kpse-common.m4])
-m4_include([../../m4/kpse-zlib-flags.m4])
diff --git a/Build/source/libs/freetype2/configure b/Build/source/libs/freetype2/configure
index a0280b46d2a..7a1f760fe2d 100755
--- a/Build/source/libs/freetype2/configure
+++ b/Build/source/libs/freetype2/configure
@@ -607,11 +607,6 @@ FREETYPE_TREE
 config_args
 build_FALSE
 build_TRUE
-ZLIB_FLAGS_FOR_FREETYPE
-ZLIB_RULE
-ZLIB_DEPEND
-ZLIB_LIBS
-ZLIB_INCLUDES
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -679,9 +674,6 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
-with_system_zlib
-with_zlib_includes
-with_zlib_libdir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1316,14 +1308,6 @@ Optional Features:
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
 
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-system-zlib      use installed zlib headers and library
-  --with-zlib-includes=DIR
-                          zlib headers installed in DIR
-  --with-zlib-libdir=DIR  zlib library installed in DIR
-
 Report bugs to <tex-k@tug.org>.
 _ACEOF
 ac_status=$?
@@ -2286,55 +2270,6 @@ fi
 
 
 
-## _KPSE_INIT: Initialize TL infrastructure
-kpse_BLD=`(cd "./../../." && pwd)`
-kpse_SRC=`(cd "$srcdir/../../." && pwd)`
-
-## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags
-
-# Check whether --with-system-zlib was given.
-if test "${with_system_zlib+set}" = set; then
-  withval=$with_system_zlib;
-fi
-
-# Check whether --with-zlib-includes was given.
-if test "${with_zlib_includes+set}" = set; then
-  withval=$with_zlib_includes;
-fi
-
-# Check whether --with-zlib-libdir was given.
-if test "${with_zlib_libdir+set}" = set; then
-  withval=$with_zlib_libdir;
-fi
-if test "x$with_system_zlib" = xyes; then
-  if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
-  ZLIB_INCLUDES="-I$with_zlib_includes"
-fi
-ZLIB_LIBS="-lz"
-if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then
-  ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS"
-fi
-else
-  ZLIB_INCLUDES=`echo '-IBLD/libs/zlib' | sed \
-    -e "s,SRC/,$kpse_SRC/,g" \
-    -e "s,BLD/,$kpse_BLD/,g"`
-  ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \
-    -e "s,BLD/,$kpse_BLD/,g"`
-  ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \
-    -e 's,BLD/,${top_builddir}/../../,g'`
-   ZLIB_RULE='# Rebuild libz
-$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h
-	cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS)
-${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h:
-	cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS)'
-fi
-
-
-ZLIB_FLAGS_FOR_FREETYPE="LIBZ='$ZLIB_LIBS'"
-test -n "$ZLIB_INCLUDES" && \
-  ZLIB_FLAGS_FOR_FREETYPE="CPPFLAGS='$ZLIB_INCLUDES' $ZLIB_FLAGS_FOR_FREETYPE"
-
-
  if test "x$enable_build" != xno; then
   build_TRUE=
   build_FALSE='#'
diff --git a/Build/source/libs/freetype2/configure.ac b/Build/source/libs/freetype2/configure.ac
index 45b775d5f18..aef7b5b3d30 100644
--- a/Build/source/libs/freetype2/configure.ac
+++ b/Build/source/libs/freetype2/configure.ac
@@ -16,13 +16,6 @@ AC_CONFIG_MACRO_DIR([../../m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-KPSE_ZLIB_FLAGS
-
-ZLIB_FLAGS_FOR_FREETYPE="LIBZ='$ZLIB_LIBS'"
-test -n "$ZLIB_INCLUDES" && \
-  ZLIB_FLAGS_FOR_FREETYPE="CPPFLAGS='$ZLIB_INCLUDES' $ZLIB_FLAGS_FOR_FREETYPE"
-AC_SUBST([ZLIB_FLAGS_FOR_FREETYPE])
-
 AM_CONDITIONAL([build], [test "x$enable_build" != xno])
 
 if test "x$host" = x; then
diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4
index 68feb0de66c..387aeaa3262 100644
--- a/Build/source/m4/kpse-freetype2-flags.m4
+++ b/Build/source/m4/kpse-freetype2-flags.m4
@@ -9,28 +9,47 @@
 
 # KPSE_FREETYPE2_FLAGS([SHELL-CODE=DEFAULT-SHELL-CODE])
 # -----------------------------------------------------
-# Provide the configure options '--with-system-freetype2' (if in the TL tree),
-# '--with-freetype2-includes', and '--with-freetype2-libdir'.
+# Provide the configure options '--with-system-freetype2' (if in the TL tree).
 #
 # Set the make variables FREETYPE2_INCLUDES and FREETYPE2_LIBS to the CPPFLAGS and
 # LIBS required for the `-lfreetype' library in libs/freetype2/ of the TL tree.
+dnl AC_DEFUN([KPSE_FREETYPE2_FLAGS],
+dnl [AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
+dnl _KPSE_LIB_FLAGS([freetype2], [freetype],
+dnl                 [$1],
+dnl                 [-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2],
+dnl                 [BLD/libs/freetype2/libfreetype.a], [],
+dnl                 [], [${top_builddir}/../../libs/freetype2/ft2build.h])[]dnl
+dnl ]) # KPSE_FREETYPE2_FLAGS
 AC_DEFUN([KPSE_FREETYPE2_FLAGS],
-[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
+[AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
 _KPSE_LIB_FLAGS([freetype2], [freetype],
-                 [$1],
-                 [-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2],
-                 [BLD/libs/freetype2/libfreetype.a], [],
-                 [], [${top_builddir}/../../libs/freetype2/ft2build.h])[]dnl
+                [$1],
+                [cat BLD/libs/freetype2/ft-],
+                [BLD/libs/freetype2/libfreetype.a], [],
+                [], [${top_builddir}/../../libs/freetype2/ft2build.h])[]dnl
+if test "x$with_system_freetype2" = xno; then
+  FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`'
+  FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`'
+fi
 ]) # KPSE_FREETYPE2_FLAGS
 
 # KPSE_FREETYPE2_SYSTEM_FLAGS
 # ---------------------------
 AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS],
-[if test "x$with_freetype2_includes" != x && test "x$with_freetype2_includes" != xyes; then
-  FREETYPE2_INCLUDES="-I$with_freetype2_includes/freetype2 -I$with_freetype2_includes"
-fi
-FREETYPE2_LIBS="-lfreetype"
-if test "x$with_freetype2_libdir" != x && test "x$with_freetype2_libdir" != xyes; then
-  FREETYPE2_LIBS="-L$with_freetype2_libdir $FREETYPE2_LIBS"
+[AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
+if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
+  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+else
+  AC_MSG_ERROR([Can not use installed freetype2 headers and library])
 fi
 ]) # KPSE_FREETYPE2_SYSTEM_FLAGS
+
+# _KPSE_CHECK_FT2_CONFIG
+# ----------------------
+# Check for freetype-config
+AC_DEFUN([_KPSE_CHECK_FT2_CONFIG],
+[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [:])[]dnl
+]) # _KPSE_CHECK_FT2_CONFIG
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index 48097c1f9ea..b6cfa8ebcb9 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -41,7 +41,7 @@ KPSE_FOR_PKGS([libs], [m4_sinclude(kpse_TL[libs/]Kpse_Pkg[/ac/withenable.ac])])
 # Provide the configure option --enable-PROG if the option `without' is
 # specified, or -disable-PROG otherwise.
 # Define the list of libraries required from the TL tree (if any).
-# Options: 
+# Options:
 #          without - do not build by default
 AC_DEFUN([KPSE_WITH_PROG],
 [m4_pushdef([Kpse_with], m4_if(m4_index([ $3 ], [ without ]), [-1], [yes], [no]))[]dnl
@@ -67,11 +67,13 @@ AC_FOREACH([Kpse_Lib], [$2], [  need_[]AS_TR_SH(Kpse_Lib)=yes
 # KPSE_WITH_LIB(LIB, REQUIRED-LIBS, OPTIONS, [COMMENT-SYS],
                 [COMMENT-INC], [COMMENT-LIB])
 # ---------------------------------------------------------
-# Unless the option `tree' is specified, provide the configure options
-# --with-system-LIB, --with-LIB-includes, and --with-LIB-libdir.
+# Unless the option `tree' is specified, provide the configure option.
+# --with-system-LIB; in addition provide --with-LIB-includes, and
+# --with-LIB-libdir unless the option `nodirs' is specified.
 # Define the list of libraries required from the TL tree (if any).
-# Options: 
+# Options:
 #          tree - only use library from the TL tree
+#          nodirs - prevent --with-LIB-*=DIR configure options
 # The last three arguments are optional additions to the help texts.
 #
 # At the top-level we build a (reversed) list of potential system libraries.
@@ -80,12 +82,14 @@ AC_DEFUN([KPSE_WITH_LIB],
 [AC_ARG_WITH([system-$1],
              [AS_HELP_STRING([--with-system-$1],
                              [use installed $1 headers and library]m4_ifval([$4], [ ($4)]))])[]dnl
-AC_ARG_WITH([$1-includes],
-            [AS_HELP_STRING([--with-$1-includes=DIR],
-                            [$1 headers installed in DIR]m4_ifval([$5], [ ($5)]))])[]dnl
+m4_if(m4_index([ $3 ], [ nodirs ]), [-1],
+[AC_ARG_WITH([$1-includes],
+             [AS_HELP_STRING([--with-$1-includes=DIR],
+                             [$1 headers installed in DIR]m4_ifval([$5], [ ($5)]))])[]dnl
 AC_ARG_WITH([$1-libdir],
             [AS_HELP_STRING([--with-$1-libdir=DIR],
                             [$1 library installed in DIR]m4_ifval([$6], [ ($6)]))])[]dnl
+])[]dnl m4_if
 if test "x$with_system_[]AS_TR_SH($1)" = x; then
   if test -f $srcdir/kpse_TL[]m4_if([$1], [kpathsea], [texk], [libs])/$1/configure; then
     AC_MSG_NOTICE([Assuming `$1' headers and library from TL tree])
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index ae418ab913e..47f47afedbd 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -782,8 +782,6 @@ with_system_gd
 with_gd_includes
 with_gd_libdir
 with_system_freetype2
-with_freetype2_includes
-with_freetype2_libdir
 with_system_freetype
 with_freetype_includes
 with_freetype_libdir
@@ -1582,11 +1580,7 @@ Optional Packages:
   --with-gd-includes=DIR  gd headers installed in DIR
   --with-gd-libdir=DIR    gd library installed in DIR
   --with-system-freetype2 use installed freetype2 headers and library
-  --with-freetype2-includes=DIR
-                          freetype2 headers installed in DIR (both -IDIR and
-                          -IDIR/freetype2)
-  --with-freetype2-libdir=DIR
-                          freetype2 library installed in DIR
+                          (requires freetype-config)
   --with-system-freetype  use installed freetype headers and library
   --with-freetype-includes=DIR
                           freetype headers installed in DIR
@@ -3354,16 +3348,6 @@ test "x$need_gd" = xyes && {
 if test "${with_system_freetype2+set}" = set; then
   withval=$with_system_freetype2;
 fi
-
-# Check whether --with-freetype2-includes was given.
-if test "${with_freetype2_includes+set}" = set; then
-  withval=$with_freetype2_includes;
-fi
-
-# Check whether --with-freetype2-libdir was given.
-if test "${with_freetype2_libdir+set}" = set; then
-  withval=$with_freetype2_libdir;
-fi
 if test "x$with_system_freetype2" = x; then
   if test -f $srcdir/../libs/freetype2/configure; then
     { $as_echo "$as_me:$LINENO: Assuming \`freetype2' headers and library from TL tree" >&5
@@ -3376,22 +3360,6 @@ $as_echo "$as_me: Assuming installed \`freetype2' headers and library" >&6;}
   fi
   ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'"
 fi
-if test "x$with_system_freetype2" = xyes; then
-  if test "x$with_system_zlib" = x; then
-    { $as_echo "$as_me:$LINENO:   ->  installed \`zlib' headers and library" >&5
-$as_echo "$as_me:   ->  installed \`zlib' headers and library" >&6;}
-    with_system_zlib=yes
-    ac_configure_args="$ac_configure_args '--with-system-zlib'"
-  elif test "x$with_system_zlib" != xyes; then
-    { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5
-$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-test "x$need_freetype2" = xyes && {
-  need_zlib=yes
-}
 
 
 ## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index d719af981a3..842a1cf6d1d 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -174,6 +174,7 @@ FGREP = @FGREP@
 FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
 FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
 GD_DEPEND = @GD_DEPEND@
 GD_INCLUDES = @GD_INCLUDES@
 GD_LIBS = @GD_LIBS@
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index e4f5a7ec9cc..32189fb41c6 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -796,14 +796,15 @@ have_ft2_FALSE
 have_ft2_TRUE
 have_t1_FALSE
 have_t1_TRUE
-FREETYPE2_RULE
-FREETYPE2_DEPEND
-FREETYPE2_LIBS
-FREETYPE2_INCLUDES
 GD_RULE
 GD_DEPEND
 GD_LIBS
 GD_INCLUDES
+FREETYPE2_RULE
+FREETYPE2_DEPEND
+FREETYPE2_LIBS
+FREETYPE2_INCLUDES
+FT2_CONFIG
 T1LIB_RULE
 T1LIB_DEPEND
 T1LIB_LIBS
@@ -959,12 +960,12 @@ with_libpng_libdir
 with_system_t1lib
 with_t1lib_includes
 with_t1lib_libdir
-with_system_gd
-with_gd_includes
-with_gd_libdir
 with_system_freetype2
 with_freetype2_includes
 with_freetype2_libdir
+with_system_gd
+with_gd_includes
+with_gd_libdir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1643,14 +1644,14 @@ Optional Packages:
   --with-t1lib-includes=DIR
                           t1lib headers installed in DIR
   --with-t1lib-libdir=DIR t1lib library installed in DIR
-  --with-system-gd        use installed gd headers and library
-  --with-gd-includes=DIR  gd headers installed in DIR
-  --with-gd-libdir=DIR    gd library installed in DIR
   --with-system-freetype2 use installed freetype2 headers and library
   --with-freetype2-includes=DIR
                           freetype2 headers installed in DIR
   --with-freetype2-libdir=DIR
                           freetype2 library installed in DIR
+  --with-system-gd        use installed gd headers and library
+  --with-gd-includes=DIR  gd headers installed in DIR
+  --with-gd-libdir=DIR    gd library installed in DIR
 
 Some influential environment variables:
   CC          C compiler command
@@ -4243,13 +4244,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4246: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4247: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4249: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4250: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4252: output\"" >&5)
+  (eval echo "\"\$as_me:4253: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5455,7 +5456,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5458 "configure"' > conftest.$ac_ext
+  echo '#line 5459 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7502,11 +7503,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7505: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7506: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7509: \$? = $ac_status" >&5
+   echo "$as_me:7510: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7841,11 +7842,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7844: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7845: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7848: \$? = $ac_status" >&5
+   echo "$as_me:7849: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7946,11 +7947,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7949: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7950: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7953: \$? = $ac_status" >&5
+   echo "$as_me:7954: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8001,11 +8002,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8004: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8005: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8008: \$? = $ac_status" >&5
+   echo "$as_me:8009: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10801,7 +10802,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10804 "configure"
+#line 10805 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10897,7 +10898,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10900 "configure"
+#line 10901 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18116,43 +18117,96 @@ ${top_builddir}/../../libs/t1lib/t1lib.h:
 	cd ${top_builddir}/../../libs/t1lib && $(MAKE) $(AM_MAKEFLAGS)'
 fi
 
-## _KPSE_LIB_FLAGS: Setup gd (-lgd) flags
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}freetype-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_FT2_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$FT2_CONFIG"; then
+  ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-# Check whether --with-system-gd was given.
-if test "${with_system_gd+set}" = set; then
-  withval=$with_system_gd;
+fi
+fi
+FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
+if test -n "$FT2_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $FT2_CONFIG" >&5
+$as_echo "$FT2_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-# Check whether --with-gd-includes was given.
-if test "${with_gd_includes+set}" = set; then
-  withval=$with_gd_includes;
+
 fi
+if test -z "$ac_cv_prog_FT2_CONFIG"; then
+  ac_ct_FT2_CONFIG=$FT2_CONFIG
+  # Extract the first word of "freetype-config", so it can be a program name with args.
+set dummy freetype-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_FT2_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_FT2_CONFIG"; then
+  ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-# Check whether --with-gd-libdir was given.
-if test "${with_gd_libdir+set}" = set; then
-  withval=$with_gd_libdir;
 fi
-if test "x$with_system_gd" = xyes; then
-  if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then
-  GD_INCLUDES="-I$with_gd_includes"
 fi
-GD_LIBS="-lgd"
-if test "x$with_gd_libdir" != x && test "x$with_gd_libdir" != xyes; then
-  GD_LIBS="-L$with_gd_libdir $GD_LIBS"
+ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
+if test -n "$ac_ct_FT2_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_FT2_CONFIG" >&5
+$as_echo "$ac_ct_FT2_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
+  if test "x$ac_ct_FT2_CONFIG" = x; then
+    FT2_CONFIG=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    FT2_CONFIG=$ac_ct_FT2_CONFIG
+  fi
 else
-  GD_INCLUDES=`echo '-IBLD/libs/gd' | sed \
-    -e "s,SRC/,$kpse_SRC/,g" \
-    -e "s,BLD/,$kpse_BLD/,g"`
-  GD_LIBS=`echo 'BLD/libs/gd/libgd.a' | sed \
-    -e "s,BLD/,$kpse_BLD/,g"`
-  GD_DEPEND=`echo 'BLD/libs/gd/libgd.a' | sed \
-    -e 's,BLD/,${top_builddir}/../../,g'`
-   GD_RULE='# Rebuild libgd
-$(GD_DEPEND): ${top_builddir}/../../libs/gd/gd.h
-	cd ${top_builddir}/../../libs/gd && $(MAKE) $(AM_MAKEFLAGS)
-${top_builddir}/../../libs/gd/gd.h:
-	cd ${top_builddir}/../../libs/gd && $(MAKE) $(AM_MAKEFLAGS)'
+  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
 fi
 
 ## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
@@ -18172,15 +18226,16 @@ if test "${with_freetype2_libdir+set}" = set; then
   withval=$with_freetype2_libdir;
 fi
 if test "x$with_system_freetype2" = xyes; then
-  if test "x$with_freetype2_includes" != x && test "x$with_freetype2_includes" != xyes; then
-  FREETYPE2_INCLUDES="-I$with_freetype2_includes/freetype2 -I$with_freetype2_includes"
-fi
-FREETYPE2_LIBS="-lfreetype"
-if test "x$with_freetype2_libdir" != x && test "x$with_freetype2_libdir" != xyes; then
-  FREETYPE2_LIBS="-L$with_freetype2_libdir $FREETYPE2_LIBS"
+  if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
+  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+else
+  { { $as_echo "$as_me:$LINENO: error: Can not use installed freetype2 headers and library" >&5
+$as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 else
-  FREETYPE2_INCLUDES=`echo '-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2' | sed \
+  FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \
     -e "s,SRC/,$kpse_SRC/,g" \
     -e "s,BLD/,$kpse_BLD/,g"`
   FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
@@ -18193,6 +18248,51 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
 ${top_builddir}/../../libs/freetype2/ft2build.h:
 	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)'
 fi
+if test "x$with_system_freetype2" = xno; then
+  FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`'
+  FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`'
+fi
+
+kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
+kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
+## _KPSE_LIB_FLAGS: Setup gd (-lgd) flags
+
+# Check whether --with-system-gd was given.
+if test "${with_system_gd+set}" = set; then
+  withval=$with_system_gd;
+fi
+
+# Check whether --with-gd-includes was given.
+if test "${with_gd_includes+set}" = set; then
+  withval=$with_gd_includes;
+fi
+
+# Check whether --with-gd-libdir was given.
+if test "${with_gd_libdir+set}" = set; then
+  withval=$with_gd_libdir;
+fi
+if test "x$with_system_gd" = xyes; then
+  if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then
+  GD_INCLUDES="-I$with_gd_includes"
+fi
+GD_LIBS="-lgd"
+if test "x$with_gd_libdir" != x && test "x$with_gd_libdir" != xyes; then
+  GD_LIBS="-L$with_gd_libdir $GD_LIBS"
+fi
+else
+  GD_INCLUDES=`echo '-IBLD/libs/gd' | sed \
+    -e "s,SRC/,$kpse_SRC/,g" \
+    -e "s,BLD/,$kpse_BLD/,g"`
+  GD_LIBS=`echo 'BLD/libs/gd/libgd.a' | sed \
+    -e "s,BLD/,$kpse_BLD/,g"`
+  GD_DEPEND=`echo 'BLD/libs/gd/libgd.a' | sed \
+    -e 's,BLD/,${top_builddir}/../../,g'`
+   GD_RULE='# Rebuild libgd
+$(GD_DEPEND): ${top_builddir}/../../libs/gd/gd.h
+	cd ${top_builddir}/../../libs/gd && $(MAKE) $(AM_MAKEFLAGS)
+${top_builddir}/../../libs/gd/gd.h:
+	cd ${top_builddir}/../../libs/gd && $(MAKE) $(AM_MAKEFLAGS)'
+fi
 
 
 
@@ -18406,6 +18506,19 @@ fi
 fi
 
 
+set -x
+kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
+kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
+eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES"
+eval FREETYPE2_LIBS="$FREETYPE2_LIBS"
+set +x
+{ $as_echo "$as_me:$LINENO: FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"" >&5
+$as_echo "$as_me: FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"" >&6;}
+{ $as_echo "$as_me:$LINENO: FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"" >&5
+$as_echo "$as_me: FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"" >&6;}
+CPPFLAGS="$CPPFLAGS $FREETYPE2_INCLUDES"
+LIBS="$FREETYPE2_LIBS $LIBS"
+
 CPPFLAGS="$CPPFLAGS $GD_INCLUDES"
 LIBS="$GD_LIBS $LIBS"
 
@@ -19353,6 +19466,8 @@ fi
 CPPFLAGS=$kpse_save_CPPFLAGS
 LIBS=$kpse_save_LIBS
 
+FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES
+FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS
 
 DVIPNG_VERSION=1.12
 
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index 44d552c2970..135f48276c2 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -98,8 +98,10 @@ KPSE_KPATHSEA_FLAGS
 KPSE_ZLIB_FLAGS
 KPSE_LIBPNG_FLAGS
 KPSE_T1LIB_FLAGS
-KPSE_GD_FLAGS
 KPSE_FREETYPE2_FLAGS
+kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
+kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
+KPSE_GD_FLAGS
 
 dnl We have to check properties of libraries, either installed (system)
 dnl libraries or unistalled (possibly libtool) ones from the TL tree.
@@ -117,6 +119,15 @@ AC_CHECK_FUNC([png_read_image],
                          [Define to 1 if you have the `png' library (-lpng).])],
               [KPSE_MSG_ERROR([dvipng], [cannot find/use libpng])])
 
+set -x
+kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
+kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
+eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES"
+eval FREETYPE2_LIBS="$FREETYPE2_LIBS"
+set +x
+AC_MSG_NOTICE([FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"])
+AC_MSG_NOTICE([FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"])
+KPSE_ADD_FLAGS([freetype2])
 KPSE_ADD_FLAGS([gd])
 AC_CHECK_FUNC([gdImageCreate],
               [AC_DEFINE([HAVE_LIBGD], 1,
@@ -163,6 +174,8 @@ AC_CHECK_FUNCS([gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImag
 AM_CONDITIONAL([have_gif], [test "x$ac_cv_func_gdImageGif" = xyes])
 
 KPSE_RESTORE_FLAGS
+FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES
+FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS
 
 DVIPNG_VERSION=dvipng_version
 AC_SUBST([DVIPNG_VERSION])
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index fff4c930327..26c5b1b3441 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -823,6 +823,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
 FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
 GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
 GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
 GRAPHITE_LIBS = @GRAPHITE_LIBS@
@@ -981,9 +982,9 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
 	tmf-pool.h mf.web mf-binpool.ch mf.ch mftalk.h lib/texmfmp.c \
 	tmf-pool.h mp.web mp.ch lib/texmfmp.c mpdir/mp.defines \
 	mpdir/mplib.h metapost.mk mpdir/Makefile.in.orig \
-	mpdir/mpostlib.mk $(mpost_web) $(libmplib_web) \
-	mplibdir/lmplib.c $(etex_web_srcs) $(etex_ch_srcs) \
-	etexdir/etexextra.in lib/texmfmp.c tmf-pool.h \
+	mpdir/mpostlib.mk mplibdir/ChangeLog $(mpost_web) \
+	$(libmplib_web) mplibdir/lmplib.c $(etex_web_srcs) \
+	$(etex_ch_srcs) etexdir/etexextra.in lib/texmfmp.c tmf-pool.h \
 	etexdir/ChangeLog etexdir/INSTALL etexdir/README \
 	etexdir/etex_gen.tex etexdir/etex.mak etexdir/etex.mk \
 	$(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/pdftex.h \
@@ -1655,11 +1656,15 @@ libluatex_a_SOURCES = \
 	luatexdir/image/epdf.h \
 	luatexdir/image/image.h \
 	luatexdir/image/pdftoepdf.cc \
+	luatexdir/image/pdftoepdf.h \
 	luatexdir/image/writeimg.c \
+	luatexdir/image/writeimg.h \
 	luatexdir/image/writejbig2.c \
 	luatexdir/image/writejbig2.h \
 	luatexdir/image/writejpg.c \
+	luatexdir/image/writejpg.h \
 	luatexdir/image/writepng.c \
+	luatexdir/image/writepng.h \
 	luatexdir/lang/hnjalloc.c \
 	luatexdir/lang/hnjalloc.h \
 	luatexdir/lang/hyphen.c \
@@ -1717,6 +1722,7 @@ libluatex_a_SOURCES = \
 	luatexdir/utils/synctex.h \
 	luatexdir/utils/synctex.c \
 	luatexdir/utils/utils.c \
+	luatexdir/utils/utils.h \
 	luatexdir/utils/writezip.c \
 	mplibdir/lmplib.c
 
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index fe0ad37648d..c4ee2195f78 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -813,6 +813,7 @@ FREETYPE2_RULE
 FREETYPE2_DEPEND
 FREETYPE2_LIBS
 FREETYPE2_INCLUDES
+FT2_CONFIG
 GRAPHITE_RULE
 GRAPHITE_DEPEND
 GRAPHITE_LIBS
@@ -4406,13 +4407,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4409: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4410: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4412: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4413: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4415: output\"" >&5)
+  (eval echo "\"\$as_me:4416: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5618,7 +5619,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5621 "configure"' > conftest.$ac_ext
+  echo '#line 5622 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7665,11 +7666,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7668: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7669: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7672: \$? = $ac_status" >&5
+   echo "$as_me:7673: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8004,11 +8005,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8007: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8008: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8011: \$? = $ac_status" >&5
+   echo "$as_me:8012: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8109,11 +8110,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8112: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8113: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8116: \$? = $ac_status" >&5
+   echo "$as_me:8117: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8164,11 +8165,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8167: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8168: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8171: \$? = $ac_status" >&5
+   echo "$as_me:8172: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10964,7 +10965,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10967 "configure"
+#line 10968 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11060,7 +11061,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11063 "configure"
+#line 11064 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16076,11 +16077,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16079: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16080: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16083: \$? = $ac_status" >&5
+   echo "$as_me:16084: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16175,11 +16176,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16178: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16179: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16182: \$? = $ac_status" >&5
+   echo "$as_me:16183: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16227,11 +16228,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16230: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16231: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16234: \$? = $ac_status" >&5
+   echo "$as_me:16235: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -23505,6 +23506,98 @@ $(GRAPHITE_DEPEND):
 	cd ${top_builddir}/../../libs/graphite && $(MAKE) $(AM_MAKEFLAGS)'
 fi
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}freetype-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_FT2_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$FT2_CONFIG"; then
+  ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
+if test -n "$FT2_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $FT2_CONFIG" >&5
+$as_echo "$FT2_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_FT2_CONFIG"; then
+  ac_ct_FT2_CONFIG=$FT2_CONFIG
+  # Extract the first word of "freetype-config", so it can be a program name with args.
+set dummy freetype-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_FT2_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_FT2_CONFIG"; then
+  ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
+if test -n "$ac_ct_FT2_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_FT2_CONFIG" >&5
+$as_echo "$ac_ct_FT2_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_FT2_CONFIG" = x; then
+    FT2_CONFIG=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    FT2_CONFIG=$ac_ct_FT2_CONFIG
+  fi
+else
+  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+fi
+
 ## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
 
 # Check whether --with-system-freetype2 was given.
@@ -23522,15 +23615,16 @@ if test "${with_freetype2_libdir+set}" = set; then
   withval=$with_freetype2_libdir;
 fi
 if test "x$with_system_freetype2" = xyes; then
-  if test "x$with_freetype2_includes" != x && test "x$with_freetype2_includes" != xyes; then
-  FREETYPE2_INCLUDES="-I$with_freetype2_includes/freetype2 -I$with_freetype2_includes"
-fi
-FREETYPE2_LIBS="-lfreetype"
-if test "x$with_freetype2_libdir" != x && test "x$with_freetype2_libdir" != xyes; then
-  FREETYPE2_LIBS="-L$with_freetype2_libdir $FREETYPE2_LIBS"
+  if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
+  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+else
+  { { $as_echo "$as_me:$LINENO: error: Can not use installed freetype2 headers and library" >&5
+$as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 else
-  FREETYPE2_INCLUDES=`echo '-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2' | sed \
+  FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \
     -e "s,SRC/,$kpse_SRC/,g" \
     -e "s,BLD/,$kpse_BLD/,g"`
   FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
@@ -23543,6 +23637,10 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
 ${top_builddir}/../../libs/freetype2/ft2build.h:
 	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)'
 fi
+if test "x$with_system_freetype2" = xno; then
+  FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`'
+  FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`'
+fi
 
 ## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
 
diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index 20a787d481e..88b37dfb66b 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -125,6 +125,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
 FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
 GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
 GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
 GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index c47c893cffd..9a6800de692 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -130,6 +130,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
 FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
 GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
 GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
 GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 8d0979871db..c238f0bda1a 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -120,6 +120,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
 FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
 GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
 GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
 GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index 3256bc925c3..a4aad4b0290 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -31,7 +31,7 @@ mpost_web = mplibdir/mpost.w mplibdir/mpxout.w
 
 $(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a
 
-EXTRA_DIST += $(mpost_web)
+EXTRA_DIST += mplibdir/ChangeLog $(mpost_web)
 
 DISTCLEANFILES += $(nodist_mpost_SOURCES) mpxout-ctangle
 
diff --git a/Build/source/texk/web2c/mpware/Makefile.in b/Build/source/texk/web2c/mpware/Makefile.in
index bdeeb1a74b4..4e95ffc7ede 100644
--- a/Build/source/texk/web2c/mpware/Makefile.in
+++ b/Build/source/texk/web2c/mpware/Makefile.in
@@ -140,6 +140,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
 FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
 GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
 GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
 GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index 65766345166..e6f250633fc 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -146,6 +146,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
 FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
 GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
 GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
 GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 8bfd5e4ece8..444be45f025 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -148,6 +148,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
 FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
 GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
 GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
 GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index f157e292a89..d09dbcc5dae 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -135,6 +135,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
 FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
 GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
 GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
 GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in
index a05d3f3a546..8d9f36da05f 100644
--- a/Build/source/texk/xdvipdfmx/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/Makefile.in
@@ -118,6 +118,7 @@ FGREP = @FGREP@
 FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
 FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index 6aa442472e9..4e1b5058133 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -795,6 +795,7 @@ FREETYPE2_RULE
 FREETYPE2_DEPEND
 FREETYPE2_LIBS
 FREETYPE2_INCLUDES
+FT2_CONFIG
 LIBPNG_RULE
 LIBPNG_DEPEND
 LIBPNG_LIBS
@@ -4211,13 +4212,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4214: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4215: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4217: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4218: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4220: output\"" >&5)
+  (eval echo "\"\$as_me:4221: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5423,7 +5424,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5426 "configure"' > conftest.$ac_ext
+  echo '#line 5427 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7470,11 +7471,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7473: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7474: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7477: \$? = $ac_status" >&5
+   echo "$as_me:7478: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7809,11 +7810,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7812: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7813: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7816: \$? = $ac_status" >&5
+   echo "$as_me:7817: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7914,11 +7915,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7917: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7918: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7921: \$? = $ac_status" >&5
+   echo "$as_me:7922: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7969,11 +7970,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7972: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7973: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7976: \$? = $ac_status" >&5
+   echo "$as_me:7977: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10769,7 +10770,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10772 "configure"
+#line 10773 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10865,7 +10866,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10868 "configure"
+#line 10869 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17348,6 +17349,98 @@ ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngcon
 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS)'
 fi
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}freetype-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_FT2_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$FT2_CONFIG"; then
+  ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
+if test -n "$FT2_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $FT2_CONFIG" >&5
+$as_echo "$FT2_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_FT2_CONFIG"; then
+  ac_ct_FT2_CONFIG=$FT2_CONFIG
+  # Extract the first word of "freetype-config", so it can be a program name with args.
+set dummy freetype-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_FT2_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_FT2_CONFIG"; then
+  ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
+if test -n "$ac_ct_FT2_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_FT2_CONFIG" >&5
+$as_echo "$ac_ct_FT2_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_FT2_CONFIG" = x; then
+    FT2_CONFIG=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    FT2_CONFIG=$ac_ct_FT2_CONFIG
+  fi
+else
+  FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+fi
+
 ## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
 
 # Check whether --with-system-freetype2 was given.
@@ -17365,15 +17458,16 @@ if test "${with_freetype2_libdir+set}" = set; then
   withval=$with_freetype2_libdir;
 fi
 if test "x$with_system_freetype2" = xyes; then
-  if test "x$with_freetype2_includes" != x && test "x$with_freetype2_includes" != xyes; then
-  FREETYPE2_INCLUDES="-I$with_freetype2_includes/freetype2 -I$with_freetype2_includes"
-fi
-FREETYPE2_LIBS="-lfreetype"
-if test "x$with_freetype2_libdir" != x && test "x$with_freetype2_libdir" != xyes; then
-  FREETYPE2_LIBS="-L$with_freetype2_libdir $FREETYPE2_LIBS"
+  if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
+  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+else
+  { { $as_echo "$as_me:$LINENO: error: Can not use installed freetype2 headers and library" >&5
+$as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 else
-  FREETYPE2_INCLUDES=`echo '-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2' | sed \
+  FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \
     -e "s,SRC/,$kpse_SRC/,g" \
     -e "s,BLD/,$kpse_BLD/,g"`
   FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
@@ -17386,6 +17480,10 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
 ${top_builddir}/../../libs/freetype2/ft2build.h:
 	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)'
 fi
+if test "x$with_system_freetype2" = xno; then
+  FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`'
+  FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`'
+fi
 
 
 kpse_save_CPPFLAGS=$CPPFLAGS
@@ -18096,6 +18194,12 @@ fi
 
 
 
+set -x
+kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
+kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
+eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES"
+eval FREETYPE2_LIBS="$FREETYPE2_LIBS"
+set +x
 CPPFLAGS="$CPPFLAGS $FREETYPE2_INCLUDES"
 LIBS="$FREETYPE2_LIBS $LIBS"
 
@@ -18289,6 +18393,8 @@ fi
 CPPFLAGS=$kpse_save_CPPFLAGS
 LIBS=$kpse_save_LIBS
 
+FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES
+FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS
 
 if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then
   _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac
index db6fd5ee46e..08fc22347a6 100644
--- a/Build/source/texk/xdvipdfmx/configure.ac
+++ b/Build/source/texk/xdvipdfmx/configure.ac
@@ -59,10 +59,18 @@ CHO_CHECK_ZLIB
 KPSE_ADD_FLAGS([libpng])
 CHO_CHECK_LIBPNG
 
+set -x
+kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES
+kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS
+eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES"
+eval FREETYPE2_LIBS="$FREETYPE2_LIBS"
+set +x
 KPSE_ADD_FLAGS([freetype2])
 CHO_CHECK_LIBFREETYPE([xdvipdfmx])
 
 KPSE_RESTORE_FLAGS
+FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES
+FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS
 
 dnl We do not provide the configure option '--enable-tetex-build', but may
 dnl inherit enable_tetex_build when part of a teTeX / TeX Live installation.
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in
index 4640e60fe57..24b43bf29fa 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.in
@@ -128,6 +128,7 @@ FGREP = @FGREP@
 FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
 FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 99891e9c1e9..f60611bb6af 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -782,8 +782,6 @@ with_system_gd
 with_gd_includes
 with_gd_libdir
 with_system_freetype2
-with_freetype2_includes
-with_freetype2_libdir
 with_system_freetype
 with_freetype_includes
 with_freetype_libdir
@@ -1559,11 +1557,7 @@ Optional Packages:
   --with-gd-includes=DIR  gd headers installed in DIR
   --with-gd-libdir=DIR    gd library installed in DIR
   --with-system-freetype2 use installed freetype2 headers and library
-  --with-freetype2-includes=DIR
-                          freetype2 headers installed in DIR (both -IDIR and
-                          -IDIR/freetype2)
-  --with-freetype2-libdir=DIR
-                          freetype2 library installed in DIR
+                          (requires freetype-config)
   --with-system-freetype  use installed freetype headers and library
   --with-freetype-includes=DIR
                           freetype headers installed in DIR
@@ -3331,16 +3325,6 @@ test "x$need_gd" = xyes && {
 if test "${with_system_freetype2+set}" = set; then
   withval=$with_system_freetype2;
 fi
-
-# Check whether --with-freetype2-includes was given.
-if test "${with_freetype2_includes+set}" = set; then
-  withval=$with_freetype2_includes;
-fi
-
-# Check whether --with-freetype2-libdir was given.
-if test "${with_freetype2_libdir+set}" = set; then
-  withval=$with_freetype2_libdir;
-fi
 if test "x$with_system_freetype2" = x; then
   if test -f $srcdir/../libs/freetype2/configure; then
     { $as_echo "$as_me:$LINENO: Assuming \`freetype2' headers and library from TL tree" >&5
@@ -3353,22 +3337,6 @@ $as_echo "$as_me: Assuming installed \`freetype2' headers and library" >&6;}
   fi
   ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'"
 fi
-if test "x$with_system_freetype2" = xyes; then
-  if test "x$with_system_zlib" = x; then
-    { $as_echo "$as_me:$LINENO:   ->  installed \`zlib' headers and library" >&5
-$as_echo "$as_me:   ->  installed \`zlib' headers and library" >&6;}
-    with_system_zlib=yes
-    ac_configure_args="$ac_configure_args '--with-system-zlib'"
-  elif test "x$with_system_zlib" != xyes; then
-    { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5
-$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-test "x$need_freetype2" = xyes && {
-  need_zlib=yes
-}
 
 
 ## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2009-04-22 18:17:33 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2009-04-22 18:17:33 +0000
commit	633c2bc993d2ad14ecf137836f22eef08805a3b5 (patch)
tree	784c479c7046d0dbf7cbfb9446c7762b5e1bb494 /Build
parent	62b00fcce4ced507597a1c9b18116b781f0d1a9e (diff)