new build system: multiplatform, cxx-runtime-hack, luatex

git-svn-id: svn://tug.org/texlive/trunk@12563 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2009-03-29 16:03:30 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2009-03-29 16:03:30 +0000
commit: 1de70c5fe1e18157efb4a592390ce08534139aa0 (patch)
tree: e95068190830febe15dfaab6f0600fb769492706 /Build
parent: 5b8dcec4983808da1a0b25a4f41435b03370a79f (diff)
56 files changed, 4023 insertions, 2175 deletions
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index 1cbcaafb1c9..ab50543a4b9 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -39,13 +39,15 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	build-aux/texinfo.tex build-aux/ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \
+	$(top_srcdir)/m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/m4/kpse-freetype-flags.m4 \
 	$(top_srcdir)/m4/kpse-freetype2-flags.m4 \
 	$(top_srcdir)/m4/kpse-gd-flags.m4 \
 	$(top_srcdir)/m4/kpse-graphite-flags.m4 \
 	$(top_srcdir)/m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/m4/kpse-libpng-flags.m4 \
-	$(top_srcdir)/m4/kpse-pkgs.m4 $(top_srcdir)/m4/kpse-setup.m4 \
+	$(top_srcdir)/m4/kpse-options.m4 $(top_srcdir)/m4/kpse-pkgs.m4 \
+	$(top_srcdir)/m4/kpse-setup.m4 \
 	$(top_srcdir)/m4/kpse-t1lib-flags.m4 \
 	$(top_srcdir)/m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/m4/kpse-web2c.m4 \
diff --git a/Build/source/README.layout b/Build/source/README.layout
index 406154adf44..dbb5139c2c9 100644
--- a/Build/source/README.layout
+++ b/Build/source/README.layout
@@ -75,3 +75,43 @@ texk/Prog/ac/Prog.ac		defines Prog specific configure option that should
 utils/Util/ac/withenable.ac	defines libraries required by Util, provides the
 				  configure option --disable-Util
 
+2. Running `configure'
+======================
+
+Running configure for the top-level directory will in addition configure the
+directories texk/kpathsea/, libs/, libs/dummy/, utils/, utils/dummy, texk/,
+and texk/dummy/.  This will determine the programs to be built (utils/Util/
+and texk/Prog) and libraries from the TL tree (texk/kpathsea/ and libs/Lib)
+required by these programs.
+
+3. Running `make'
+=================
+
+Running make in the top-level directory will recurse into the directories
+texk/kpathsea/, libs/, utils/, and texk/.
+
+3.1. Running `make' in libs/
+----------------------------
+
+First, for each subdirectory libs/Lib not yet configured, this runs
+`configure' and if required `make all' in that directory.  Then this
+recurses into all required subdirectories for the selected make target:
+`default' or `all' to (re-)build, `check' to run tests, `install' etc.
+
+3.2. Running `make' in utils/ and texk/
+---------------------------------------
+
+Quite similarly, for each subdirectory utils/Util and texk/Prog not yet
+configured, this first runs `configure' and if required `make all' in that
+directory.  Subsequently, this recurses into all required subdirectories to
+(re-)build, run tests, install, etc.
+
+3.3 Comment
+-----------
+
+The process described above configures all directories, even for libraries
+or programs not to be built.  This is necessary for make targets such as
+`dist' or `distcheck' that have to recurse into all subdirectories, whereas
+targets such as `all', `check', or `install' only recurse into the required
+subdirectories.
+
diff --git a/Build/source/aclocal.m4 b/Build/source/aclocal.m4
index b15618e3840..3f8f765dd6f 100644
--- a/Build/source/aclocal.m4
+++ b/Build/source/aclocal.m4
@@ -905,12 +905,14 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([m4/kpse-common.m4])
+m4_include([m4/kpse-cxx-hack.m4])
 m4_include([m4/kpse-freetype-flags.m4])
 m4_include([m4/kpse-freetype2-flags.m4])
 m4_include([m4/kpse-gd-flags.m4])
 m4_include([m4/kpse-graphite-flags.m4])
 m4_include([m4/kpse-kpathsea-flags.m4])
 m4_include([m4/kpse-libpng-flags.m4])
+m4_include([m4/kpse-options.m4])
 m4_include([m4/kpse-pkgs.m4])
 m4_include([m4/kpse-setup.m4])
 m4_include([m4/kpse-t1lib-flags.m4])
diff --git a/Build/source/configure b/Build/source/configure
index 3bbe8997a7e..6bc06eb3617 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for TeX Live 2009test-1.5.
+# Generated by GNU Autoconf 2.63 for TeX Live 2009test-1.6.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='TeX Live'
 PACKAGE_TARNAME='tex-live'
-PACKAGE_VERSION='2009test-1.5'
-PACKAGE_STRING='TeX Live 2009test-1.5'
+PACKAGE_VERSION='2009test-1.6'
+PACKAGE_STRING='TeX Live 2009test-1.6'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 
 ac_unique_file="m4/kpse-pkgs.m4"
@@ -839,14 +839,6 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
 LIBTOOL
 MAINT
 MAINTAINER_MODE_FALSE
@@ -874,6 +866,14 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 target_alias
 host_alias
 build_alias
@@ -914,6 +914,9 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_all_pkgs
+enable_cxx_runtime_hack
+enable_multiplatform
 enable_dialog
 enable_pdfopen
 enable_ps2eps
@@ -1601,7 +1604,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live 2009test-1.5 to adapt to many kinds of systems.
+\`configure' configures TeX Live 2009test-1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1675,7 +1678,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live 2009test-1.5:";;
+     short | recursive ) echo "Configuration of TeX Live 2009test-1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1683,6 +1686,10 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-all-pkgs      do not build packages unless explicitly enabled
+  --enable-cxx-runtime-hack  link C++ runtime statically
+  --enable-multiplatform  put executables into bin/PLATFORM and libraries into
+                          lib/PLATFORM
   --disable-dialog        do not build the dialog package
   --disable-pdfopen       do not build the pdfopen package
   --disable-ps2eps        do not build the ps2eps package
@@ -1911,7 +1918,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live configure 2009test-1.5
+TeX Live configure 2009test-1.6
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1925,7 +1932,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live $as_me 2009test-1.5, which was
+It was created by TeX Live $as_me 2009test-1.6, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2328,8 +2335,116 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+
 
+# Check whether --enable-all-pkgs was given.
+if test "${enable_all_pkgs+set}" = set; then
+  enableval=$enable_all_pkgs;
+fi
+test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes
+# Check whether --enable-cxx-runtime-hack was given.
+if test "${enable_cxx_runtime_hack+set}" = set; then
+  enableval=$enable_cxx_runtime_hack;
+fi
 
+# Check whether --enable-multiplatform was given.
+if test "${enable_multiplatform+set}" = set; then
+  enableval=$enable_multiplatform;
+fi
+if test "x$enable_multiplatform" = xyes; then
+  if test "x$bindir" = 'x${exec_prefix}/bin'; then
+    bindir="$bindir/$host"
+    ac_configure_args="$ac_configure_args '--bindir=$bindir'"
+  fi
+  if test "x$libdir" = 'x${exec_prefix}/lib'; then
+    libdir="$libdir/$host"
+    ac_configure_args="$ac_configure_args '--libdir=$libdir'"
+  fi
+fi
 
 
 ## ac/withenable.ac
@@ -2344,10 +2459,10 @@ if test "${enable_dialog+set}" = set; then
 fi
 case $enable_dialog in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dialog'" >&5
-$as_echo "$as_me: Assuming \`--enable-dialog'" >&6;}
-     enable_dialog=yes
-     ac_configure_args="$ac_configure_args '--enable-dialog'";;
+  *) enable_dialog=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dialog=$enable_dialog'" >&5
+$as_echo "$as_me: Assuming \`--enable-dialog=$enable_dialog'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dialog=$enable_dialog'";;
 esac
 
 
@@ -2359,10 +2474,10 @@ if test "${enable_pdfopen+set}" = set; then
 fi
 case $enable_pdfopen in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-pdfopen'" >&5
-$as_echo "$as_me: Assuming \`--enable-pdfopen'" >&6;}
-     enable_pdfopen=yes
-     ac_configure_args="$ac_configure_args '--enable-pdfopen'";;
+  *) enable_pdfopen=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&5
+$as_echo "$as_me: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-pdfopen=$enable_pdfopen'";;
 esac
 
 
@@ -2374,10 +2489,10 @@ if test "${enable_ps2eps+set}" = set; then
 fi
 case $enable_ps2eps in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2eps'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2eps'" >&6;}
-     enable_ps2eps=yes
-     ac_configure_args="$ac_configure_args '--enable-ps2eps'";;
+  *) enable_ps2eps=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2eps=$enable_ps2eps'";;
 esac
 
 
@@ -2389,10 +2504,10 @@ if test "${enable_psutils+set}" = set; then
 fi
 case $enable_psutils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-psutils'" >&5
-$as_echo "$as_me: Assuming \`--enable-psutils'" >&6;}
-     enable_psutils=yes
-     ac_configure_args="$ac_configure_args '--enable-psutils'";;
+  *) enable_psutils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-psutils=$enable_psutils'" >&5
+$as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-psutils=$enable_psutils'";;
 esac
 
 
@@ -2404,10 +2519,10 @@ if test "${enable_t1utils+set}" = set; then
 fi
 case $enable_t1utils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-t1utils'" >&5
-$as_echo "$as_me: Assuming \`--enable-t1utils'" >&6;}
-     enable_t1utils=yes
-     ac_configure_args="$ac_configure_args '--enable-t1utils'";;
+  *) enable_t1utils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+$as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-t1utils=$enable_t1utils'";;
 esac
 
 
@@ -2419,10 +2534,10 @@ if test "${enable_tpic2pdftex+set}" = set; then
 fi
 case $enable_tpic2pdftex in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-tpic2pdftex'" >&5
-$as_echo "$as_me: Assuming \`--enable-tpic2pdftex'" >&6;}
-     enable_tpic2pdftex=yes
-     ac_configure_args="$ac_configure_args '--enable-tpic2pdftex'";;
+  *) enable_tpic2pdftex=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+$as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tpic2pdftex=$enable_tpic2pdftex'";;
 esac
 
 
@@ -2434,10 +2549,10 @@ if test "${enable_vlna+set}" = set; then
 fi
 case $enable_vlna in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-vlna'" >&5
-$as_echo "$as_me: Assuming \`--enable-vlna'" >&6;}
-     enable_vlna=yes
-     ac_configure_args="$ac_configure_args '--enable-vlna'";;
+  *) enable_vlna=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-vlna=$enable_vlna'" >&5
+$as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-vlna=$enable_vlna'";;
 esac
 
 
@@ -2452,10 +2567,10 @@ if test "${enable_web2c+set}" = set; then
 fi
 case $enable_web2c in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-web2c'" >&5
-$as_echo "$as_me: Assuming \`--enable-web2c'" >&6;}
-     enable_web2c=yes
-     ac_configure_args="$ac_configure_args '--enable-web2c'";;
+  *) enable_web2c=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-web2c=$enable_web2c'" >&5
+$as_echo "$as_me: Assuming \`--enable-web2c=$enable_web2c'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-web2c=$enable_web2c'";;
 esac
 
 test "x$enable_web2c" = xno || {
@@ -2627,10 +2742,10 @@ if test "${enable_one+set}" = set; then
 fi
 case $enable_one in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--disable-one'" >&5
-$as_echo "$as_me: Assuming \`--disable-one'" >&6;}
-     enable_one=no
-     ac_configure_args="$ac_configure_args '--disable-one'";;
+  *) enable_one=no
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-one=$enable_one'" >&5
+$as_echo "$as_me: Assuming \`--enable-one=$enable_one'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-one=$enable_one'";;
 esac
 
 test "x$enable_one" = xno || {
@@ -2650,10 +2765,10 @@ if test "${enable_afm2pl+set}" = set; then
 fi
 case $enable_afm2pl in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-afm2pl'" >&5
-$as_echo "$as_me: Assuming \`--enable-afm2pl'" >&6;}
-     enable_afm2pl=yes
-     ac_configure_args="$ac_configure_args '--enable-afm2pl'";;
+  *) enable_afm2pl=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+$as_echo "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'";;
 esac
 
 test "x$enable_afm2pl" = xno || {
@@ -2669,10 +2784,10 @@ if test "${enable_bibtex8+set}" = set; then
 fi
 case $enable_bibtex8 in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-bibtex8'" >&5
-$as_echo "$as_me: Assuming \`--enable-bibtex8'" >&6;}
-     enable_bibtex8=yes
-     ac_configure_args="$ac_configure_args '--enable-bibtex8'";;
+  *) enable_bibtex8=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-bibtex8=$enable_bibtex8'" >&5
+$as_echo "$as_me: Assuming \`--enable-bibtex8=$enable_bibtex8'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtex8=$enable_bibtex8'";;
 esac
 
 test "x$enable_bibtex8" = xno || {
@@ -2688,10 +2803,10 @@ if test "${enable_cjkutils+set}" = set; then
 fi
 case $enable_cjkutils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-cjkutils'" >&5
-$as_echo "$as_me: Assuming \`--enable-cjkutils'" >&6;}
-     enable_cjkutils=yes
-     ac_configure_args="$ac_configure_args '--enable-cjkutils'";;
+  *) enable_cjkutils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+$as_echo "$as_me: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-cjkutils=$enable_cjkutils'";;
 esac
 
 test "x$enable_cjkutils" = xno || {
@@ -2707,10 +2822,10 @@ if test "${enable_detex+set}" = set; then
 fi
 case $enable_detex in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-detex'" >&5
-$as_echo "$as_me: Assuming \`--enable-detex'" >&6;}
-     enable_detex=yes
-     ac_configure_args="$ac_configure_args '--enable-detex'";;
+  *) enable_detex=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-detex=$enable_detex'" >&5
+$as_echo "$as_me: Assuming \`--enable-detex=$enable_detex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-detex=$enable_detex'";;
 esac
 
 test "x$enable_detex" = xno || {
@@ -2726,10 +2841,10 @@ if test "${enable_devnag+set}" = set; then
 fi
 case $enable_devnag in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-devnag'" >&5
-$as_echo "$as_me: Assuming \`--enable-devnag'" >&6;}
-     enable_devnag=yes
-     ac_configure_args="$ac_configure_args '--enable-devnag'";;
+  *) enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'";;
 esac
 
 
@@ -2741,10 +2856,10 @@ if test "${enable_dtl+set}" = set; then
 fi
 case $enable_dtl in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dtl'" >&5
-$as_echo "$as_me: Assuming \`--enable-dtl'" >&6;}
-     enable_dtl=yes
-     ac_configure_args="$ac_configure_args '--enable-dtl'";;
+  *) enable_dtl=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dtl=$enable_dtl'" >&5
+$as_echo "$as_me: Assuming \`--enable-dtl=$enable_dtl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dtl=$enable_dtl'";;
 esac
 
 test "x$enable_dtl" = xno || {
@@ -2760,10 +2875,10 @@ if test "${enable_dvi2tty+set}" = set; then
 fi
 case $enable_dvi2tty in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvi2tty'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvi2tty'" >&6;}
-     enable_dvi2tty=yes
-     ac_configure_args="$ac_configure_args '--enable-dvi2tty'";;
+  *) enable_dvi2tty=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvi2tty=$enable_dvi2tty'";;
 esac
 
 test "x$enable_dvi2tty" = xno || {
@@ -2779,10 +2894,10 @@ if test "${enable_dvidvi+set}" = set; then
 fi
 case $enable_dvidvi in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvidvi'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvidvi'" >&6;}
-     enable_dvidvi=yes
-     ac_configure_args="$ac_configure_args '--enable-dvidvi'";;
+  *) enable_dvidvi=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvidvi=$enable_dvidvi'";;
 esac
 
 test "x$enable_dvidvi" = xno || {
@@ -2798,10 +2913,10 @@ if test "${enable_dviljk+set}" = set; then
 fi
 case $enable_dviljk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dviljk'" >&5
-$as_echo "$as_me: Assuming \`--enable-dviljk'" >&6;}
-     enable_dviljk=yes
-     ac_configure_args="$ac_configure_args '--enable-dviljk'";;
+  *) enable_dviljk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+$as_echo "$as_me: Assuming \`--enable-dviljk=$enable_dviljk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviljk=$enable_dviljk'";;
 esac
 
 test "x$enable_dviljk" = xno || {
@@ -2817,10 +2932,10 @@ if test "${enable_dvipdfm+set}" = set; then
 fi
 case $enable_dvipdfm in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfm'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipdfm'" >&6;}
-     enable_dvipdfm=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipdfm'";;
+  *) enable_dvipdfm=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfm=$enable_dvipdfm'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipdfm=$enable_dvipdfm'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipdfm=$enable_dvipdfm'";;
 esac
 
 test "x$enable_dvipdfm" = xno || {
@@ -2837,10 +2952,10 @@ if test "${enable_dvipdfmx+set}" = set; then
 fi
 case $enable_dvipdfmx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfmx'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipdfmx'" >&6;}
-     enable_dvipdfmx=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipdfmx'";;
+  *) enable_dvipdfmx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfmx=$enable_dvipdfmx'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipdfmx=$enable_dvipdfmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipdfmx=$enable_dvipdfmx'";;
 esac
 
 test "x$enable_dvipdfmx" = xno || {
@@ -2857,10 +2972,10 @@ if test "${enable_dvipng+set}" = set; then
 fi
 case $enable_dvipng in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipng'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipng'" >&6;}
-     enable_dvipng=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipng'";;
+  *) enable_dvipng=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipng=$enable_dvipng'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipng=$enable_dvipng'";;
 esac
 
 test "x$enable_dvipng" = xno || {
@@ -2898,10 +3013,10 @@ if test "${enable_dvipos+set}" = set; then
 fi
 case $enable_dvipos in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipos'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipos'" >&6;}
-     enable_dvipos=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipos'";;
+  *) enable_dvipos=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipos=$enable_dvipos'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipos=$enable_dvipos'";;
 esac
 
 test "x$enable_dvipos" = xno || {
@@ -2917,10 +3032,10 @@ if test "${enable_dvipsk+set}" = set; then
 fi
 case $enable_dvipsk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipsk'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipsk'" >&6;}
-     enable_dvipsk=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipsk'";;
+  *) enable_dvipsk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipsk=$enable_dvipsk'";;
 esac
 
 test "x$enable_dvipsk" = xno || {
@@ -2936,10 +3051,10 @@ if test "${enable_gsftopk+set}" = set; then
 fi
 case $enable_gsftopk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-gsftopk'" >&5
-$as_echo "$as_me: Assuming \`--enable-gsftopk'" >&6;}
-     enable_gsftopk=yes
-     ac_configure_args="$ac_configure_args '--enable-gsftopk'";;
+  *) enable_gsftopk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+$as_echo "$as_me: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-gsftopk=$enable_gsftopk'";;
 esac
 
 test "x$enable_gsftopk" = xno || {
@@ -2955,10 +3070,10 @@ if test "${enable_lacheck+set}" = set; then
 fi
 case $enable_lacheck in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-lacheck'" >&5
-$as_echo "$as_me: Assuming \`--enable-lacheck'" >&6;}
-     enable_lacheck=yes
-     ac_configure_args="$ac_configure_args '--enable-lacheck'";;
+  *) enable_lacheck=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+$as_echo "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lacheck=$enable_lacheck'";;
 esac
 
 test "x$enable_lacheck" = xno || {
@@ -2974,10 +3089,10 @@ if test "${enable_lcdf_typetools+set}" = set; then
 fi
 case $enable_lcdf_typetools in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-lcdf-typetools'" >&5
-$as_echo "$as_me: Assuming \`--enable-lcdf-typetools'" >&6;}
-     enable_lcdf_typetools=yes
-     ac_configure_args="$ac_configure_args '--enable-lcdf-typetools'";;
+  *) enable_lcdf_typetools=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+$as_echo "$as_me: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lcdf-typetools=$enable_lcdf_typetools'";;
 esac
 
 test "x$enable_lcdf_typetools" = xno || {
@@ -3054,10 +3169,10 @@ if test "${enable_makeindexk+set}" = set; then
 fi
 case $enable_makeindexk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-makeindexk'" >&5
-$as_echo "$as_me: Assuming \`--enable-makeindexk'" >&6;}
-     enable_makeindexk=yes
-     ac_configure_args="$ac_configure_args '--enable-makeindexk'";;
+  *) enable_makeindexk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+$as_echo "$as_me: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-makeindexk=$enable_makeindexk'";;
 esac
 
 test "x$enable_makeindexk" = xno || {
@@ -3073,10 +3188,10 @@ if test "${enable_musixflx+set}" = set; then
 fi
 case $enable_musixflx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-musixflx'" >&5
-$as_echo "$as_me: Assuming \`--enable-musixflx'" >&6;}
-     enable_musixflx=yes
-     ac_configure_args="$ac_configure_args '--enable-musixflx'";;
+  *) enable_musixflx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-musixflx=$enable_musixflx'" >&5
+$as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-musixflx=$enable_musixflx'";;
 esac
 
 
@@ -3088,10 +3203,10 @@ if test "${enable_ps2pkm+set}" = set; then
 fi
 case $enable_ps2pkm in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2pkm'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2pkm'" >&6;}
-     enable_ps2pkm=yes
-     ac_configure_args="$ac_configure_args '--enable-ps2pkm'";;
+  *) enable_ps2pkm=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2pkm=$enable_ps2pkm'";;
 esac
 
 test "x$enable_ps2pkm" = xno || {
@@ -3107,10 +3222,10 @@ if test "${enable_seetexk+set}" = set; then
 fi
 case $enable_seetexk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-seetexk'" >&5
-$as_echo "$as_me: Assuming \`--enable-seetexk'" >&6;}
-     enable_seetexk=yes
-     ac_configure_args="$ac_configure_args '--enable-seetexk'";;
+  *) enable_seetexk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+$as_echo "$as_me: Assuming \`--enable-seetexk=$enable_seetexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-seetexk=$enable_seetexk'";;
 esac
 
 test "x$enable_seetexk" = xno || {
@@ -3126,10 +3241,10 @@ if test "${enable_tex4htk+set}" = set; then
 fi
 case $enable_tex4htk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-tex4htk'" >&5
-$as_echo "$as_me: Assuming \`--enable-tex4htk'" >&6;}
-     enable_tex4htk=yes
-     ac_configure_args="$ac_configure_args '--enable-tex4htk'";;
+  *) enable_tex4htk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+$as_echo "$as_me: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tex4htk=$enable_tex4htk'";;
 esac
 
 test "x$enable_tex4htk" = xno || {
@@ -3145,10 +3260,10 @@ if test "${enable_ttf2pk+set}" = set; then
 fi
 case $enable_ttf2pk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttf2pk'" >&5
-$as_echo "$as_me: Assuming \`--enable-ttf2pk'" >&6;}
-     enable_ttf2pk=yes
-     ac_configure_args="$ac_configure_args '--enable-ttf2pk'";;
+  *) enable_ttf2pk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&5
+$as_echo "$as_me: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttf2pk=$enable_ttf2pk'";;
 esac
 
 test "x$enable_ttf2pk" = xno || {
@@ -3165,10 +3280,10 @@ if test "${enable_ttfdump+set}" = set; then
 fi
 case $enable_ttfdump in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttfdump'" >&5
-$as_echo "$as_me: Assuming \`--enable-ttfdump'" >&6;}
-     enable_ttfdump=yes
-     ac_configure_args="$ac_configure_args '--enable-ttfdump'";;
+  *) enable_ttfdump=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+$as_echo "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttfdump=$enable_ttfdump'";;
 esac
 
 test "x$enable_ttfdump" = xno || {
@@ -3184,10 +3299,10 @@ if test "${enable_xdv2pdf+set}" = set; then
 fi
 case $enable_xdv2pdf in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdv2pdf'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdv2pdf'" >&6;}
-     enable_xdv2pdf=yes
-     ac_configure_args="$ac_configure_args '--enable-xdv2pdf'";;
+  *) enable_xdv2pdf=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdv2pdf=$enable_xdv2pdf'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdv2pdf=$enable_xdv2pdf'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdv2pdf=$enable_xdv2pdf'";;
 esac
 
 test "x$enable_xdv2pdf" = xno || {
@@ -3203,10 +3318,10 @@ if test "${enable_xdvik+set}" = set; then
 fi
 case $enable_xdvik in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvik'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdvik'" >&6;}
-     enable_xdvik=yes
-     ac_configure_args="$ac_configure_args '--enable-xdvik'";;
+  *) enable_xdvik=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdvik=$enable_xdvik'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdvik=$enable_xdvik'";;
 esac
 
 test "x$enable_xdvik" = xno || {
@@ -3223,10 +3338,10 @@ if test "${enable_xdvipdfmx+set}" = set; then
 fi
 case $enable_xdvipdfmx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvipdfmx'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdvipdfmx'" >&6;}
-     enable_xdvipdfmx=yes
-     ac_configure_args="$ac_configure_args '--enable-xdvipdfmx'";;
+  *) enable_xdvipdfmx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvipdfmx=$enable_xdvipdfmx'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdvipdfmx=$enable_xdvipdfmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdvipdfmx=$enable_xdvipdfmx'";;
 esac
 
 test "x$enable_xdvipdfmx" = xno || {
@@ -4061,89 +4176,6 @@ macro_revision='1.3012'
 
 ltmain="$ac_aux_dir/ltmain.sh"
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -5841,13 +5873,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:5844: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5876: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5847: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5879: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5850: output\"" >&5)
+  (eval echo "\"\$as_me:5882: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7053,7 +7085,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7056 "configure"' > conftest.$ac_ext
+  echo '#line 7088 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8433,7 +8465,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live'
- VERSION='2009test-1.5'
+ VERSION='2009test-1.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9100,11 +9132,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:9103: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9135: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9107: \$? = $ac_status" >&5
+   echo "$as_me:9139: \$? = $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.
@@ -9439,11 +9471,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:9442: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9474: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9446: \$? = $ac_status" >&5
+   echo "$as_me:9478: \$? = $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.
@@ -9544,11 +9576,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:9547: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9579: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9551: \$? = $ac_status" >&5
+   echo "$as_me:9583: \$? = $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
@@ -9599,11 +9631,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:9602: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9634: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9606: \$? = $ac_status" >&5
+   echo "$as_me:9638: \$? = $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
@@ -12399,7 +12431,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12402 "configure"
+#line 12434 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12495,7 +12527,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12498 "configure"
+#line 12530 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18891,11 +18923,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:18894: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18926: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18898: \$? = $ac_status" >&5
+   echo "$as_me:18930: \$? = $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.
@@ -18990,11 +19022,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:18993: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19025: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18997: \$? = $ac_status" >&5
+   echo "$as_me:19029: \$? = $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
@@ -19042,11 +19074,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:19045: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19077: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19049: \$? = $ac_status" >&5
+   echo "$as_me:19081: \$? = $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
@@ -23034,7 +23066,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live $as_me 2009test-1.5, which was
+This file was extended by TeX Live $as_me 2009test-1.6, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23088,7 +23120,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-TeX Live config.status 2009test-1.5
+TeX Live config.status 2009test-1.6
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/Build/source/configure.ac b/Build/source/configure.ac
index d0071c906a5..5062218daa4 100644
--- a/Build/source/configure.ac
+++ b/Build/source/configure.ac
@@ -6,7 +6,7 @@ dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([TeX Live], [2009test-1.5], [tex-k@tug.org])
+AC_INIT([TeX Live], [2009test-1.6], [tex-k@tug.org])
 AC_PREREQ([2.63])
 AC_CONFIG_SRCDIR([m4/kpse-pkgs.m4])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index ed13538ad7f..af0faf50d8b 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -30,8 +30,12 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) \
+	$(srcdir)/../build-aux/config.guess \
+	$(srcdir)/../build-aux/config.sub \
 	$(srcdir)/../build-aux/install-sh \
 	$(srcdir)/../build-aux/missing $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
@@ -40,7 +44,9 @@ DIST_COMMON = README $(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-pkgs.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../m4/kpse-options.m4 \
+	$(top_srcdir)/../m4/kpse-pkgs.m4 \
 	$(top_srcdir)/../m4/kpse-setup.m4 \
 	$(top_srcdir)/../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../ac/withenable.ac \
@@ -173,14 +179,22 @@ am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/libs/aclocal.m4 b/Build/source/libs/aclocal.m4
index 09141f30b8f..c917492c6a5 100644
--- a/Build/source/libs/aclocal.m4
+++ b/Build/source/libs/aclocal.m4
@@ -616,6 +616,8 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../m4/kpse-cxx-hack.m4])
+m4_include([../m4/kpse-options.m4])
 m4_include([../m4/kpse-pkgs.m4])
 m4_include([../m4/kpse-setup.m4])
 m4_include([../m4/kpse-web2c.m4])
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 80e19245bb9..79cb184d412 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -633,6 +633,14 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 target_alias
 host_alias
 build_alias
@@ -673,6 +681,9 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_all_pkgs
+enable_cxx_runtime_hack
+enable_multiplatform
 enable_dialog
 enable_pdfopen
 enable_ps2eps
@@ -1411,6 +1422,10 @@ Program names:
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
@@ -1424,6 +1439,10 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-all-pkgs      do not build packages unless explicitly enabled
+  --enable-cxx-runtime-hack  link C++ runtime statically
+  --enable-multiplatform  put executables into bin/PLATFORM and libraries into
+                          lib/PLATFORM
   --disable-dialog        do not build the dialog package
   --disable-pdfopen       do not build the pdfopen package
   --disable-ps2eps        do not build the ps2eps package
@@ -2040,8 +2059,116 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+
 
+# Check whether --enable-all-pkgs was given.
+if test "${enable_all_pkgs+set}" = set; then
+  enableval=$enable_all_pkgs;
+fi
+test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes
+# Check whether --enable-cxx-runtime-hack was given.
+if test "${enable_cxx_runtime_hack+set}" = set; then
+  enableval=$enable_cxx_runtime_hack;
+fi
 
+# Check whether --enable-multiplatform was given.
+if test "${enable_multiplatform+set}" = set; then
+  enableval=$enable_multiplatform;
+fi
+if test "x$enable_multiplatform" = xyes; then
+  if test "x$bindir" = 'x${exec_prefix}/bin'; then
+    bindir="$bindir/$host"
+    ac_configure_args="$ac_configure_args '--bindir=$bindir'"
+  fi
+  if test "x$libdir" = 'x${exec_prefix}/lib'; then
+    libdir="$libdir/$host"
+    ac_configure_args="$ac_configure_args '--libdir=$libdir'"
+  fi
+fi
 
 
 ## ac/withenable.ac
@@ -2056,10 +2183,10 @@ if test "${enable_dialog+set}" = set; then
 fi
 case $enable_dialog in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dialog'" >&5
-$as_echo "$as_me: Assuming \`--enable-dialog'" >&6;}
-     enable_dialog=yes
-     ac_configure_args="$ac_configure_args '--enable-dialog'";;
+  *) enable_dialog=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dialog=$enable_dialog'" >&5
+$as_echo "$as_me: Assuming \`--enable-dialog=$enable_dialog'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dialog=$enable_dialog'";;
 esac
 
 
@@ -2071,10 +2198,10 @@ if test "${enable_pdfopen+set}" = set; then
 fi
 case $enable_pdfopen in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-pdfopen'" >&5
-$as_echo "$as_me: Assuming \`--enable-pdfopen'" >&6;}
-     enable_pdfopen=yes
-     ac_configure_args="$ac_configure_args '--enable-pdfopen'";;
+  *) enable_pdfopen=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&5
+$as_echo "$as_me: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-pdfopen=$enable_pdfopen'";;
 esac
 
 
@@ -2086,10 +2213,10 @@ if test "${enable_ps2eps+set}" = set; then
 fi
 case $enable_ps2eps in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2eps'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2eps'" >&6;}
-     enable_ps2eps=yes
-     ac_configure_args="$ac_configure_args '--enable-ps2eps'";;
+  *) enable_ps2eps=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2eps=$enable_ps2eps'";;
 esac
 
 
@@ -2101,10 +2228,10 @@ if test "${enable_psutils+set}" = set; then
 fi
 case $enable_psutils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-psutils'" >&5
-$as_echo "$as_me: Assuming \`--enable-psutils'" >&6;}
-     enable_psutils=yes
-     ac_configure_args="$ac_configure_args '--enable-psutils'";;
+  *) enable_psutils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-psutils=$enable_psutils'" >&5
+$as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-psutils=$enable_psutils'";;
 esac
 
 
@@ -2116,10 +2243,10 @@ if test "${enable_t1utils+set}" = set; then
 fi
 case $enable_t1utils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-t1utils'" >&5
-$as_echo "$as_me: Assuming \`--enable-t1utils'" >&6;}
-     enable_t1utils=yes
-     ac_configure_args="$ac_configure_args '--enable-t1utils'";;
+  *) enable_t1utils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+$as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-t1utils=$enable_t1utils'";;
 esac
 
 
@@ -2131,10 +2258,10 @@ if test "${enable_tpic2pdftex+set}" = set; then
 fi
 case $enable_tpic2pdftex in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-tpic2pdftex'" >&5
-$as_echo "$as_me: Assuming \`--enable-tpic2pdftex'" >&6;}
-     enable_tpic2pdftex=yes
-     ac_configure_args="$ac_configure_args '--enable-tpic2pdftex'";;
+  *) enable_tpic2pdftex=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+$as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tpic2pdftex=$enable_tpic2pdftex'";;
 esac
 
 
@@ -2146,10 +2273,10 @@ if test "${enable_vlna+set}" = set; then
 fi
 case $enable_vlna in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-vlna'" >&5
-$as_echo "$as_me: Assuming \`--enable-vlna'" >&6;}
-     enable_vlna=yes
-     ac_configure_args="$ac_configure_args '--enable-vlna'";;
+  *) enable_vlna=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-vlna=$enable_vlna'" >&5
+$as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-vlna=$enable_vlna'";;
 esac
 
 
@@ -2164,10 +2291,10 @@ if test "${enable_web2c+set}" = set; then
 fi
 case $enable_web2c in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-web2c'" >&5
-$as_echo "$as_me: Assuming \`--enable-web2c'" >&6;}
-     enable_web2c=yes
-     ac_configure_args="$ac_configure_args '--enable-web2c'";;
+  *) enable_web2c=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-web2c=$enable_web2c'" >&5
+$as_echo "$as_me: Assuming \`--enable-web2c=$enable_web2c'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-web2c=$enable_web2c'";;
 esac
 
 test "x$enable_web2c" = xno || {
@@ -2339,10 +2466,10 @@ if test "${enable_one+set}" = set; then
 fi
 case $enable_one in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--disable-one'" >&5
-$as_echo "$as_me: Assuming \`--disable-one'" >&6;}
-     enable_one=no
-     ac_configure_args="$ac_configure_args '--disable-one'";;
+  *) enable_one=no
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-one=$enable_one'" >&5
+$as_echo "$as_me: Assuming \`--enable-one=$enable_one'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-one=$enable_one'";;
 esac
 
 test "x$enable_one" = xno || {
@@ -2362,10 +2489,10 @@ if test "${enable_afm2pl+set}" = set; then
 fi
 case $enable_afm2pl in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-afm2pl'" >&5
-$as_echo "$as_me: Assuming \`--enable-afm2pl'" >&6;}
-     enable_afm2pl=yes
-     ac_configure_args="$ac_configure_args '--enable-afm2pl'";;
+  *) enable_afm2pl=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+$as_echo "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'";;
 esac
 
 test "x$enable_afm2pl" = xno || {
@@ -2381,10 +2508,10 @@ if test "${enable_bibtex8+set}" = set; then
 fi
 case $enable_bibtex8 in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-bibtex8'" >&5
-$as_echo "$as_me: Assuming \`--enable-bibtex8'" >&6;}
-     enable_bibtex8=yes
-     ac_configure_args="$ac_configure_args '--enable-bibtex8'";;
+  *) enable_bibtex8=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-bibtex8=$enable_bibtex8'" >&5
+$as_echo "$as_me: Assuming \`--enable-bibtex8=$enable_bibtex8'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtex8=$enable_bibtex8'";;
 esac
 
 test "x$enable_bibtex8" = xno || {
@@ -2400,10 +2527,10 @@ if test "${enable_cjkutils+set}" = set; then
 fi
 case $enable_cjkutils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-cjkutils'" >&5
-$as_echo "$as_me: Assuming \`--enable-cjkutils'" >&6;}
-     enable_cjkutils=yes
-     ac_configure_args="$ac_configure_args '--enable-cjkutils'";;
+  *) enable_cjkutils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+$as_echo "$as_me: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-cjkutils=$enable_cjkutils'";;
 esac
 
 test "x$enable_cjkutils" = xno || {
@@ -2419,10 +2546,10 @@ if test "${enable_detex+set}" = set; then
 fi
 case $enable_detex in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-detex'" >&5
-$as_echo "$as_me: Assuming \`--enable-detex'" >&6;}
-     enable_detex=yes
-     ac_configure_args="$ac_configure_args '--enable-detex'";;
+  *) enable_detex=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-detex=$enable_detex'" >&5
+$as_echo "$as_me: Assuming \`--enable-detex=$enable_detex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-detex=$enable_detex'";;
 esac
 
 test "x$enable_detex" = xno || {
@@ -2438,10 +2565,10 @@ if test "${enable_devnag+set}" = set; then
 fi
 case $enable_devnag in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-devnag'" >&5
-$as_echo "$as_me: Assuming \`--enable-devnag'" >&6;}
-     enable_devnag=yes
-     ac_configure_args="$ac_configure_args '--enable-devnag'";;
+  *) enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'";;
 esac
 
 
@@ -2453,10 +2580,10 @@ if test "${enable_dtl+set}" = set; then
 fi
 case $enable_dtl in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dtl'" >&5
-$as_echo "$as_me: Assuming \`--enable-dtl'" >&6;}
-     enable_dtl=yes
-     ac_configure_args="$ac_configure_args '--enable-dtl'";;
+  *) enable_dtl=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dtl=$enable_dtl'" >&5
+$as_echo "$as_me: Assuming \`--enable-dtl=$enable_dtl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dtl=$enable_dtl'";;
 esac
 
 test "x$enable_dtl" = xno || {
@@ -2472,10 +2599,10 @@ if test "${enable_dvi2tty+set}" = set; then
 fi
 case $enable_dvi2tty in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvi2tty'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvi2tty'" >&6;}
-     enable_dvi2tty=yes
-     ac_configure_args="$ac_configure_args '--enable-dvi2tty'";;
+  *) enable_dvi2tty=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvi2tty=$enable_dvi2tty'";;
 esac
 
 test "x$enable_dvi2tty" = xno || {
@@ -2491,10 +2618,10 @@ if test "${enable_dvidvi+set}" = set; then
 fi
 case $enable_dvidvi in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvidvi'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvidvi'" >&6;}
-     enable_dvidvi=yes
-     ac_configure_args="$ac_configure_args '--enable-dvidvi'";;
+  *) enable_dvidvi=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvidvi=$enable_dvidvi'";;
 esac
 
 test "x$enable_dvidvi" = xno || {
@@ -2510,10 +2637,10 @@ if test "${enable_dviljk+set}" = set; then
 fi
 case $enable_dviljk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dviljk'" >&5
-$as_echo "$as_me: Assuming \`--enable-dviljk'" >&6;}
-     enable_dviljk=yes
-     ac_configure_args="$ac_configure_args '--enable-dviljk'";;
+  *) enable_dviljk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+$as_echo "$as_me: Assuming \`--enable-dviljk=$enable_dviljk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviljk=$enable_dviljk'";;
 esac
 
 test "x$enable_dviljk" = xno || {
@@ -2529,10 +2656,10 @@ if test "${enable_dvipdfm+set}" = set; then
 fi
 case $enable_dvipdfm in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfm'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipdfm'" >&6;}
-     enable_dvipdfm=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipdfm'";;
+  *) enable_dvipdfm=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfm=$enable_dvipdfm'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipdfm=$enable_dvipdfm'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipdfm=$enable_dvipdfm'";;
 esac
 
 test "x$enable_dvipdfm" = xno || {
@@ -2549,10 +2676,10 @@ if test "${enable_dvipdfmx+set}" = set; then
 fi
 case $enable_dvipdfmx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfmx'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipdfmx'" >&6;}
-     enable_dvipdfmx=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipdfmx'";;
+  *) enable_dvipdfmx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfmx=$enable_dvipdfmx'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipdfmx=$enable_dvipdfmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipdfmx=$enable_dvipdfmx'";;
 esac
 
 test "x$enable_dvipdfmx" = xno || {
@@ -2569,10 +2696,10 @@ if test "${enable_dvipng+set}" = set; then
 fi
 case $enable_dvipng in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipng'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipng'" >&6;}
-     enable_dvipng=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipng'";;
+  *) enable_dvipng=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipng=$enable_dvipng'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipng=$enable_dvipng'";;
 esac
 
 test "x$enable_dvipng" = xno || {
@@ -2610,10 +2737,10 @@ if test "${enable_dvipos+set}" = set; then
 fi
 case $enable_dvipos in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipos'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipos'" >&6;}
-     enable_dvipos=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipos'";;
+  *) enable_dvipos=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipos=$enable_dvipos'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipos=$enable_dvipos'";;
 esac
 
 test "x$enable_dvipos" = xno || {
@@ -2629,10 +2756,10 @@ if test "${enable_dvipsk+set}" = set; then
 fi
 case $enable_dvipsk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipsk'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipsk'" >&6;}
-     enable_dvipsk=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipsk'";;
+  *) enable_dvipsk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipsk=$enable_dvipsk'";;
 esac
 
 test "x$enable_dvipsk" = xno || {
@@ -2648,10 +2775,10 @@ if test "${enable_gsftopk+set}" = set; then
 fi
 case $enable_gsftopk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-gsftopk'" >&5
-$as_echo "$as_me: Assuming \`--enable-gsftopk'" >&6;}
-     enable_gsftopk=yes
-     ac_configure_args="$ac_configure_args '--enable-gsftopk'";;
+  *) enable_gsftopk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+$as_echo "$as_me: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-gsftopk=$enable_gsftopk'";;
 esac
 
 test "x$enable_gsftopk" = xno || {
@@ -2667,10 +2794,10 @@ if test "${enable_lacheck+set}" = set; then
 fi
 case $enable_lacheck in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-lacheck'" >&5
-$as_echo "$as_me: Assuming \`--enable-lacheck'" >&6;}
-     enable_lacheck=yes
-     ac_configure_args="$ac_configure_args '--enable-lacheck'";;
+  *) enable_lacheck=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+$as_echo "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lacheck=$enable_lacheck'";;
 esac
 
 test "x$enable_lacheck" = xno || {
@@ -2686,10 +2813,10 @@ if test "${enable_lcdf_typetools+set}" = set; then
 fi
 case $enable_lcdf_typetools in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-lcdf-typetools'" >&5
-$as_echo "$as_me: Assuming \`--enable-lcdf-typetools'" >&6;}
-     enable_lcdf_typetools=yes
-     ac_configure_args="$ac_configure_args '--enable-lcdf-typetools'";;
+  *) enable_lcdf_typetools=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+$as_echo "$as_me: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lcdf-typetools=$enable_lcdf_typetools'";;
 esac
 
 test "x$enable_lcdf_typetools" = xno || {
@@ -2766,10 +2893,10 @@ if test "${enable_makeindexk+set}" = set; then
 fi
 case $enable_makeindexk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-makeindexk'" >&5
-$as_echo "$as_me: Assuming \`--enable-makeindexk'" >&6;}
-     enable_makeindexk=yes
-     ac_configure_args="$ac_configure_args '--enable-makeindexk'";;
+  *) enable_makeindexk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+$as_echo "$as_me: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-makeindexk=$enable_makeindexk'";;
 esac
 
 test "x$enable_makeindexk" = xno || {
@@ -2785,10 +2912,10 @@ if test "${enable_musixflx+set}" = set; then
 fi
 case $enable_musixflx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-musixflx'" >&5
-$as_echo "$as_me: Assuming \`--enable-musixflx'" >&6;}
-     enable_musixflx=yes
-     ac_configure_args="$ac_configure_args '--enable-musixflx'";;
+  *) enable_musixflx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-musixflx=$enable_musixflx'" >&5
+$as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-musixflx=$enable_musixflx'";;
 esac
 
 
@@ -2800,10 +2927,10 @@ if test "${enable_ps2pkm+set}" = set; then
 fi
 case $enable_ps2pkm in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2pkm'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2pkm'" >&6;}
-     enable_ps2pkm=yes
-     ac_configure_args="$ac_configure_args '--enable-ps2pkm'";;
+  *) enable_ps2pkm=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2pkm=$enable_ps2pkm'";;
 esac
 
 test "x$enable_ps2pkm" = xno || {
@@ -2819,10 +2946,10 @@ if test "${enable_seetexk+set}" = set; then
 fi
 case $enable_seetexk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-seetexk'" >&5
-$as_echo "$as_me: Assuming \`--enable-seetexk'" >&6;}
-     enable_seetexk=yes
-     ac_configure_args="$ac_configure_args '--enable-seetexk'";;
+  *) enable_seetexk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+$as_echo "$as_me: Assuming \`--enable-seetexk=$enable_seetexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-seetexk=$enable_seetexk'";;
 esac
 
 test "x$enable_seetexk" = xno || {
@@ -2838,10 +2965,10 @@ if test "${enable_tex4htk+set}" = set; then
 fi
 case $enable_tex4htk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-tex4htk'" >&5
-$as_echo "$as_me: Assuming \`--enable-tex4htk'" >&6;}
-     enable_tex4htk=yes
-     ac_configure_args="$ac_configure_args '--enable-tex4htk'";;
+  *) enable_tex4htk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+$as_echo "$as_me: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tex4htk=$enable_tex4htk'";;
 esac
 
 test "x$enable_tex4htk" = xno || {
@@ -2857,10 +2984,10 @@ if test "${enable_ttf2pk+set}" = set; then
 fi
 case $enable_ttf2pk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttf2pk'" >&5
-$as_echo "$as_me: Assuming \`--enable-ttf2pk'" >&6;}
-     enable_ttf2pk=yes
-     ac_configure_args="$ac_configure_args '--enable-ttf2pk'";;
+  *) enable_ttf2pk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&5
+$as_echo "$as_me: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttf2pk=$enable_ttf2pk'";;
 esac
 
 test "x$enable_ttf2pk" = xno || {
@@ -2877,10 +3004,10 @@ if test "${enable_ttfdump+set}" = set; then
 fi
 case $enable_ttfdump in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttfdump'" >&5
-$as_echo "$as_me: Assuming \`--enable-ttfdump'" >&6;}
-     enable_ttfdump=yes
-     ac_configure_args="$ac_configure_args '--enable-ttfdump'";;
+  *) enable_ttfdump=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+$as_echo "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttfdump=$enable_ttfdump'";;
 esac
 
 test "x$enable_ttfdump" = xno || {
@@ -2896,10 +3023,10 @@ if test "${enable_xdv2pdf+set}" = set; then
 fi
 case $enable_xdv2pdf in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdv2pdf'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdv2pdf'" >&6;}
-     enable_xdv2pdf=yes
-     ac_configure_args="$ac_configure_args '--enable-xdv2pdf'";;
+  *) enable_xdv2pdf=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdv2pdf=$enable_xdv2pdf'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdv2pdf=$enable_xdv2pdf'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdv2pdf=$enable_xdv2pdf'";;
 esac
 
 test "x$enable_xdv2pdf" = xno || {
@@ -2915,10 +3042,10 @@ if test "${enable_xdvik+set}" = set; then
 fi
 case $enable_xdvik in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvik'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdvik'" >&6;}
-     enable_xdvik=yes
-     ac_configure_args="$ac_configure_args '--enable-xdvik'";;
+  *) enable_xdvik=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdvik=$enable_xdvik'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdvik=$enable_xdvik'";;
 esac
 
 test "x$enable_xdvik" = xno || {
@@ -2935,10 +3062,10 @@ if test "${enable_xdvipdfmx+set}" = set; then
 fi
 case $enable_xdvipdfmx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvipdfmx'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdvipdfmx'" >&6;}
-     enable_xdvipdfmx=yes
-     ac_configure_args="$ac_configure_args '--enable-xdvipdfmx'";;
+  *) enable_xdvipdfmx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvipdfmx=$enable_xdvipdfmx'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdvipdfmx=$enable_xdvipdfmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdvipdfmx=$enable_xdvipdfmx'";;
 esac
 
 test "x$enable_xdvipdfmx" = xno || {
diff --git a/Build/source/m4/kpse-cxx-hack.m4 b/Build/source/m4/kpse-cxx-hack.m4
new file mode 100644
index 00000000000..94f0eb6cf16
--- /dev/null
+++ b/Build/source/m4/kpse-cxx-hack.m4
@@ -0,0 +1,89 @@
+# Public macros for the teTeX / TeX Live (TL) tree.
+# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 0
+
+# KPSE_ENABLE_CXX_HACK
+# --------------------
+# Provide the configure option '--enable-cxx-runtime-hack'.
+AC_DEFUN([KPSE_ENABLE_CXX_HACK],
+[AC_ARG_ENABLE([cxx-runtime-hack],
+               AS_HELP_STRING([--enable-cxx-runtime-hack],
+                              [link C++ runtime statically],
+                              [29]))[]dnl
+]) # KPSE_ENABLE_CXX_HACK
+
+# KPSE_CXX_HACK()
+# ---------------
+# Try statically linking C++ runtime library (g++ only)
+# and define CXX_HACK_LIBS with required flags.
+# Since Libtool reshuffles the argument list, we define CXXLD
+# as wrapper script appending these flags to  g++ as invoked
+# by Libtool when linking progams (but not shared libraries).
+#
+AC_DEFUN([KPSE_CXX_HACK],
+[AC_REQUIRE([AC_PROG_CXX])[]dnl
+AC_REQUIRE([KPSE_ENABLE_CXX_HACK])[]dnl
+cpp_link_hack=false
+if test "x$GXX" = xyes && test "x$enable_cxx_runtime_hack" = xyes; then
+  _KPSE_CXX_HACK
+fi
+if $cpp_link_hack; then
+  CXXLD='$(top_builddir)/CXXLD.sh'
+  CXX_HACK_DEPS=$CXXLD
+  cxxld_sh="#! ${CONFIG_SHELL-/bin/sh}
+# CXXLD.sh.  Generated by configure.
+set -- $CXX \"\$[]@\" $CXX_HACK_LIBS
+echo \"\$[]0:\" \"\$[]@\"
+exec \"\$[]@\""
+  AC_CONFIG_FILES([CXXLD.sh:Makefile.in],
+                  [echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh],
+                  [cxxld_sh='$cxxld_sh'])
+else
+  CXXLD='$(CXX)'
+fi
+AC_SUBST([CXXLD])
+AC_SUBST([CXX_HACK_DEPS])
+AC_SUBST([CXX_HACK_LIBS])
+]) # KPSE_CXX_HACK
+
+# _KPSE_CXX_HACK()
+# ----------------
+# internal subroutine
+m4_define([_KPSE_CXX_HACK], [
+AC_LANG_PUSH([C++])
+AC_CHECK_HEADERS([iostream])
+AC_MSG_CHECKING([for statically linking C++ runtime library])
+AC_LANG_CONFTEST([AC_LANG_PROGRAM([[#ifdef HAVE_IOSTREAM
+#include <iostream>
+using namespace std;
+#else
+#include <iostream.h>
+#endif]],
+                                  [[cout <<"worksok\n";]])])
+flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
+flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
+flags_try2='-lgcc -lc -lgcc'
+kpse_save_LIBS=$LIBS
+for flags in "$flags_try1" "$flags_try2"; do
+  LIBS="$kpse_save_LIBS $flags_try0 $flags"
+  AC_LINK_IFELSE([],
+    [case `(./conftest$ac_exeext; exit) 2>/dev/null` in
+       worksok)
+         cpp_link_hack=true; break;;
+     esac])
+done
+LIBS=$kpse_save_LIBS
+
+if $cpp_link_hack; then
+  CXX_HACK_LIBS="$flags_try0 $flags"
+  AC_MSG_RESULT(ok using $CXX_HACK_LIBS)
+else
+  AC_MSG_RESULT(not supported)
+fi
+AC_LANG_POP([C++])
+]) # _KPSE_CXX_HACK
diff --git a/Build/source/m4/kpse-options.m4 b/Build/source/m4/kpse-options.m4
new file mode 100644
index 00000000000..159c63b5f16
--- /dev/null
+++ b/Build/source/m4/kpse-options.m4
@@ -0,0 +1,29 @@
+# Public macros for the teTeX / TeX Live (TL) tree.
+# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 0
+
+# KPSE_OPTIONS
+# ------------
+# Provide configure options used by the higher level TL directories
+# as well as by packages maintained independently.
+AC_DEFUN([KPSE_OPTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+AC_ARG_ENABLE([multiplatform],
+              AS_HELP_STRING([--enable-multiplatform],
+                             [put executables into bin/PLATFORM and libraries into lib/PLATFORM]))[]dnl
+if test "x$enable_multiplatform" = xyes; then
+  if test "x$bindir" = 'x${exec_prefix}/bin'; then
+    bindir="$bindir/$host"
+    ac_configure_args="$ac_configure_args '--bindir=$bindir'"
+  fi
+  if test "x$libdir" = 'x${exec_prefix}/lib'; then
+    libdir="$libdir/$host"
+    ac_configure_args="$ac_configure_args '--libdir=$libdir'"
+  fi
+fi
+]) # KPSE_OPTIONS
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index 61996a77ac0..8eeb4a22a87 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -19,6 +19,12 @@ AC_DEFUN([KPSE_SETUP],
 [m4_define([kpse_TL], [$1])[]dnl
 m4_define([kpse_indent_26], [28])[]dnl
 m4_define([kpse_indent_28], [30])[]dnl
+AC_ARG_ENABLE([all-pkgs],
+              AS_HELP_STRING([--disable-all-pkgs],
+                             [do not build packages unless explicitly enabled]))[]dnl
+test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes
+KPSE_ENABLE_CXX_HACK
+KPSE_OPTIONS
 KPSE_WEB2C_PREPARE
 m4_sinclude(kpse_TL[ac/withenable.ac])
 m4_sinclude(kpse_TL[utils/ac/withenable.ac])
@@ -46,9 +52,9 @@ AC_ARG_ENABLE([$1],
                                                                       [($4) ])[package]))[]dnl
 case $enable_[]AS_TR_SH($1) in #(
   yes|no);; #(
-  *) AC_MSG_NOTICE([Assuming `--]m4_if(Kpse_with, [no], [dis], [en])[able-$1'])
-     enable_[]AS_TR_SH($1)=Kpse_with
-     ac_configure_args="$ac_configure_args '--[]m4_if(Kpse_with, [no], [dis], [en])able-$1'";;
+  *) enable_[]AS_TR_SH($1)=m4_if(Kpse_with, [yes], [$enable_all_pkgs], [no])
+     AC_MSG_NOTICE([Assuming `--enable-$1=$enable_]AS_TR_SH($1)['])
+     ac_configure_args="$ac_configure_args '--enable-$1=$enable_[]AS_TR_SH($1)'";;
 esac
 m4_popdef([Kpse_with])[]dnl
 m4_ifval([$2], [
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index d1788e85cf1..b74464d30d0 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -30,8 +30,12 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) \
+	$(srcdir)/../build-aux/config.guess \
+	$(srcdir)/../build-aux/config.sub \
 	$(srcdir)/../build-aux/install-sh \
 	$(srcdir)/../build-aux/missing $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
@@ -40,7 +44,9 @@ DIST_COMMON = README $(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-pkgs.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../m4/kpse-options.m4 \
+	$(top_srcdir)/../m4/kpse-pkgs.m4 \
 	$(top_srcdir)/../m4/kpse-setup.m4 \
 	$(top_srcdir)/../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../ac/withenable.ac \
@@ -173,14 +179,22 @@ am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4
index 09141f30b8f..c917492c6a5 100644
--- a/Build/source/texk/aclocal.m4
+++ b/Build/source/texk/aclocal.m4
@@ -616,6 +616,8 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../m4/kpse-cxx-hack.m4])
+m4_include([../m4/kpse-options.m4])
 m4_include([../m4/kpse-pkgs.m4])
 m4_include([../m4/kpse-setup.m4])
 m4_include([../m4/kpse-web2c.m4])
diff --git a/Build/source/texk/am/man.am b/Build/source/texk/am/man.am
index 8e2ad41d04d..5fe5dedffe3 100644
--- a/Build/source/texk/am/man.am
+++ b/Build/source/texk/am/man.am
@@ -1,5 +1,5 @@
 ## texk/am/man.am: Makefile fragment for kpathsea and web2c manual pages.
-## requires $(man_sources), $(EXTRA_DIST), and $(DISTCLEANFILES)
+## requires $(man_sources)
 ## requires $(KPATHSEA_PATHS_H) giving the directory of kpathsea/paths.h
 
 SUFFIXES = .1 .man .ps .dvi
@@ -43,8 +43,6 @@ DVIS = $(man_files:.1=.dvi)
 	$(DITROFF) -Tps -man $< >$@
 PSS = $(man_files:.1=.ps)
 
-EXTRA_DIST += $(man_sources)
-
-DISTCLEANFILES += sedscript $(man_files) $(DVIS) $(PSS)
+DISTCLEANFILES = sedscript $(man_files) $(DVIS) $(PSS)
 
 ## end of texk/am/man.am
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 49b4ceba5c2..335fbb9a3c3 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -633,6 +633,14 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 target_alias
 host_alias
 build_alias
@@ -673,6 +681,9 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_all_pkgs
+enable_cxx_runtime_hack
+enable_multiplatform
 enable_dialog
 enable_pdfopen
 enable_ps2eps
@@ -1431,6 +1442,10 @@ Program names:
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
@@ -1444,6 +1459,10 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-all-pkgs      do not build packages unless explicitly enabled
+  --enable-cxx-runtime-hack  link C++ runtime statically
+  --enable-multiplatform  put executables into bin/PLATFORM and libraries into
+                          lib/PLATFORM
   --disable-dialog        do not build the dialog package
   --disable-pdfopen       do not build the pdfopen package
   --disable-ps2eps        do not build the ps2eps package
@@ -2060,8 +2079,116 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+
 
+# Check whether --enable-all-pkgs was given.
+if test "${enable_all_pkgs+set}" = set; then
+  enableval=$enable_all_pkgs;
+fi
+test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes
+# Check whether --enable-cxx-runtime-hack was given.
+if test "${enable_cxx_runtime_hack+set}" = set; then
+  enableval=$enable_cxx_runtime_hack;
+fi
 
+# Check whether --enable-multiplatform was given.
+if test "${enable_multiplatform+set}" = set; then
+  enableval=$enable_multiplatform;
+fi
+if test "x$enable_multiplatform" = xyes; then
+  if test "x$bindir" = 'x${exec_prefix}/bin'; then
+    bindir="$bindir/$host"
+    ac_configure_args="$ac_configure_args '--bindir=$bindir'"
+  fi
+  if test "x$libdir" = 'x${exec_prefix}/lib'; then
+    libdir="$libdir/$host"
+    ac_configure_args="$ac_configure_args '--libdir=$libdir'"
+  fi
+fi
 
 
 ## ac/withenable.ac
@@ -2076,10 +2203,10 @@ if test "${enable_dialog+set}" = set; then
 fi
 case $enable_dialog in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dialog'" >&5
-$as_echo "$as_me: Assuming \`--enable-dialog'" >&6;}
-     enable_dialog=yes
-     ac_configure_args="$ac_configure_args '--enable-dialog'";;
+  *) enable_dialog=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dialog=$enable_dialog'" >&5
+$as_echo "$as_me: Assuming \`--enable-dialog=$enable_dialog'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dialog=$enable_dialog'";;
 esac
 
 
@@ -2091,10 +2218,10 @@ if test "${enable_pdfopen+set}" = set; then
 fi
 case $enable_pdfopen in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-pdfopen'" >&5
-$as_echo "$as_me: Assuming \`--enable-pdfopen'" >&6;}
-     enable_pdfopen=yes
-     ac_configure_args="$ac_configure_args '--enable-pdfopen'";;
+  *) enable_pdfopen=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&5
+$as_echo "$as_me: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-pdfopen=$enable_pdfopen'";;
 esac
 
 
@@ -2106,10 +2233,10 @@ if test "${enable_ps2eps+set}" = set; then
 fi
 case $enable_ps2eps in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2eps'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2eps'" >&6;}
-     enable_ps2eps=yes
-     ac_configure_args="$ac_configure_args '--enable-ps2eps'";;
+  *) enable_ps2eps=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2eps=$enable_ps2eps'";;
 esac
 
 
@@ -2121,10 +2248,10 @@ if test "${enable_psutils+set}" = set; then
 fi
 case $enable_psutils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-psutils'" >&5
-$as_echo "$as_me: Assuming \`--enable-psutils'" >&6;}
-     enable_psutils=yes
-     ac_configure_args="$ac_configure_args '--enable-psutils'";;
+  *) enable_psutils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-psutils=$enable_psutils'" >&5
+$as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-psutils=$enable_psutils'";;
 esac
 
 
@@ -2136,10 +2263,10 @@ if test "${enable_t1utils+set}" = set; then
 fi
 case $enable_t1utils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-t1utils'" >&5
-$as_echo "$as_me: Assuming \`--enable-t1utils'" >&6;}
-     enable_t1utils=yes
-     ac_configure_args="$ac_configure_args '--enable-t1utils'";;
+  *) enable_t1utils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+$as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-t1utils=$enable_t1utils'";;
 esac
 
 
@@ -2151,10 +2278,10 @@ if test "${enable_tpic2pdftex+set}" = set; then
 fi
 case $enable_tpic2pdftex in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-tpic2pdftex'" >&5
-$as_echo "$as_me: Assuming \`--enable-tpic2pdftex'" >&6;}
-     enable_tpic2pdftex=yes
-     ac_configure_args="$ac_configure_args '--enable-tpic2pdftex'";;
+  *) enable_tpic2pdftex=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+$as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tpic2pdftex=$enable_tpic2pdftex'";;
 esac
 
 
@@ -2166,10 +2293,10 @@ if test "${enable_vlna+set}" = set; then
 fi
 case $enable_vlna in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-vlna'" >&5
-$as_echo "$as_me: Assuming \`--enable-vlna'" >&6;}
-     enable_vlna=yes
-     ac_configure_args="$ac_configure_args '--enable-vlna'";;
+  *) enable_vlna=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-vlna=$enable_vlna'" >&5
+$as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-vlna=$enable_vlna'";;
 esac
 
 
@@ -2184,10 +2311,10 @@ if test "${enable_web2c+set}" = set; then
 fi
 case $enable_web2c in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-web2c'" >&5
-$as_echo "$as_me: Assuming \`--enable-web2c'" >&6;}
-     enable_web2c=yes
-     ac_configure_args="$ac_configure_args '--enable-web2c'";;
+  *) enable_web2c=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-web2c=$enable_web2c'" >&5
+$as_echo "$as_me: Assuming \`--enable-web2c=$enable_web2c'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-web2c=$enable_web2c'";;
 esac
 
 test "x$enable_web2c" = xno || {
@@ -2359,10 +2486,10 @@ if test "${enable_one+set}" = set; then
 fi
 case $enable_one in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--disable-one'" >&5
-$as_echo "$as_me: Assuming \`--disable-one'" >&6;}
-     enable_one=no
-     ac_configure_args="$ac_configure_args '--disable-one'";;
+  *) enable_one=no
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-one=$enable_one'" >&5
+$as_echo "$as_me: Assuming \`--enable-one=$enable_one'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-one=$enable_one'";;
 esac
 
 test "x$enable_one" = xno || {
@@ -2382,10 +2509,10 @@ if test "${enable_afm2pl+set}" = set; then
 fi
 case $enable_afm2pl in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-afm2pl'" >&5
-$as_echo "$as_me: Assuming \`--enable-afm2pl'" >&6;}
-     enable_afm2pl=yes
-     ac_configure_args="$ac_configure_args '--enable-afm2pl'";;
+  *) enable_afm2pl=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+$as_echo "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'";;
 esac
 
 test "x$enable_afm2pl" = xno || {
@@ -2401,10 +2528,10 @@ if test "${enable_bibtex8+set}" = set; then
 fi
 case $enable_bibtex8 in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-bibtex8'" >&5
-$as_echo "$as_me: Assuming \`--enable-bibtex8'" >&6;}
-     enable_bibtex8=yes
-     ac_configure_args="$ac_configure_args '--enable-bibtex8'";;
+  *) enable_bibtex8=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-bibtex8=$enable_bibtex8'" >&5
+$as_echo "$as_me: Assuming \`--enable-bibtex8=$enable_bibtex8'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtex8=$enable_bibtex8'";;
 esac
 
 test "x$enable_bibtex8" = xno || {
@@ -2420,10 +2547,10 @@ if test "${enable_cjkutils+set}" = set; then
 fi
 case $enable_cjkutils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-cjkutils'" >&5
-$as_echo "$as_me: Assuming \`--enable-cjkutils'" >&6;}
-     enable_cjkutils=yes
-     ac_configure_args="$ac_configure_args '--enable-cjkutils'";;
+  *) enable_cjkutils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+$as_echo "$as_me: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-cjkutils=$enable_cjkutils'";;
 esac
 
 test "x$enable_cjkutils" = xno || {
@@ -2439,10 +2566,10 @@ if test "${enable_detex+set}" = set; then
 fi
 case $enable_detex in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-detex'" >&5
-$as_echo "$as_me: Assuming \`--enable-detex'" >&6;}
-     enable_detex=yes
-     ac_configure_args="$ac_configure_args '--enable-detex'";;
+  *) enable_detex=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-detex=$enable_detex'" >&5
+$as_echo "$as_me: Assuming \`--enable-detex=$enable_detex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-detex=$enable_detex'";;
 esac
 
 test "x$enable_detex" = xno || {
@@ -2458,10 +2585,10 @@ if test "${enable_devnag+set}" = set; then
 fi
 case $enable_devnag in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-devnag'" >&5
-$as_echo "$as_me: Assuming \`--enable-devnag'" >&6;}
-     enable_devnag=yes
-     ac_configure_args="$ac_configure_args '--enable-devnag'";;
+  *) enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'";;
 esac
 
 
@@ -2473,10 +2600,10 @@ if test "${enable_dtl+set}" = set; then
 fi
 case $enable_dtl in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dtl'" >&5
-$as_echo "$as_me: Assuming \`--enable-dtl'" >&6;}
-     enable_dtl=yes
-     ac_configure_args="$ac_configure_args '--enable-dtl'";;
+  *) enable_dtl=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dtl=$enable_dtl'" >&5
+$as_echo "$as_me: Assuming \`--enable-dtl=$enable_dtl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dtl=$enable_dtl'";;
 esac
 
 test "x$enable_dtl" = xno || {
@@ -2492,10 +2619,10 @@ if test "${enable_dvi2tty+set}" = set; then
 fi
 case $enable_dvi2tty in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvi2tty'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvi2tty'" >&6;}
-     enable_dvi2tty=yes
-     ac_configure_args="$ac_configure_args '--enable-dvi2tty'";;
+  *) enable_dvi2tty=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvi2tty=$enable_dvi2tty'";;
 esac
 
 test "x$enable_dvi2tty" = xno || {
@@ -2511,10 +2638,10 @@ if test "${enable_dvidvi+set}" = set; then
 fi
 case $enable_dvidvi in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvidvi'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvidvi'" >&6;}
-     enable_dvidvi=yes
-     ac_configure_args="$ac_configure_args '--enable-dvidvi'";;
+  *) enable_dvidvi=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvidvi=$enable_dvidvi'";;
 esac
 
 test "x$enable_dvidvi" = xno || {
@@ -2530,10 +2657,10 @@ if test "${enable_dviljk+set}" = set; then
 fi
 case $enable_dviljk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dviljk'" >&5
-$as_echo "$as_me: Assuming \`--enable-dviljk'" >&6;}
-     enable_dviljk=yes
-     ac_configure_args="$ac_configure_args '--enable-dviljk'";;
+  *) enable_dviljk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+$as_echo "$as_me: Assuming \`--enable-dviljk=$enable_dviljk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviljk=$enable_dviljk'";;
 esac
 
 test "x$enable_dviljk" = xno || {
@@ -2549,10 +2676,10 @@ if test "${enable_dvipdfm+set}" = set; then
 fi
 case $enable_dvipdfm in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfm'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipdfm'" >&6;}
-     enable_dvipdfm=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipdfm'";;
+  *) enable_dvipdfm=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfm=$enable_dvipdfm'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipdfm=$enable_dvipdfm'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipdfm=$enable_dvipdfm'";;
 esac
 
 test "x$enable_dvipdfm" = xno || {
@@ -2569,10 +2696,10 @@ if test "${enable_dvipdfmx+set}" = set; then
 fi
 case $enable_dvipdfmx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfmx'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipdfmx'" >&6;}
-     enable_dvipdfmx=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipdfmx'";;
+  *) enable_dvipdfmx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfmx=$enable_dvipdfmx'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipdfmx=$enable_dvipdfmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipdfmx=$enable_dvipdfmx'";;
 esac
 
 test "x$enable_dvipdfmx" = xno || {
@@ -2589,10 +2716,10 @@ if test "${enable_dvipng+set}" = set; then
 fi
 case $enable_dvipng in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipng'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipng'" >&6;}
-     enable_dvipng=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipng'";;
+  *) enable_dvipng=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipng=$enable_dvipng'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipng=$enable_dvipng'";;
 esac
 
 test "x$enable_dvipng" = xno || {
@@ -2630,10 +2757,10 @@ if test "${enable_dvipos+set}" = set; then
 fi
 case $enable_dvipos in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipos'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipos'" >&6;}
-     enable_dvipos=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipos'";;
+  *) enable_dvipos=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipos=$enable_dvipos'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipos=$enable_dvipos'";;
 esac
 
 test "x$enable_dvipos" = xno || {
@@ -2649,10 +2776,10 @@ if test "${enable_dvipsk+set}" = set; then
 fi
 case $enable_dvipsk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipsk'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipsk'" >&6;}
-     enable_dvipsk=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipsk'";;
+  *) enable_dvipsk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipsk=$enable_dvipsk'";;
 esac
 
 test "x$enable_dvipsk" = xno || {
@@ -2668,10 +2795,10 @@ if test "${enable_gsftopk+set}" = set; then
 fi
 case $enable_gsftopk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-gsftopk'" >&5
-$as_echo "$as_me: Assuming \`--enable-gsftopk'" >&6;}
-     enable_gsftopk=yes
-     ac_configure_args="$ac_configure_args '--enable-gsftopk'";;
+  *) enable_gsftopk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+$as_echo "$as_me: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-gsftopk=$enable_gsftopk'";;
 esac
 
 test "x$enable_gsftopk" = xno || {
@@ -2687,10 +2814,10 @@ if test "${enable_lacheck+set}" = set; then
 fi
 case $enable_lacheck in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-lacheck'" >&5
-$as_echo "$as_me: Assuming \`--enable-lacheck'" >&6;}
-     enable_lacheck=yes
-     ac_configure_args="$ac_configure_args '--enable-lacheck'";;
+  *) enable_lacheck=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+$as_echo "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lacheck=$enable_lacheck'";;
 esac
 
 test "x$enable_lacheck" = xno || {
@@ -2706,10 +2833,10 @@ if test "${enable_lcdf_typetools+set}" = set; then
 fi
 case $enable_lcdf_typetools in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-lcdf-typetools'" >&5
-$as_echo "$as_me: Assuming \`--enable-lcdf-typetools'" >&6;}
-     enable_lcdf_typetools=yes
-     ac_configure_args="$ac_configure_args '--enable-lcdf-typetools'";;
+  *) enable_lcdf_typetools=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+$as_echo "$as_me: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lcdf-typetools=$enable_lcdf_typetools'";;
 esac
 
 test "x$enable_lcdf_typetools" = xno || {
@@ -2786,10 +2913,10 @@ if test "${enable_makeindexk+set}" = set; then
 fi
 case $enable_makeindexk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-makeindexk'" >&5
-$as_echo "$as_me: Assuming \`--enable-makeindexk'" >&6;}
-     enable_makeindexk=yes
-     ac_configure_args="$ac_configure_args '--enable-makeindexk'";;
+  *) enable_makeindexk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+$as_echo "$as_me: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-makeindexk=$enable_makeindexk'";;
 esac
 
 test "x$enable_makeindexk" = xno || {
@@ -2805,10 +2932,10 @@ if test "${enable_musixflx+set}" = set; then
 fi
 case $enable_musixflx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-musixflx'" >&5
-$as_echo "$as_me: Assuming \`--enable-musixflx'" >&6;}
-     enable_musixflx=yes
-     ac_configure_args="$ac_configure_args '--enable-musixflx'";;
+  *) enable_musixflx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-musixflx=$enable_musixflx'" >&5
+$as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-musixflx=$enable_musixflx'";;
 esac
 
 
@@ -2820,10 +2947,10 @@ if test "${enable_ps2pkm+set}" = set; then
 fi
 case $enable_ps2pkm in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2pkm'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2pkm'" >&6;}
-     enable_ps2pkm=yes
-     ac_configure_args="$ac_configure_args '--enable-ps2pkm'";;
+  *) enable_ps2pkm=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2pkm=$enable_ps2pkm'";;
 esac
 
 test "x$enable_ps2pkm" = xno || {
@@ -2839,10 +2966,10 @@ if test "${enable_seetexk+set}" = set; then
 fi
 case $enable_seetexk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-seetexk'" >&5
-$as_echo "$as_me: Assuming \`--enable-seetexk'" >&6;}
-     enable_seetexk=yes
-     ac_configure_args="$ac_configure_args '--enable-seetexk'";;
+  *) enable_seetexk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+$as_echo "$as_me: Assuming \`--enable-seetexk=$enable_seetexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-seetexk=$enable_seetexk'";;
 esac
 
 test "x$enable_seetexk" = xno || {
@@ -2858,10 +2985,10 @@ if test "${enable_tex4htk+set}" = set; then
 fi
 case $enable_tex4htk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-tex4htk'" >&5
-$as_echo "$as_me: Assuming \`--enable-tex4htk'" >&6;}
-     enable_tex4htk=yes
-     ac_configure_args="$ac_configure_args '--enable-tex4htk'";;
+  *) enable_tex4htk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+$as_echo "$as_me: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tex4htk=$enable_tex4htk'";;
 esac
 
 test "x$enable_tex4htk" = xno || {
@@ -2877,10 +3004,10 @@ if test "${enable_ttf2pk+set}" = set; then
 fi
 case $enable_ttf2pk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttf2pk'" >&5
-$as_echo "$as_me: Assuming \`--enable-ttf2pk'" >&6;}
-     enable_ttf2pk=yes
-     ac_configure_args="$ac_configure_args '--enable-ttf2pk'";;
+  *) enable_ttf2pk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&5
+$as_echo "$as_me: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttf2pk=$enable_ttf2pk'";;
 esac
 
 test "x$enable_ttf2pk" = xno || {
@@ -2897,10 +3024,10 @@ if test "${enable_ttfdump+set}" = set; then
 fi
 case $enable_ttfdump in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttfdump'" >&5
-$as_echo "$as_me: Assuming \`--enable-ttfdump'" >&6;}
-     enable_ttfdump=yes
-     ac_configure_args="$ac_configure_args '--enable-ttfdump'";;
+  *) enable_ttfdump=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+$as_echo "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttfdump=$enable_ttfdump'";;
 esac
 
 test "x$enable_ttfdump" = xno || {
@@ -2916,10 +3043,10 @@ if test "${enable_xdv2pdf+set}" = set; then
 fi
 case $enable_xdv2pdf in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdv2pdf'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdv2pdf'" >&6;}
-     enable_xdv2pdf=yes
-     ac_configure_args="$ac_configure_args '--enable-xdv2pdf'";;
+  *) enable_xdv2pdf=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdv2pdf=$enable_xdv2pdf'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdv2pdf=$enable_xdv2pdf'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdv2pdf=$enable_xdv2pdf'";;
 esac
 
 test "x$enable_xdv2pdf" = xno || {
@@ -2935,10 +3062,10 @@ if test "${enable_xdvik+set}" = set; then
 fi
 case $enable_xdvik in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvik'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdvik'" >&6;}
-     enable_xdvik=yes
-     ac_configure_args="$ac_configure_args '--enable-xdvik'";;
+  *) enable_xdvik=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdvik=$enable_xdvik'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdvik=$enable_xdvik'";;
 esac
 
 test "x$enable_xdvik" = xno || {
@@ -2955,10 +3082,10 @@ if test "${enable_xdvipdfmx+set}" = set; then
 fi
 case $enable_xdvipdfmx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvipdfmx'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdvipdfmx'" >&6;}
-     enable_xdvipdfmx=yes
-     ac_configure_args="$ac_configure_args '--enable-xdvipdfmx'";;
+  *) enable_xdvipdfmx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvipdfmx=$enable_xdvipdfmx'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdvipdfmx=$enable_xdvipdfmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdvipdfmx=$enable_xdvipdfmx'";;
 esac
 
 test "x$enable_xdvipdfmx" = xno || {
diff --git a/Build/source/texk/kpathsea/man/Makefile.am b/Build/source/texk/kpathsea/man/Makefile.am
index fa262976438..b230160b9ba 100644
--- a/Build/source/texk/kpathsea/man/Makefile.am
+++ b/Build/source/texk/kpathsea/man/Makefile.am
@@ -9,8 +9,8 @@ man_sources = \
 	mktexpk.man \
 	mktextfm.man
 
-EXTRA_DIST =
-DISTCLEANFILES =
+EXTRA_DIST = $(man_sources)
+
 KPATHSEA_PATHS_H = ${top_builddir}/..
 
 include $(top_srcdir)/../am/man.am
diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in
index f8ab36aefb1..82c1278202f 100644
--- a/Build/source/texk/kpathsea/man/Makefile.in
+++ b/Build/source/texk/kpathsea/man/Makefile.in
@@ -179,7 +179,6 @@ man_sources = \
 	mktextfm.man
 
 EXTRA_DIST = $(man_sources)
-DISTCLEANFILES = sedscript $(man_files) $(DVIS) $(PSS)
 KPATHSEA_PATHS_H = ${top_builddir}/..
 SUFFIXES = .1 .man .ps .dvi
 man_files = $(man_sources:.man=.1)
@@ -187,6 +186,7 @@ nodist_man1_MANS = $(man_files)
 DITROFF = groff
 DVIS = $(man_files:.1=.dvi)
 PSS = $(man_files:.1=.ps)
+DISTCLEANFILES = sedscript $(man_files) $(DVIS) $(PSS)
 all: all-am
 
 .SUFFIXES:
diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index 4fc7b3b257d..b26764a076e 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -48,6 +48,7 @@ DIST_COMMON = README $(am__configure_deps) \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -111,6 +112,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/aclocal.m4 b/Build/source/texk/lcdf-typetools/aclocal.m4
index 0677faae0e8..80cd4a72a84 100644
--- a/Build/source/texk/lcdf-typetools/aclocal.m4
+++ b/Build/source/texk/lcdf-typetools/aclocal.m4
@@ -918,6 +918,7 @@ AC_SUBST([am__untar])
 
 m4_include([m4/ac_cxx_template_objs.m4])
 m4_include([../../m4/kpse-common.m4])
+m4_include([../../m4/kpse-cxx-hack.m4])
 m4_include([../../m4/kpse-kpathsea-flags.m4])
 m4_include([../../m4/libtool.m4])
 m4_include([../../m4/ltoptions.m4])
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
index f927efb0cab..884469acc82 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
@@ -38,6 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -64,7 +65,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -101,6 +101,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/config.h.in b/Build/source/texk/lcdf-typetools/config.h.in
index b2dd0c2f49c..95d5355b47e 100644
--- a/Build/source/texk/lcdf-typetools/config.h.in
+++ b/Build/source/texk/lcdf-typetools/config.h.in
@@ -80,6 +80,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the <iostream> header file. */
+#undef HAVE_IOSTREAM
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index 0bf6d2657f4..fe834baa342 100755
--- a/Build/source/texk/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -795,6 +795,9 @@ KPATHSEA_DEPEND
 KPATHSEA_LIBS
 KPATHSEA_INCLUDES
 SELECTED_SUBDIRS
+CXX_HACK_LIBS
+CXX_HACK_DEPS
+CXXLD
 TEMPLATE_OBJS
 CXXCPP
 am__fastdepCXX_FALSE
@@ -922,6 +925,7 @@ enable_dependency_tracking
 with_gnu_ld
 enable_libtool_lock
 enable_largefile
+enable_cxx_runtime_hack
 enable_cfftot1
 enable_mmafm
 enable_mmpfb
@@ -1594,6 +1598,7 @@ Optional Features:
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-largefile     omit support for large files
+  --enable-cxx-runtime-hack  link C++ runtime statically
   --disable-cfftot1       do not build the cfftot1 program
   --disable-mmafm         do not build the mmafm program
   --disable-mmpfb         do not build the mmpfb program
@@ -4219,13 +4224,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:4222: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4227: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4225: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4230: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4228: output\"" >&5)
+  (eval echo "\"\$as_me:4233: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5431,7 +5436,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5434 "configure"' > conftest.$ac_ext
+  echo '#line 5439 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7478,11 +7483,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:7481: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7486: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7485: \$? = $ac_status" >&5
+   echo "$as_me:7490: \$? = $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.
@@ -7817,11 +7822,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:7820: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7825: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7824: \$? = $ac_status" >&5
+   echo "$as_me:7829: \$? = $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.
@@ -7922,11 +7927,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:7925: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7930: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7929: \$? = $ac_status" >&5
+   echo "$as_me:7934: \$? = $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
@@ -7977,11 +7982,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:7980: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7985: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7984: \$? = $ac_status" >&5
+   echo "$as_me:7989: \$? = $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
@@ -10777,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10780 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10873,7 +10878,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10876 "configure"
+#line 10881 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15892,11 +15897,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:15895: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15900: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15899: \$? = $ac_status" >&5
+   echo "$as_me:15904: \$? = $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.
@@ -15991,11 +15996,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:15994: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15999: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15998: \$? = $ac_status" >&5
+   echo "$as_me:16003: \$? = $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
@@ -16043,11 +16048,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:16046: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16051: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16050: \$? = $ac_status" >&5
+   echo "$as_me:16055: \$? = $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
@@ -17312,6 +17317,272 @@ case $ac_cv_cxx_templobjs in
 esac
 
 
+# Check whether --enable-cxx-runtime-hack was given.
+if test "${enable_cxx_runtime_hack+set}" = set; then
+  enableval=$enable_cxx_runtime_hack;
+fi
+
+
+cpp_link_hack=false
+if test "x$GXX" = xyes && test "x$enable_cxx_runtime_hack" = xyes; then
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+for ac_header in iostream
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------- ##
+## Report this to tex-k@tug.org ##
+## ---------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:$LINENO: checking for statically linking C++ runtime library" >&5
+$as_echo_n "checking for statically linking C++ runtime library... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef HAVE_IOSTREAM
+#include <iostream>
+using namespace std;
+#else
+#include <iostream.h>
+#endif
+int
+main ()
+{
+cout <<"worksok\n";
+  ;
+  return 0;
+}
+_ACEOF
+flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
+flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
+flags_try2='-lgcc -lc -lgcc'
+kpse_save_LIBS=$LIBS
+for flags in "$flags_try1" "$flags_try2"; do
+  LIBS="$kpse_save_LIBS $flags_try0 $flags"
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  case `(./conftest$ac_exeext; exit) 2>/dev/null` in
+       worksok)
+         cpp_link_hack=true; break;;
+     esac
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+done
+LIBS=$kpse_save_LIBS
+
+if $cpp_link_hack; then
+  CXX_HACK_LIBS="$flags_try0 $flags"
+  { $as_echo "$as_me:$LINENO: result: ok using $CXX_HACK_LIBS" >&5
+$as_echo "ok using $CXX_HACK_LIBS" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: not supported" >&5
+$as_echo "not supported" >&6; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+if $cpp_link_hack; then
+  CXXLD='$(top_builddir)/CXXLD.sh'
+  CXX_HACK_DEPS=$CXXLD
+  cxxld_sh="#! ${CONFIG_SHELL-/bin/sh}
+# CXXLD.sh.  Generated by configure.
+set -- $CXX \"\$@\" $CXX_HACK_LIBS
+echo \"\$0:\" \"\$@\"
+exec \"\$@\""
+  ac_config_files="$ac_config_files CXXLD.sh:Makefile.in"
+
+else
+  CXXLD='$(CXX)'
+fi
+
+
+
+
+
 
 
 
@@ -19581,7 +19852,6 @@ _ACEOF
 fi
 
 
-
 for ac_header in new.h unistd.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23674,6 +23944,7 @@ fi
 ac_aux_dir='$ac_aux_dir'
 
 
+cxxld_sh='$cxxld_sh'
 
 _ACEOF
 
@@ -23686,6 +23957,7 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:Makefile.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES liblcdf/Makefile" ;;
     "libefont/Makefile") CONFIG_FILES="$CONFIG_FILES libefont/Makefile" ;;
@@ -25289,6 +25561,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 _LT_EOF
 
  ;;
+    "CXXLD.sh":F) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;;
 
   esac
 done # for ac_tag
diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac
index fa98778a7c4..df1e61a1d28 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac
+++ b/Build/source/texk/lcdf-typetools/configure.ac
@@ -17,6 +17,8 @@ if test -n "$GCC" ; then CC="$CC -W -Wall" ; CXX="$CXX -W -Wall" ; fi
 
 AC_CXX_TEMPLATE_OBJS
 
+KPSE_CXX_HACK
+
 
 dnl
 dnl directory searching
diff --git a/Build/source/texk/lcdf-typetools/libefont/Makefile.in b/Build/source/texk/lcdf-typetools/libefont/Makefile.in
index b017e7f1e7d..011eaa36368 100644
--- a/Build/source/texk/lcdf-typetools/libefont/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/libefont/Makefile.in
@@ -37,6 +37,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -73,7 +74,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -98,6 +98,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in b/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
index 3cb009bc031..ac1e4dc8e55 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
@@ -37,6 +37,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -77,7 +78,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -102,6 +102,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
index ede8b2f8d51..b880ec5d105 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
@@ -38,6 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -64,7 +65,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -92,6 +92,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
index a4c4e60e9b6..75f627113b5 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
@@ -38,6 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -65,7 +66,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -102,6 +102,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
index 541bbb0cae7..f8bf60bb995 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
@@ -38,6 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -63,7 +64,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -91,6 +91,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
index 92268042947..d8a50ff9409 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
@@ -42,6 +42,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -87,7 +88,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -115,6 +115,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
index afab68d467b..e186dc480c1 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
@@ -38,6 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -64,7 +65,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -92,6 +92,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
index 8af5d02a680..cfd04901fab 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
@@ -38,6 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -64,7 +65,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -101,6 +101,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in b/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in
index 0b528d1fc2d..4c6174cd123 100644
--- a/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in
@@ -38,6 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -64,7 +65,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -92,6 +92,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
index 2c1f909afb0..86bb78ad739 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
@@ -38,6 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -74,7 +75,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -102,6 +102,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
index e91f189387e..5740e64a3ee 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
@@ -38,6 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -64,7 +65,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -92,6 +92,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
index 5baf0dc0d97..b620b85a4b1 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
@@ -38,6 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_template_objs.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
@@ -64,7 +65,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -92,6 +92,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 1fc2426706a..9c81117a69b 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -59,7 +59,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \
 	$(srcdir)/pdftexdir/am/pdftex.am \
 	$(srcdir)/synctexdir/am/synctex.am \
 	$(srcdir)/xetexdir/am/xetex.am $(top_srcdir)/configure \
-	$(top_srcdir)/luatexdir/luafontforge/ff-config.in \
+	$(top_srcdir)/luatexdir/luafontloader/ff-config.in \
 	../../build-aux/config.guess ../../build-aux/config.sub \
 	../../build-aux/depcomp ../../build-aux/install-sh \
 	../../build-aux/ltmain.sh ../../build-aux/missing \
@@ -99,6 +99,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -123,27 +124,35 @@ CONFIG_CLEAN_FILES =
 ARFLAGS = cru
 libff_a_AR = $(AR) $(ARFLAGS)
 libff_a_LIBADD =
-am_libff_a_OBJECTS = libff_a-alphabet.$(OBJEXT) libff_a-char.$(OBJEXT) \
-	libff_a-cjk.$(OBJEXT) libff_a-gwwiconv.$(OBJEXT) \
-	libff_a-memory.$(OBJEXT) libff_a-ustring.$(OBJEXT) \
-	libff_a-autohint.$(OBJEXT) libff_a-charview.$(OBJEXT) \
-	libff_a-contextchain.$(OBJEXT) libff_a-encoding.$(OBJEXT) \
-	libff_a-featurefile.$(OBJEXT) libff_a-fontinfo.$(OBJEXT) \
-	libff_a-fontview.$(OBJEXT) libff_a-fvfonts.$(OBJEXT) \
-	libff_a-kernclass.$(OBJEXT) libff_a-lookups.$(OBJEXT) \
-	libff_a-macbinary.$(OBJEXT) libff_a-macenc.$(OBJEXT) \
-	libff_a-namelist.$(OBJEXT) libff_a-parsepfa.$(OBJEXT) \
-	libff_a-parsettf.$(OBJEXT) libff_a-parsettfatt.$(OBJEXT) \
-	libff_a-parsettfvar.$(OBJEXT) libff_a-prefs.$(OBJEXT) \
+am_libff_a_OBJECTS = libff_a-ArabicForms.$(OBJEXT) \
+	libff_a-alphabet.$(OBJEXT) libff_a-backtrns.$(OBJEXT) \
+	libff_a-char.$(OBJEXT) libff_a-cjk.$(OBJEXT) \
+	libff_a-dump.$(OBJEXT) libff_a-gwwiconv.$(OBJEXT) \
+	libff_a-memory.$(OBJEXT) libff_a-ucharmap.$(OBJEXT) \
+	libff_a-unialt.$(OBJEXT) libff_a-ustring.$(OBJEXT) \
+	libff_a-utype.$(OBJEXT) libff_a-autohint.$(OBJEXT) \
+	libff_a-clipnoui.$(OBJEXT) libff_a-cvundoes.$(OBJEXT) \
+	libff_a-dumppfa.$(OBJEXT) libff_a-encoding.$(OBJEXT) \
+	libff_a-featurefile.$(OBJEXT) libff_a-fontviewbase.$(OBJEXT) \
+	libff_a-fvcomposit.$(OBJEXT) libff_a-fvfonts.$(OBJEXT) \
+	libff_a-lookups.$(OBJEXT) libff_a-macbinary.$(OBJEXT) \
+	libff_a-macenc.$(OBJEXT) libff_a-mathconstants.$(OBJEXT) \
+	libff_a-mm.$(OBJEXT) libff_a-namelist.$(OBJEXT) \
+	libff_a-noprefs.$(OBJEXT) libff_a-nouiutil.$(OBJEXT) \
+	libff_a-parsepfa.$(OBJEXT) libff_a-parsettf.$(OBJEXT) \
+	libff_a-parsettfatt.$(OBJEXT) libff_a-parsettfvar.$(OBJEXT) \
 	libff_a-psread.$(OBJEXT) libff_a-pua.$(OBJEXT) \
-	libff_a-splinefill.$(OBJEXT) libff_a-splineorder2.$(OBJEXT) \
+	libff_a-python.$(OBJEXT) libff_a-sfd1.$(OBJEXT) \
+	libff_a-splinechar.$(OBJEXT) libff_a-splinefill.$(OBJEXT) \
+	libff_a-splinefont.$(OBJEXT) libff_a-splineorder2.$(OBJEXT) \
 	libff_a-splineoverlap.$(OBJEXT) \
 	libff_a-splinerefigure.$(OBJEXT) libff_a-splinesave.$(OBJEXT) \
-	libff_a-splinestroke.$(OBJEXT) libff_a-splineutil.$(OBJEXT) \
-	libff_a-splineutil2.$(OBJEXT) libff_a-stamp.$(OBJEXT) \
+	libff_a-splinesaveafm.$(OBJEXT) libff_a-splinestroke.$(OBJEXT) \
+	libff_a-splineutil.$(OBJEXT) libff_a-splineutil2.$(OBJEXT) \
 	libff_a-start.$(OBJEXT) libff_a-stemdb.$(OBJEXT) \
-	libff_a-tottf.$(OBJEXT) libff_a-tottfgpos.$(OBJEXT) \
-	libff_a-tottfvar.$(OBJEXT) libff_a-ttfspecial.$(OBJEXT) \
+	libff_a-tottf.$(OBJEXT) libff_a-tottfaat.$(OBJEXT) \
+	libff_a-tottfgpos.$(OBJEXT) libff_a-ttfspecial.$(OBJEXT) \
+	libff_a-fsys.$(OBJEXT) libff_a-gwwintl.$(OBJEXT) \
 	libff_a-ffdummies.$(OBJEXT) libff_a-luafflib.$(OBJEXT)
 libff_a_OBJECTS = $(am_libff_a_OBJECTS)
 liblua51_a_AR = $(AR) $(ARFLAGS)
@@ -169,14 +178,30 @@ libluamisc_a_AR = $(AR) $(ARFLAGS)
 libluamisc_a_LIBADD =
 am_libluamisc_a_OBJECTS = libluamisc_a-lfs.$(OBJEXT) \
 	libluamisc_a-md5.$(OBJEXT) libluamisc_a-md5lib.$(OBJEXT) \
-	libluamisc_a-lpeg.$(OBJEXT) libluamisc_a-luazip.$(OBJEXT) \
+	libluamisc_a-lpeg.$(OBJEXT) libluamisc_a-clocks.$(OBJEXT) \
+	libluamisc_a-core_profiler.$(OBJEXT) \
+	libluamisc_a-function_meter.$(OBJEXT) \
+	libluamisc_a-lua50_profiler.$(OBJEXT) \
+	libluamisc_a-stack.$(OBJEXT) libluamisc_a-luazip.$(OBJEXT) \
 	libluamisc_a-lgzip.$(OBJEXT) libluamisc_a-lzlib.$(OBJEXT) \
 	libluamisc_a-slnunico.$(OBJEXT)
 libluamisc_a_OBJECTS = $(am_libluamisc_a_OBJECTS)
+libluasocket_a_AR = $(AR) $(ARFLAGS)
+libluasocket_a_LIBADD =
+am_libluasocket_a_OBJECTS = libluasocket_a-auxiliar.$(OBJEXT) \
+	libluasocket_a-buffer.$(OBJEXT) \
+	libluasocket_a-except.$(OBJEXT) libluasocket_a-inet.$(OBJEXT) \
+	libluasocket_a-io.$(OBJEXT) \
+	libluasocket_a-lua_preload.$(OBJEXT) \
+	libluasocket_a-luasocket.$(OBJEXT) \
+	libluasocket_a-mime.$(OBJEXT) libluasocket_a-options.$(OBJEXT) \
+	libluasocket_a-select.$(OBJEXT) \
+	libluasocket_a-socket.$(OBJEXT) libluasocket_a-tcp.$(OBJEXT) \
+	libluasocket_a-timeout.$(OBJEXT) libluasocket_a-udp.$(OBJEXT)
+libluasocket_a_OBJECTS = $(am_libluasocket_a_OBJECTS)
 libluatex_a_AR = $(AR) $(ARFLAGS)
 libluatex_a_LIBADD =
-am_libluatex_a_OBJECTS = libluatex_a-avl.$(OBJEXT) \
-	libluatex_a-avlstuff.$(OBJEXT) libluatex_a-dofont.$(OBJEXT) \
+am_libluatex_a_OBJECTS = libluatex_a-dofont.$(OBJEXT) \
 	libluatex_a-luafont.$(OBJEXT) libluatex_a-mapfile.$(OBJEXT) \
 	libluatex_a-pkin.$(OBJEXT) libluatex_a-sfnt.$(OBJEXT) \
 	libluatex_a-subfont.$(OBJEXT) libluatex_a-texfont.$(OBJEXT) \
@@ -196,21 +221,29 @@ am_libluatex_a_OBJECTS = libluatex_a-avl.$(OBJEXT) \
 	libluatex_a-lcallbacklib.$(OBJEXT) \
 	libluatex_a-lfontlib.$(OBJEXT) libluatex_a-limglib.$(OBJEXT) \
 	libluatex_a-lkpselib.$(OBJEXT) libluatex_a-llanglib.$(OBJEXT) \
-	libluatex_a-llualib.$(OBJEXT) libluatex_a-lmplib.$(OBJEXT) \
-	libluatex_a-lnodelib.$(OBJEXT) libluatex_a-loslibext.$(OBJEXT) \
-	libluatex_a-lpdflib.$(OBJEXT) libluatex_a-lstatslib.$(OBJEXT) \
+	libluatex_a-llualib.$(OBJEXT) libluatex_a-lnodelib.$(OBJEXT) \
+	libluatex_a-loslibext.$(OBJEXT) libluatex_a-lpdflib.$(OBJEXT) \
+	libluatex_a-lstatslib.$(OBJEXT) \
 	libluatex_a-ltexiolib.$(OBJEXT) libluatex_a-ltexlib.$(OBJEXT) \
 	libluatex_a-ltokenlib.$(OBJEXT) libluatex_a-luainit.$(OBJEXT) \
 	libluatex_a-luanode.$(OBJEXT) libluatex_a-luastuff.$(OBJEXT) \
 	libluatex_a-luatex.$(OBJEXT) libluatex_a-luatoken.$(OBJEXT) \
-	libluatex_a-texluac.$(OBJEXT) libluatex_a-managed-sa.$(OBJEXT) \
-	libluatex_a-mathcodes.$(OBJEXT) \
-	libluatex_a-linebreak.$(OBJEXT) \
+	libluatex_a-texluac.$(OBJEXT) libluatex_a-makecpool.$(OBJEXT) \
+	libluatex_a-managed-sa.$(OBJEXT) \
+	libluatex_a-mathcodes.$(OBJEXT) libluatex_a-lmplib.$(OBJEXT) \
+	libluatex_a-pagetree.$(OBJEXT) libluatex_a-pdfpage.$(OBJEXT) \
+	libluatex_a-filename.$(OBJEXT) libluatex_a-linebreak.$(OBJEXT) \
+	libluatex_a-math.$(OBJEXT) libluatex_a-mlist.$(OBJEXT) \
 	libluatex_a-postlinebreak.$(OBJEXT) \
+	libluatex_a-primitive.$(OBJEXT) \
+	libluatex_a-texdeffont.$(OBJEXT) \
 	libluatex_a-texnodes.$(OBJEXT) libluatex_a-texpdf.$(OBJEXT) \
 	libluatex_a-textoken.$(OBJEXT) libluatex_a-textcodes.$(OBJEXT) \
-	libluatex_a-utils.$(OBJEXT) libluatex_a-writezip.$(OBJEXT)
-am__objects_1 = libluatex_a-mp.$(OBJEXT) libluatex_a-psout.$(OBJEXT)
+	libluatex_a-avl.$(OBJEXT) libluatex_a-avlstuff.$(OBJEXT) \
+	libluatex_a-synctex.$(OBJEXT) libluatex_a-utils.$(OBJEXT) \
+	libluatex_a-writezip.$(OBJEXT)
+am__objects_1 = libluatex_a-mp.$(OBJEXT) libluatex_a-psout.$(OBJEXT) \
+	libluatex_a-memio.$(OBJEXT) libluatex_a-tfmin.$(OBJEXT)
 nodist_libluatex_a_OBJECTS = $(am__objects_1)
 libluatex_a_OBJECTS = $(am_libluatex_a_OBJECTS) \
 	$(nodist_libluatex_a_OBJECTS)
@@ -355,8 +388,9 @@ nodist_luatex_OBJECTS = $(am__objects_6) luatex-luatex-pool.$(OBJEXT) \
 	luatex-luatexextra.$(OBJEXT)
 luatex_OBJECTS = $(nodist_luatex_OBJECTS)
 am__DEPENDENCIES_4 = libluatex.a libff.a libluamisc.a libzzip.a \
-	liblua51.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmd5.a
+	libluasocket.a liblua51.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) libmd5.a
 am_md5main_OBJECTS = md5main-md5main.$(OBJEXT)
 md5main_OBJECTS = $(am_md5main_OBJECTS)
 md5main_DEPENDENCIES = libmd5.a
@@ -516,17 +550,17 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
 	$(libluamisc_a_SOURCES) $(EXTRA_libluamisc_a_SOURCES) \
-	$(libluatex_a_SOURCES) $(EXTRA_libluatex_a_SOURCES) \
-	$(nodist_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \
-	$(nodist_libmf_a_SOURCES) $(libmpost_a_SOURCES) \
-	$(libpdftex_a_SOURCES) $(EXTRA_libpdftex_a_SOURCES) \
-	$(libzzip_a_SOURCES) $(aleph_SOURCES) $(nodist_aleph_SOURCES) \
+	$(libluasocket_a_SOURCES) $(libluatex_a_SOURCES) \
+	$(EXTRA_libluatex_a_SOURCES) $(nodist_libluatex_a_SOURCES) \
+	$(libmd5_a_SOURCES) $(nodist_libmf_a_SOURCES) \
+	$(libmpost_a_SOURCES) $(libpdftex_a_SOURCES) \
+	$(EXTRA_libpdftex_a_SOURCES) $(libzzip_a_SOURCES) \
+	$(aleph_SOURCES) $(nodist_aleph_SOURCES) \
 	$(nodist_bibtex_SOURCES) $(nodist_ctangle_SOURCES) \
 	$(nodist_ctangleboot_SOURCES) $(nodist_ctie_SOURCES) \
 	$(nodist_cweave_SOURCES) $(nodist_dvicopy_SOURCES) \
@@ -555,12 +589,12 @@ SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
 	$(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES)
 DIST_SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
 	$(libluamisc_a_SOURCES) $(EXTRA_libluamisc_a_SOURCES) \
-	$(libluatex_a_SOURCES) $(EXTRA_libluatex_a_SOURCES) \
-	$(libmd5_a_SOURCES) $(libmpost_a_SOURCES) \
-	$(libpdftex_a_SOURCES) $(EXTRA_libpdftex_a_SOURCES) \
-	$(libzzip_a_SOURCES) $(aleph_SOURCES) \
-	$(am__dist_etex_SOURCES_DIST) $(gftodvi_SOURCES) \
-	$(md5main_SOURCES) $(omega_SOURCES) \
+	$(libluasocket_a_SOURCES) $(libluatex_a_SOURCES) \
+	$(EXTRA_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \
+	$(libmpost_a_SOURCES) $(libpdftex_a_SOURCES) \
+	$(EXTRA_libpdftex_a_SOURCES) $(libzzip_a_SOURCES) \
+	$(aleph_SOURCES) $(am__dist_etex_SOURCES_DIST) \
+	$(gftodvi_SOURCES) $(md5main_SOURCES) $(omega_SOURCES) \
 	$(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \
 	$(synctex_SOURCES) $(am__dist_tex_SOURCES_DIST) \
 	$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES)
@@ -609,6 +643,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -758,7 +795,7 @@ dist_check_SCRIPTS = tangle.test luatexdir/luatangle.test \
 TESTS = tangle.test tiedir/tie.test $(am__append_11) $(am__append_14) \
 	libmd5/md5.test
 EXTRA_LIBRARIES = libmf.a libmpost.a libpdftex.a liblua51.a libzzip.a \
-	libluamisc.a libff.a libluatex.a libmd5.a
+	libluasocket.a libluamisc.a libff.a libluatex.a libmd5.a
 EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
 	tangle.ch tangleboot.p cwebdir ctangleboot.c cwebboot.c \
 	$(web_programs:=.web) $(web_programs:=.ch) ctiedir tiedir \
@@ -800,52 +837,111 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
 	luatexdir/zziplib/zzip/fseeko.h \
 	luatexdir/zziplib/zzip/zziplib.wpj \
 	luatexdir/zziplib/zzipback.sed luatexdir/zziplib/zzipwrap \
+	luatexdir/luasocket/src/socket_lua.c \
+	luatexdir/luasocket/src/ftp_lua.c \
+	luatexdir/luasocket/src/http_lua.c \
+	luatexdir/luasocket/src/smtp_lua.c \
+	luatexdir/luasocket/src/tp_lua.c \
+	luatexdir/luasocket/src/url_lua.c \
+	luatexdir/luasocket/src/ltn12_lua.c \
+	luatexdir/luasocket/src/mime_lua.c \
+	luatexdir/luasocket/src/Makefile \
+	luatexdir/luasocket/src/unix.c luatexdir/luasocket/src/unix.h \
+	luatexdir/luasocket/src/usocket.c \
+	luatexdir/luasocket/src/wsocket.c \
+	luatexdir/luasocket/src/wsocket.h \
+	luatexdir/luasocket/src/ftp.lua \
+	luatexdir/luasocket/src/http.lua \
+	luatexdir/luasocket/src/smtp.lua \
+	luatexdir/luasocket/src/socket.lua \
+	luatexdir/luasocket/src/tp.lua luatexdir/luasocket/src/url.lua \
+	luatexdir/luasocket/src/ltn12.lua \
+	luatexdir/luasocket/src/mime.lua luatexdir/luasocket/LICENSE \
+	luatexdir/luasocket/NEW luatexdir/luasocket/README \
+	luatexdir/luasocket/config luatexdir/luasocket/luasocket.sln \
+	luatexdir/luasocket/makefile luatexdir/luasocket/mime.vcproj \
+	luatexdir/luasocket/socket.vcproj \
+	luatexdir/luasocket/doc/dns.html \
+	luatexdir/luasocket/doc/ftp.html \
+	luatexdir/luasocket/doc/http.html \
+	luatexdir/luasocket/doc/index.html \
+	luatexdir/luasocket/doc/installation.html \
+	luatexdir/luasocket/doc/introduction.html \
+	luatexdir/luasocket/doc/ltn12.html \
+	luatexdir/luasocket/doc/luasocket.png \
+	luatexdir/luasocket/doc/mime.html \
+	luatexdir/luasocket/doc/reference.css \
+	luatexdir/luasocket/doc/reference.html \
+	luatexdir/luasocket/doc/smtp.html \
+	luatexdir/luasocket/doc/socket.html \
+	luatexdir/luasocket/doc/tcp.html \
+	luatexdir/luasocket/doc/udp.html \
+	luatexdir/luasocket/doc/url.html \
+	luatexdir/luasocket/etc/README luatexdir/luasocket/etc/b64.lua \
+	luatexdir/luasocket/etc/check-links.lua \
+	luatexdir/luasocket/etc/check-memory.lua \
+	luatexdir/luasocket/etc/dict.lua \
+	luatexdir/luasocket/etc/dispatch.lua \
+	luatexdir/luasocket/etc/eol.lua \
+	luatexdir/luasocket/etc/forward.lua \
+	luatexdir/luasocket/etc/get.lua luatexdir/luasocket/etc/lp.lua \
+	luatexdir/luasocket/etc/qp.lua \
+	luatexdir/luasocket/etc/tftp.lua \
+	luatexdir/luasocket/samples/README \
+	luatexdir/luasocket/samples/cddb.lua \
+	luatexdir/luasocket/samples/daytimeclnt.lua \
+	luatexdir/luasocket/samples/echoclnt.lua \
+	luatexdir/luasocket/samples/echosrvr.lua \
+	luatexdir/luasocket/samples/listener.lua \
+	luatexdir/luasocket/samples/lpr.lua \
+	luatexdir/luasocket/samples/talker.lua \
+	luatexdir/luasocket/samples/tinyirc.lua \
+	luatexdir/luasocket/test/README \
+	luatexdir/luasocket/test/testclnt.lua \
+	luatexdir/luasocket/test/testsrvr.lua \
+	luatexdir/luasocket/test/testsupport.lua \
 	luatexdir/luafilesystem/Makefile \
-	luatexdir/luafilesystem/config luatexdir/luafilesystem/doc \
+	luatexdir/luafilesystem/Makefile.win \
+	luatexdir/luafilesystem/README luatexdir/luafilesystem/config \
+	luatexdir/luafilesystem/config.win luatexdir/luafilesystem/doc \
+	luatexdir/luafilesystem/src/lfs.def \
 	luatexdir/luafilesystem/tests luatexdir/luafilesystem/vc6 \
 	luatexdir/luamd5/makefile luatexdir/luamd5/md5.html \
 	luatexdir/luamd5/md5.lua luatexdir/luamd5/md5tests.lua \
-	luatexdir/luazip/Makefile luatexdir/luazip/README \
-	luatexdir/luazip/config luatexdir/luazip/doc \
-	luatexdir/luazip/tests luatexdir/luazip/vc6 \
-	luatexdir/luazip/vc7 luatexdir/luazlib/Makefile \
-	luatexdir/luazlib/README luatexdir/luazlib/gzip.lua \
-	luatexdir/luazlib/test_gzip.lua \
+	luatexdir/luaprofiler/Makefile luatexdir/luazip/Makefile \
+	luatexdir/luazip/README luatexdir/luazip/config \
+	luatexdir/luazip/doc luatexdir/luazip/tests \
+	luatexdir/luazip/vc6 luatexdir/luazip/vc7 \
+	luatexdir/luazlib/Makefile luatexdir/luazlib/README \
+	luatexdir/luazlib/gzip.lua luatexdir/luazlib/test_gzip.lua \
 	luatexdir/luazlib/test_zlib.lua luatexdir/luazlib/zlib.lua \
-	luatexdir/slnunicode/unitest luatexdir/luafontforge/ChangeLog \
-	luatexdir/luafontforge/fontforge/AUTHORS \
-	luatexdir/luafontforge/fontforge/INSTALL \
-	luatexdir/luafontforge/fontforge/LICENSE \
-	luatexdir/luafontforge/fontforge/VERSION \
-	luatexdir/luafontforge/Makefile \
-	luatexdir/luafontforge/fontforge/Makefile \
-	luatexdir/luafontforge/fontforge/Unicode/Makefile \
-	luatexdir/luafontforge/fontforge/Unicode/descrip.mms \
-	luatexdir/luafontforge/fontforge/descrip.mms \
-	luatexdir/luafontforge/fontforge/fontforge/Makefile \
-	luatexdir/luafontforge/fontforge/fontforge/descrip.mms \
-	luatexdir/luafontforge/fontforge/fontforge/lff.opt \
-	luatexdir/luafontforge/fontforge/fontforge/scriptfuncs.h \
-	luatexdir/luafontforge/fontforge/fontforge/scripting.h \
-	luatexdir/luafontforge/fontforge/fontforge/sfd1.h \
-	luatexdir/luafontforge/fontforge/fontforge/stamper.c \
-	luatexdir/luafontforge/fontforge/fontforge/xlib.opt \
+	luatexdir/slnunicode/unitest luatexdir/luafontloader/ChangeLog \
+	luatexdir/luafontloader/fontforge/AUTHORS \
+	luatexdir/luafontloader/fontforge/INSTALL \
+	luatexdir/luafontloader/fontforge/LICENSE \
+	luatexdir/luafontloader/fontforge/VERSION \
+	luatexdir/luafontloader/fontforge/Makefile.in \
+	luatexdir/luafontloader/fontforge/Unicode/Makefile.in \
+	luatexdir/luafontloader/fontforge/configure-options \
+	luatexdir/luafontloader/fontforge/configure.in \
+	luatexdir/luafontloader/fontforge/fontforge/Makefile.in \
+	luatexdir/luafontloader/fontforge/gdraw/Makefile.in \
+	luatexdir/luafontloader/fontforge/gutils/Makefile.in \
+	luatexdir/luafontloader/fontforge/inc/config.h.in \
+	luatexdir/luafontloader/fontforge/plugins/Makefile.in \
 	$(lua_mp_web) luatexdir/ChangeLog luatexdir/NEWS \
 	luatexdir/README luatexdir/change-files.txt \
-	luatexdir/font/subfont.txt luatexdir/pdftosrc.1 \
-	luatexdir/pdftosrc.cc luatexdir/pdftosrc.rc \
-	luatexdir/ttf2afm.c luatexdir/ttf2afm.rc luatexdir/macnames.c \
-	luatexdir/Makefile.in luatexdir/luatex.mk \
-	luatexdir/luatexlib.mk xetexdir/FontTableCache.cpp \
-	xetexdir/FontTableCache.h xetexdir/MathTable.h \
-	xetexdir/XeTeXFontInst.cpp xetexdir/XeTeXFontInst.h \
-	xetexdir/XeTeXFontInst_FT2.cpp xetexdir/XeTeXFontInst_FT2.h \
-	xetexdir/XeTeXFontInst_Mac.cpp xetexdir/XeTeXFontInst_Mac.h \
-	xetexdir/XeTeXFontMgr.cpp xetexdir/XeTeXFontMgr.h \
-	xetexdir/XeTeXFontMgr_FC.cpp xetexdir/XeTeXFontMgr_FC.h \
-	xetexdir/XeTeXFontMgr_Mac.h xetexdir/XeTeXFontMgr_Mac.mm \
-	xetexdir/XeTeXGrLayout.cpp xetexdir/XeTeXGrLayout.h \
-	xetexdir/XeTeXLayoutInterface.cpp \
+	luatexdir/font/subfont.txt luatexdir/Makefile.in \
+	luatexdir/luatex.mk luatexdir/luatexlib.mk \
+	xetexdir/FontTableCache.cpp xetexdir/FontTableCache.h \
+	xetexdir/MathTable.h xetexdir/XeTeXFontInst.cpp \
+	xetexdir/XeTeXFontInst.h xetexdir/XeTeXFontInst_FT2.cpp \
+	xetexdir/XeTeXFontInst_FT2.h xetexdir/XeTeXFontInst_Mac.cpp \
+	xetexdir/XeTeXFontInst_Mac.h xetexdir/XeTeXFontMgr.cpp \
+	xetexdir/XeTeXFontMgr.h xetexdir/XeTeXFontMgr_FC.cpp \
+	xetexdir/XeTeXFontMgr_FC.h xetexdir/XeTeXFontMgr_Mac.h \
+	xetexdir/XeTeXFontMgr_Mac.mm xetexdir/XeTeXGrLayout.cpp \
+	xetexdir/XeTeXGrLayout.h xetexdir/XeTeXLayoutInterface.cpp \
 	xetexdir/XeTeXLayoutInterface.h \
 	xetexdir/XeTeXOTLayoutEngine.cpp \
 	xetexdir/XeTeXOTLayoutEngine.h xetexdir/XeTeXOTMath.cpp \
@@ -1078,10 +1174,11 @@ luatex_tangle = WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(LUATANGLE)
 luatex_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) \
 	$(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 -Iluatexdir \
 	-I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 \
-	-Dextra_version_info=`date +-%Y%m%d%H`
-luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a liblua51.a \
-	$(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) $(OBSDCOMPAT_LIBS) \
-	libmd5.a
+	-I$(srcdir)/luatexdir/mp -Dextra_version_info=`date \
+	+-%Y%m%d%H`
+luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a \
+	libluasocket.a liblua51.a $(LIBPNG_LIBS) $(ZLIB_LIBS) \
+	$(XPDF_LIBS) $(OBSDCOMPAT_LIBS) libmd5.a
 luatex_LDADD = $(luatex_ldadd) $(LDADD) $(socketlibs)
 luatex_DEPENDENCIES = $(proglib) libluatex.a $(LIBPNG_DEPEND) \
 	$(ZLIB_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a
@@ -1149,7 +1246,7 @@ liblua51_a_SOURCES = \
 
 libzzip_a_DEPENDENCIES = liblua51.a
 libzzip_a_CPPFLAGS = \
-	$(KPSE_ZLIB_INCLUDES) \
+	$(ZLIB_INCLUDES) \
 	-I$(top_srcdir)/luatexdir/zziplib
 
 libzzip_a_SOURCES = \
@@ -1183,9 +1280,43 @@ libzzip_a_SOURCES = \
 	luatexdir/zziplib/zzip/zip.c \
 	luatexdir/zziplib/zzip/zzip.h
 
-libluamisc_a_DEPENDENCIES = $(KPSE_ZLIB_DEPEND) libzzip.a
+libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) libzzip.a 
+libluasocket_a_CPPFLAGS = \
+	-I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51
+
+libluasocket_a_SOURCES = \
+	luatexdir/luasocket/src/auxiliar.c \
+	luatexdir/luasocket/src/auxiliar.h \
+	luatexdir/luasocket/src/buffer.c \
+	luatexdir/luasocket/src/buffer.h \
+	luatexdir/luasocket/src/except.c \
+	luatexdir/luasocket/src/except.h \
+	luatexdir/luasocket/src/inet.c \
+	luatexdir/luasocket/src/inet.h \
+	luatexdir/luasocket/src/io.c \
+	luatexdir/luasocket/src/io.h \
+	luatexdir/luasocket/src/lua_preload.c \
+	luatexdir/luasocket/src/luasocket.c \
+	luatexdir/luasocket/src/luasocket.h \
+	luatexdir/luasocket/src/mime.c \
+	luatexdir/luasocket/src/mime.h \
+	luatexdir/luasocket/src/options.c \
+	luatexdir/luasocket/src/options.h \
+	luatexdir/luasocket/src/select.c \
+	luatexdir/luasocket/src/select.h \
+	luatexdir/luasocket/src/socket.c \
+	luatexdir/luasocket/src/socket.h \
+	luatexdir/luasocket/src/tcp.c \
+	luatexdir/luasocket/src/tcp.h \
+	luatexdir/luasocket/src/timeout.c \
+	luatexdir/luasocket/src/timeout.h \
+	luatexdir/luasocket/src/udp.c \
+	luatexdir/luasocket/src/udp.h \
+	luatexdir/luasocket/src/usocket.h
+
+libluamisc_a_DEPENDENCIES = libluasocket.a
 libluamisc_a_CPPFLAGS = \
-	$(KPSE_ZLIB_INCLUDES) \
+	$(ZLIB_INCLUDES) \
 	-I$(top_srcdir)/luatexdir/lua51 \
 	-I$(top_srcdir)/luatexdir/zziplib
 
@@ -1196,6 +1327,16 @@ libluamisc_a_SOURCES = \
 	luatexdir/luamd5/md5.h \
 	luatexdir/luamd5/md5lib.c \
 	luatexdir/luapeg/lpeg.c \
+	luatexdir/luaprofiler/clocks.h \
+	luatexdir/luaprofiler/core_profiler.h \
+	luatexdir/luaprofiler/function_meter.h  \
+	luatexdir/luaprofiler/luaprofiler.h  \
+	luatexdir/luaprofiler/stack.h \
+	luatexdir/luaprofiler/clocks.c \
+	luatexdir/luaprofiler/core_profiler.c \
+	luatexdir/luaprofiler/function_meter.c \
+	luatexdir/luaprofiler/lua50_profiler.c \
+	luatexdir/luaprofiler/stack.c \
 	luatexdir/luazip/src/luazip.c \
 	luatexdir/luazip/src/luazip.h \
 	luatexdir/luazlib/lgzip.c \
@@ -1209,98 +1350,121 @@ libff_a_CPPFLAGS = \
 	-D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 -DNODYNAMIC=1 \
 	-D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 -UHAVE_LIBINTL_H \
 	-I$(top_srcdir)/luatexdir/lua51 \
-	-I$(top_srcdir)/luatexdir/luafontforge/fontforge/inc \
-	-I$(top_srcdir)/luatexdir/luafontforge/fontforge/fontforge
+	-I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \
+	-I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge
 
 libff_a_SOURCES = \
-	luatexdir/luafontforge/fontforge/Unicode/alphabet.c \
-	luatexdir/luafontforge/fontforge/Unicode/char.c \
-	luatexdir/luafontforge/fontforge/Unicode/cjk.c \
-	luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c \
-	luatexdir/luafontforge/fontforge/Unicode/memory.c \
-	luatexdir/luafontforge/fontforge/Unicode/ustring.c \
-	luatexdir/luafontforge/fontforge/fontforge/autohint.c \
-	luatexdir/luafontforge/fontforge/fontforge/charview.c \
-	luatexdir/luafontforge/fontforge/fontforge/configure-pfaedit.h \
-	luatexdir/luafontforge/fontforge/fontforge/contextchain.c \
-	luatexdir/luafontforge/fontforge/fontforge/edgelist.h \
-	luatexdir/luafontforge/fontforge/fontforge/edgelist2.h \
-	luatexdir/luafontforge/fontforge/fontforge/encoding.c \
-	luatexdir/luafontforge/fontforge/fontforge/featurefile.c \
-	luatexdir/luafontforge/fontforge/fontforge/fontinfo.c \
-	luatexdir/luafontforge/fontforge/fontforge/fontview.c \
-	luatexdir/luafontforge/fontforge/fontforge/fvfonts.c \
-	luatexdir/luafontforge/fontforge/fontforge/groups.h \
-	luatexdir/luafontforge/fontforge/fontforge/kernclass.c \
-	luatexdir/luafontforge/fontforge/fontforge/lookups.c \
-	luatexdir/luafontforge/fontforge/fontforge/macbinary.c \
-	luatexdir/luafontforge/fontforge/fontforge/macenc.c \
-	luatexdir/luafontforge/fontforge/fontforge/namelist.c \
-	luatexdir/luafontforge/fontforge/fontforge/ofl.h \
-	luatexdir/luafontforge/fontforge/fontforge/parsepfa.c \
-	luatexdir/luafontforge/fontforge/fontforge/parsettf.c \
-	luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c \
-	luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c \
-	luatexdir/luafontforge/fontforge/fontforge/pfaedit.h \
-	luatexdir/luafontforge/fontforge/fontforge/pfaeditui.h \
-	luatexdir/luafontforge/fontforge/fontforge/plugins.h \
-	luatexdir/luafontforge/fontforge/fontforge/prefs.c \
-	luatexdir/luafontforge/fontforge/fontforge/psfont.h \
-	luatexdir/luafontforge/fontforge/fontforge/psread.c \
-	luatexdir/luafontforge/fontforge/fontforge/pua.c \
-	luatexdir/luafontforge/fontforge/fontforge/sd.h \
-	luatexdir/luafontforge/fontforge/fontforge/splinefill.c \
-	luatexdir/luafontforge/fontforge/fontforge/splinefont.h \
-	luatexdir/luafontforge/fontforge/fontforge/splineorder2.c \
-	luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c \
-	luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c \
-	luatexdir/luafontforge/fontforge/fontforge/splinesave.c \
-	luatexdir/luafontforge/fontforge/fontforge/splinestroke.c \
-	luatexdir/luafontforge/fontforge/fontforge/splineutil.c \
-	luatexdir/luafontforge/fontforge/fontforge/splineutil2.c \
-	luatexdir/luafontforge/fontforge/fontforge/stamp.c \
-	luatexdir/luafontforge/fontforge/fontforge/start.c \
-	luatexdir/luafontforge/fontforge/fontforge/stemdb.c \
-	luatexdir/luafontforge/fontforge/fontforge/stemdb.h \
-	luatexdir/luafontforge/fontforge/fontforge/tottf.c \
-	luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c \
-	luatexdir/luafontforge/fontforge/fontforge/ttf.h \
-	luatexdir/luafontforge/fontforge/fontforge/tottfvar.c \
-	luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c \
-	luatexdir/luafontforge/fontforge/fontforge/unicoderange.h \
-	luatexdir/luafontforge/fontforge/fontforge/views.h \
-	luatexdir/luafontforge/fontforge/inc/basics.h \
-	luatexdir/luafontforge/fontforge/inc/chardata.h \
-	luatexdir/luafontforge/fontforge/inc/charset.h \
-	luatexdir/luafontforge/fontforge/inc/dynamic.h \
-	luatexdir/luafontforge/fontforge/inc/fileutil.h \
-	luatexdir/luafontforge/fontforge/inc/gdraw.h \
-	luatexdir/luafontforge/fontforge/inc/gfile.h \
-	luatexdir/luafontforge/fontforge/inc/ggadget.h \
-	luatexdir/luafontforge/fontforge/inc/gicons.h \
-	luatexdir/luafontforge/fontforge/inc/gio.h \
-	luatexdir/luafontforge/fontforge/inc/gkeysym.h \
-	luatexdir/luafontforge/fontforge/inc/gprogress.h \
-	luatexdir/luafontforge/fontforge/inc/gresource.h \
-	luatexdir/luafontforge/fontforge/inc/gwidget.h \
-	luatexdir/luafontforge/fontforge/inc/gwwiconv.h \
-	luatexdir/luafontforge/fontforge/inc/intl.h \
-	luatexdir/luafontforge/fontforge/inc/ustring.h \
-	luatexdir/luafontforge/fontforge/inc/utype.h \
-	luatexdir/luafontforge/src/ffdummies.c \
-	luatexdir/luafontforge/src/luafflib.c
+	luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c \
+	luatexdir/luafontloader/fontforge/Unicode/alphabet.c \
+	luatexdir/luafontloader/fontforge/Unicode/backtrns.c \
+	luatexdir/luafontloader/fontforge/Unicode/char.c \
+	luatexdir/luafontloader/fontforge/Unicode/cjk.c \
+	luatexdir/luafontloader/fontforge/Unicode/combiners.h \
+	luatexdir/luafontloader/fontforge/Unicode/dump.c \
+	luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c \
+	luatexdir/luafontloader/fontforge/Unicode/memory.c \
+	luatexdir/luafontloader/fontforge/Unicode/ucharmap.c \
+	luatexdir/luafontloader/fontforge/Unicode/unialt.c \
+	luatexdir/luafontloader/fontforge/Unicode/ustring.c \
+	luatexdir/luafontloader/fontforge/Unicode/utype.c \
+	luatexdir/luafontloader/fontforge/fontforge/PfEd.h \
+	luatexdir/luafontloader/fontforge/fontforge/autohint.c \
+	luatexdir/luafontloader/fontforge/fontforge/baseviews.h \
+	luatexdir/luafontloader/fontforge/fontforge/clipnoui.c \
+	luatexdir/luafontloader/fontforge/fontforge/configure-pfaedit.h \
+	luatexdir/luafontloader/fontforge/fontforge/cvundoes.c \
+	luatexdir/luafontloader/fontforge/fontforge/dumppfa.c \
+	luatexdir/luafontloader/fontforge/fontforge/edgelist.h \
+	luatexdir/luafontloader/fontforge/fontforge/edgelist2.h \
+	luatexdir/luafontloader/fontforge/fontforge/encoding.c \
+	luatexdir/luafontloader/fontforge/fontforge/encoding.h \
+	luatexdir/luafontloader/fontforge/fontforge/featurefile.c \
+	luatexdir/luafontloader/fontforge/fontforge/fontforgevw.h \
+	luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c \
+	luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c \
+	luatexdir/luafontloader/fontforge/fontforge/fvfonts.c \
+	luatexdir/luafontloader/fontforge/fontforge/libffstamp.h \
+	luatexdir/luafontloader/fontforge/fontforge/libstamp.pre \
+	luatexdir/luafontloader/fontforge/fontforge/lookups.c \
+	luatexdir/luafontloader/fontforge/fontforge/lookups.h \
+	luatexdir/luafontloader/fontforge/fontforge/macbinary.c \
+	luatexdir/luafontloader/fontforge/fontforge/macenc.c \
+	luatexdir/luafontloader/fontforge/fontforge/mathconstants.c \
+	luatexdir/luafontloader/fontforge/fontforge/mm.c \
+	luatexdir/luafontloader/fontforge/fontforge/mm.h \
+	luatexdir/luafontloader/fontforge/fontforge/namelist.c \
+	luatexdir/luafontloader/fontforge/fontforge/noprefs.c \
+	luatexdir/luafontloader/fontforge/fontforge/nouiutil.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsepfa.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsettf.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c \
+	luatexdir/luafontloader/fontforge/fontforge/pfaedit.h \
+	luatexdir/luafontloader/fontforge/fontforge/plugins.h \
+	luatexdir/luafontloader/fontforge/fontforge/psfont.h \
+	luatexdir/luafontloader/fontforge/fontforge/psread.c \
+	luatexdir/luafontloader/fontforge/fontforge/pua.c \
+	luatexdir/luafontloader/fontforge/fontforge/python.c \
+	luatexdir/luafontloader/fontforge/fontforge/scripting.h \
+	luatexdir/luafontloader/fontforge/fontforge/sd.h \
+	luatexdir/luafontloader/fontforge/fontforge/sfd1.c \
+	luatexdir/luafontloader/fontforge/fontforge/sfd1.h \
+	luatexdir/luafontloader/fontforge/fontforge/splinechar.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinefill.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinefont.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinefont.h \
+	luatexdir/luafontloader/fontforge/fontforge/splineorder2.c \
+	luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinesave.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinestroke.c \
+	luatexdir/luafontloader/fontforge/fontforge/splineutil.c \
+	luatexdir/luafontloader/fontforge/fontforge/splineutil2.c \
+	luatexdir/luafontloader/fontforge/fontforge/start.c \
+	luatexdir/luafontloader/fontforge/fontforge/stemdb.c \
+	luatexdir/luafontloader/fontforge/fontforge/stemdb.h \
+	luatexdir/luafontloader/fontforge/fontforge/tottf.c \
+	luatexdir/luafontloader/fontforge/fontforge/tottfaat.c \
+	luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c \
+	luatexdir/luafontloader/fontforge/fontforge/ttf.h \
+	luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c \
+	luatexdir/luafontloader/fontforge/fontforge/uiinterface.h \
+	luatexdir/luafontloader/fontforge/fontforge/unicoderange.h \
+	luatexdir/luafontloader/fontforge/fontforge/views.h \
+	luatexdir/luafontloader/fontforge/gutils/fsys.c \
+	luatexdir/luafontloader/fontforge/gutils/gwwintl.c \
+	luatexdir/luafontloader/fontforge/inc/basics.h \
+	luatexdir/luafontloader/fontforge/inc/chardata.h \
+	luatexdir/luafontloader/fontforge/inc/charset.h \
+	luatexdir/luafontloader/fontforge/inc/dynamic.h \
+	luatexdir/luafontloader/fontforge/inc/fileutil.h \
+	luatexdir/luafontloader/fontforge/inc/gdraw.h \
+	luatexdir/luafontloader/fontforge/inc/gfile.h \
+	luatexdir/luafontloader/fontforge/inc/ggadget.h \
+	luatexdir/luafontloader/fontforge/inc/gicons.h \
+	luatexdir/luafontloader/fontforge/inc/gimage.h \
+	luatexdir/luafontloader/fontforge/inc/gio.h \
+	luatexdir/luafontloader/fontforge/inc/gkeysym.h \
+	luatexdir/luafontloader/fontforge/inc/gprogress.h \
+	luatexdir/luafontloader/fontforge/inc/gresource.h \
+	luatexdir/luafontloader/fontforge/inc/gwidget.h \
+	luatexdir/luafontloader/fontforge/inc/gwwiconv.h \
+	luatexdir/luafontloader/fontforge/inc/intl.h \
+	luatexdir/luafontloader/fontforge/inc/ustring.h \
+	luatexdir/luafontloader/fontforge/inc/utype.h \
+	luatexdir/luafontloader/src/ffdummies.c \
+	luatexdir/luafontloader/src/luafflib.c
 
 libluatex_a_DEPENDENCIES = libff.a
 libluatex_a_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \
 	$(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \
 	-Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 \
-	-DpdfTeX
+	-DpdfTeX -I$(srcdir)/luatexdir/mp
 libluatex_a_SOURCES = \
-	luatexdir/avl.c \
-	luatexdir/avl.h \
-	luatexdir/avlstuff.c \
-	luatexdir/avlstuff.h \
+	luatexdir/commands.h  \
 	luatexdir/font/dofont.c  \
+	luatexdir/font/luatexfont.h  \
 	luatexdir/font/luafont.c  \
 	luatexdir/font/mapfile.c  \
 	luatexdir/font/pkin.c  \
@@ -1327,6 +1491,7 @@ libluatex_a_SOURCES = \
 	luatexdir/font/writettf.h  \
 	luatexdir/font/writetype0.c  \
 	luatexdir/font/writetype2.c  \
+	luatexdir/get_svnversion.sh  \
 	luatexdir/hyphen.h \
 	luatexdir/image/epdf.c  \
 	luatexdir/image/epdf.h  \
@@ -1347,7 +1512,6 @@ libluatex_a_SOURCES = \
 	luatexdir/lua/lkpselib.c  \
 	luatexdir/lua/llanglib.c  \
 	luatexdir/lua/llualib.c  \
-	luatexdir/lua/lmplib.c  \
 	luatexdir/lua/lnodelib.c  \
 	luatexdir/lua/loslibext.c  \
 	luatexdir/lua/lpdflib.c  \
@@ -1363,26 +1527,44 @@ libluatex_a_SOURCES = \
 	luatexdir/lua/texluac.c  \
 	luatexdir/luatex-api.h \
 	luatexdir/luatex.h \
+	luatexdir/makecpool.c \
 	luatexdir/managed-sa.c \
 	luatexdir/managed-sa.h \
 	luatexdir/mathcodes.c \
+	luatexdir/mp/lmplib.c \
 	luatexdir/nodes.h \
+	luatexdir/pdf/pagetree.c \
+	luatexdir/pdf/pdfpage.c \
+	luatexdir/primitive.h \
 	luatexdir/ptexmac.h \
-	luatexdir/svnversion.h \
+	luatexdir/tex/filename.c  \
 	luatexdir/tex/linebreak.c  \
+	luatexdir/tex/math.c  \
+	luatexdir/tex/mlist.c  \
 	luatexdir/tex/postlinebreak.c  \
+	luatexdir/tex/primitive.c  \
+	luatexdir/tex/texdeffont.c  \
 	luatexdir/tex/texnodes.c  \
 	luatexdir/tex/texpdf.c  \
 	luatexdir/tex/textoken.c  \
+	luatexdir/texmath.h \
 	luatexdir/textcodes.c \
 	luatexdir/tokens.h \
-	luatexdir/utils.c \
-	luatexdir/writezip.c
+	luatexdir/utils/avl.c \
+	luatexdir/utils/avl.h \
+	luatexdir/utils/avlstuff.c \
+	luatexdir/utils/avlstuff.h \
+	luatexdir/utils/synctex.h \
+	luatexdir/utils/synctex.c \
+	luatexdir/utils/utils.c \
+	luatexdir/utils/writezip.c
 
 nodist_libluatex_a_SOURCES = $(lua_mp_c_h)
 lua_mp_c_h = luatexdir/mp.c luatexdir/mplib.h luatexdir/mpmp.h \
-	luatexdir/mppsout.h luatexdir/psout.c
-lua_mp_web = luatexdir/lua/mp.w luatexdir/lua/psout.w
+	luatexdir/mppsout.h luatexdir/psout.c luatexdir/mplibps.h \
+	luatexdir/memio.c luatexdir/tfmin.c
+lua_mp_web = luatexdir/mp/avl.h luatexdir/mp/avl.c luatexdir/mp/mp.w \
+	luatexdir/mp/psout.w luatexdir/mp/memio.w luatexdir/mp/tfmin.w
 EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c
 omegaware_tools = odvicopy odvitype otangle
 omegaware_font_tools = ofm2opl opl2ofm ovf2ovp ovp2ovf
@@ -1616,7 +1798,7 @@ ff-config.h: stamp-h2
 	  $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \
 	else :; fi
 
-stamp-h2: $(top_srcdir)/luatexdir/luafontforge/ff-config.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/luatexdir/luafontloader/ff-config.in $(top_builddir)/config.status
 	@rm -f stamp-h2
 	cd $(top_builddir) && $(SHELL) ./config.status ff-config.h
 
@@ -1634,6 +1816,10 @@ libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES)
 	-rm -f libluamisc.a
 	$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD)
 	$(RANLIB) libluamisc.a
+libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) 
+	-rm -f libluasocket.a
+	$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD)
+	$(RANLIB) libluasocket.a
 libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) 
 	-rm -f libluatex.a
 	$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD)
@@ -1871,49 +2057,64 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftodvi.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftopk.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftype.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-ArabicForms.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-alphabet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-autohint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-backtrns.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-char.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-charview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-cjk.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-contextchain.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-clipnoui.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-cvundoes.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-dumppfa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-encoding.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-featurefile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-ffdummies.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-fontinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-fontview.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-fontviewbase.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-fsys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-fvcomposit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-fvfonts.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-gwwiconv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-kernclass.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-gwwintl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-lookups.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-luafflib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-macbinary.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-macenc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-mathconstants.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-memory.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-mm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-namelist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-noprefs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-nouiutil.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-parsepfa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-parsettf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-parsettfatt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-parsettfvar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-prefs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-psread.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-pua.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-python.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-sfd1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-splinechar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-splinefill.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-splinefont.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-splineorder2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-splineoverlap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-splinerefigure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-splinesave.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-splinesaveafm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-splinestroke.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-splineutil.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-splineutil2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-stamp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-start.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-stemdb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-tottf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-tottfaat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-tottfgpos.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-tottfvar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-ttfspecial.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-ucharmap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-unialt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-ustring.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libff_a-utype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-lapi.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-lauxlib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-lbaselib.Po@am__quote@
@@ -1944,19 +2145,39 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-lundump.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-lvm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-lzio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-clocks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-core_profiler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-function_meter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-lfs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-lgzip.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-lpeg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-lua50_profiler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-luazip.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-lzlib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-md5.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-md5lib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-slnudata.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-slnunico.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluamisc_a-stack.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-auxiliar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-buffer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-except.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-inet.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-io.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-lua_preload.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-luasocket.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-mime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-options.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-select.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-socket.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-tcp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-timeout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluasocket_a-udp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-avl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-avlstuff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-dofont.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-epdf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-filename.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-hnjalloc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-hyphen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-lcallbacklib.Po@am__quote@
@@ -1981,16 +2202,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-luatex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-luatoken.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-macnames.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-makecpool.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-managed-sa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-mapfile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-math.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-mathcodes.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-memio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-mlist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-mp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pagetree.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdfpage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdftoepdf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pkin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-postlinebreak.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-primitive.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-psout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-sfnt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-subfont.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-synctex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-texdeffont.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-texfont.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-texlang.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-texluac.Po@am__quote@
@@ -1998,6 +2228,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-texpdf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-textcodes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-textoken.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-tfmin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-tfmofm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-tounicode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-tt_glyf.Po@am__quote@
@@ -2151,607 +2382,817 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-libff_a-alphabet.o: luatexdir/luafontforge/fontforge/Unicode/alphabet.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-alphabet.o -MD -MP -MF $(DEPDIR)/libff_a-alphabet.Tpo -c -o libff_a-alphabet.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/alphabet.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/alphabet.c
+libff_a-ArabicForms.o: luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ArabicForms.o -MD -MP -MF $(DEPDIR)/libff_a-ArabicForms.Tpo -c -o libff_a-ArabicForms.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-ArabicForms.Tpo $(DEPDIR)/libff_a-ArabicForms.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c' object='libff_a-ArabicForms.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ArabicForms.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c
+
+libff_a-ArabicForms.obj: luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ArabicForms.obj -MD -MP -MF $(DEPDIR)/libff_a-ArabicForms.Tpo -c -o libff_a-ArabicForms.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-ArabicForms.Tpo $(DEPDIR)/libff_a-ArabicForms.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c' object='libff_a-ArabicForms.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ArabicForms.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c'; fi`
+
+libff_a-alphabet.o: luatexdir/luafontloader/fontforge/Unicode/alphabet.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-alphabet.o -MD -MP -MF $(DEPDIR)/libff_a-alphabet.Tpo -c -o libff_a-alphabet.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/alphabet.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/alphabet.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-alphabet.Tpo $(DEPDIR)/libff_a-alphabet.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/alphabet.c' object='libff_a-alphabet.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/alphabet.c' object='libff_a-alphabet.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-alphabet.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/alphabet.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/alphabet.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-alphabet.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/alphabet.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/alphabet.c
 
-libff_a-alphabet.obj: luatexdir/luafontforge/fontforge/Unicode/alphabet.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-alphabet.obj -MD -MP -MF $(DEPDIR)/libff_a-alphabet.Tpo -c -o libff_a-alphabet.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/alphabet.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/alphabet.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/alphabet.c'; fi`
+libff_a-alphabet.obj: luatexdir/luafontloader/fontforge/Unicode/alphabet.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-alphabet.obj -MD -MP -MF $(DEPDIR)/libff_a-alphabet.Tpo -c -o libff_a-alphabet.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/alphabet.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/alphabet.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/alphabet.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-alphabet.Tpo $(DEPDIR)/libff_a-alphabet.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/alphabet.c' object='libff_a-alphabet.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/alphabet.c' object='libff_a-alphabet.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-alphabet.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/alphabet.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/alphabet.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/alphabet.c'; fi`
+
+libff_a-backtrns.o: luatexdir/luafontloader/fontforge/Unicode/backtrns.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-backtrns.o -MD -MP -MF $(DEPDIR)/libff_a-backtrns.Tpo -c -o libff_a-backtrns.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/backtrns.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/backtrns.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-backtrns.Tpo $(DEPDIR)/libff_a-backtrns.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/backtrns.c' object='libff_a-backtrns.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-alphabet.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/alphabet.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/alphabet.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/alphabet.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-backtrns.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/backtrns.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/backtrns.c
 
-libff_a-char.o: luatexdir/luafontforge/fontforge/Unicode/char.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-char.o -MD -MP -MF $(DEPDIR)/libff_a-char.Tpo -c -o libff_a-char.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/char.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/char.c
+libff_a-backtrns.obj: luatexdir/luafontloader/fontforge/Unicode/backtrns.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-backtrns.obj -MD -MP -MF $(DEPDIR)/libff_a-backtrns.Tpo -c -o libff_a-backtrns.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/backtrns.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/backtrns.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/backtrns.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-backtrns.Tpo $(DEPDIR)/libff_a-backtrns.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/backtrns.c' object='libff_a-backtrns.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-backtrns.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/backtrns.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/backtrns.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/backtrns.c'; fi`
+
+libff_a-char.o: luatexdir/luafontloader/fontforge/Unicode/char.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-char.o -MD -MP -MF $(DEPDIR)/libff_a-char.Tpo -c -o libff_a-char.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/char.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/char.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-char.Tpo $(DEPDIR)/libff_a-char.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/char.c' object='libff_a-char.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/char.c' object='libff_a-char.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-char.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/char.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/char.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-char.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/char.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/char.c
 
-libff_a-char.obj: luatexdir/luafontforge/fontforge/Unicode/char.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-char.obj -MD -MP -MF $(DEPDIR)/libff_a-char.Tpo -c -o libff_a-char.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/char.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/char.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/char.c'; fi`
+libff_a-char.obj: luatexdir/luafontloader/fontforge/Unicode/char.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-char.obj -MD -MP -MF $(DEPDIR)/libff_a-char.Tpo -c -o libff_a-char.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/char.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/char.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/char.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-char.Tpo $(DEPDIR)/libff_a-char.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/char.c' object='libff_a-char.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/char.c' object='libff_a-char.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-char.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/char.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/char.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/char.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-char.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/char.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/char.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/char.c'; fi`
 
-libff_a-cjk.o: luatexdir/luafontforge/fontforge/Unicode/cjk.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-cjk.o -MD -MP -MF $(DEPDIR)/libff_a-cjk.Tpo -c -o libff_a-cjk.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/cjk.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/cjk.c
+libff_a-cjk.o: luatexdir/luafontloader/fontforge/Unicode/cjk.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-cjk.o -MD -MP -MF $(DEPDIR)/libff_a-cjk.Tpo -c -o libff_a-cjk.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/cjk.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/cjk.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-cjk.Tpo $(DEPDIR)/libff_a-cjk.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/cjk.c' object='libff_a-cjk.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/cjk.c' object='libff_a-cjk.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-cjk.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/cjk.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/cjk.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-cjk.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/cjk.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/cjk.c
 
-libff_a-cjk.obj: luatexdir/luafontforge/fontforge/Unicode/cjk.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-cjk.obj -MD -MP -MF $(DEPDIR)/libff_a-cjk.Tpo -c -o libff_a-cjk.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/cjk.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/cjk.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/cjk.c'; fi`
+libff_a-cjk.obj: luatexdir/luafontloader/fontforge/Unicode/cjk.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-cjk.obj -MD -MP -MF $(DEPDIR)/libff_a-cjk.Tpo -c -o libff_a-cjk.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/cjk.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/cjk.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/cjk.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-cjk.Tpo $(DEPDIR)/libff_a-cjk.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/cjk.c' object='libff_a-cjk.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/cjk.c' object='libff_a-cjk.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-cjk.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/cjk.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/cjk.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/cjk.c'; fi`
+
+libff_a-dump.o: luatexdir/luafontloader/fontforge/Unicode/dump.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-dump.o -MD -MP -MF $(DEPDIR)/libff_a-dump.Tpo -c -o libff_a-dump.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/dump.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/dump.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-dump.Tpo $(DEPDIR)/libff_a-dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/dump.c' object='libff_a-dump.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-cjk.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/cjk.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/cjk.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/cjk.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-dump.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/dump.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/dump.c
 
-libff_a-gwwiconv.o: luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-gwwiconv.o -MD -MP -MF $(DEPDIR)/libff_a-gwwiconv.Tpo -c -o libff_a-gwwiconv.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c
+libff_a-dump.obj: luatexdir/luafontloader/fontforge/Unicode/dump.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-dump.obj -MD -MP -MF $(DEPDIR)/libff_a-dump.Tpo -c -o libff_a-dump.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/dump.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/dump.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/dump.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-dump.Tpo $(DEPDIR)/libff_a-dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/dump.c' object='libff_a-dump.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-dump.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/dump.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/dump.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/dump.c'; fi`
+
+libff_a-gwwiconv.o: luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-gwwiconv.o -MD -MP -MF $(DEPDIR)/libff_a-gwwiconv.Tpo -c -o libff_a-gwwiconv.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-gwwiconv.Tpo $(DEPDIR)/libff_a-gwwiconv.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c' object='libff_a-gwwiconv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c' object='libff_a-gwwiconv.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-gwwiconv.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-gwwiconv.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c
 
-libff_a-gwwiconv.obj: luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-gwwiconv.obj -MD -MP -MF $(DEPDIR)/libff_a-gwwiconv.Tpo -c -o libff_a-gwwiconv.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c'; fi`
+libff_a-gwwiconv.obj: luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-gwwiconv.obj -MD -MP -MF $(DEPDIR)/libff_a-gwwiconv.Tpo -c -o libff_a-gwwiconv.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-gwwiconv.Tpo $(DEPDIR)/libff_a-gwwiconv.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c' object='libff_a-gwwiconv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c' object='libff_a-gwwiconv.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-gwwiconv.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/gwwiconv.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-gwwiconv.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c'; fi`
 
-libff_a-memory.o: luatexdir/luafontforge/fontforge/Unicode/memory.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-memory.o -MD -MP -MF $(DEPDIR)/libff_a-memory.Tpo -c -o libff_a-memory.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/memory.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/memory.c
+libff_a-memory.o: luatexdir/luafontloader/fontforge/Unicode/memory.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-memory.o -MD -MP -MF $(DEPDIR)/libff_a-memory.Tpo -c -o libff_a-memory.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/memory.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/memory.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-memory.Tpo $(DEPDIR)/libff_a-memory.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/memory.c' object='libff_a-memory.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/memory.c' object='libff_a-memory.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-memory.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/memory.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/memory.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-memory.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/memory.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/memory.c
 
-libff_a-memory.obj: luatexdir/luafontforge/fontforge/Unicode/memory.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-memory.obj -MD -MP -MF $(DEPDIR)/libff_a-memory.Tpo -c -o libff_a-memory.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/memory.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/memory.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/memory.c'; fi`
+libff_a-memory.obj: luatexdir/luafontloader/fontforge/Unicode/memory.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-memory.obj -MD -MP -MF $(DEPDIR)/libff_a-memory.Tpo -c -o libff_a-memory.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/memory.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/memory.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/memory.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-memory.Tpo $(DEPDIR)/libff_a-memory.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/memory.c' object='libff_a-memory.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/memory.c' object='libff_a-memory.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-memory.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/memory.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/memory.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/memory.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-memory.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/memory.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/memory.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/memory.c'; fi`
 
-libff_a-ustring.o: luatexdir/luafontforge/fontforge/Unicode/ustring.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ustring.o -MD -MP -MF $(DEPDIR)/libff_a-ustring.Tpo -c -o libff_a-ustring.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/ustring.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/ustring.c
+libff_a-ucharmap.o: luatexdir/luafontloader/fontforge/Unicode/ucharmap.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ucharmap.o -MD -MP -MF $(DEPDIR)/libff_a-ucharmap.Tpo -c -o libff_a-ucharmap.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/ucharmap.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/ucharmap.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-ucharmap.Tpo $(DEPDIR)/libff_a-ucharmap.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/ucharmap.c' object='libff_a-ucharmap.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ucharmap.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/ucharmap.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/ucharmap.c
+
+libff_a-ucharmap.obj: luatexdir/luafontloader/fontforge/Unicode/ucharmap.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ucharmap.obj -MD -MP -MF $(DEPDIR)/libff_a-ucharmap.Tpo -c -o libff_a-ucharmap.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/ucharmap.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/ucharmap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/ucharmap.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-ucharmap.Tpo $(DEPDIR)/libff_a-ucharmap.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/ucharmap.c' object='libff_a-ucharmap.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ucharmap.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/ucharmap.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/ucharmap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/ucharmap.c'; fi`
+
+libff_a-unialt.o: luatexdir/luafontloader/fontforge/Unicode/unialt.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-unialt.o -MD -MP -MF $(DEPDIR)/libff_a-unialt.Tpo -c -o libff_a-unialt.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/unialt.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/unialt.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-unialt.Tpo $(DEPDIR)/libff_a-unialt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/unialt.c' object='libff_a-unialt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-unialt.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/unialt.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/unialt.c
+
+libff_a-unialt.obj: luatexdir/luafontloader/fontforge/Unicode/unialt.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-unialt.obj -MD -MP -MF $(DEPDIR)/libff_a-unialt.Tpo -c -o libff_a-unialt.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/unialt.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/unialt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/unialt.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-unialt.Tpo $(DEPDIR)/libff_a-unialt.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/unialt.c' object='libff_a-unialt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-unialt.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/unialt.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/unialt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/unialt.c'; fi`
+
+libff_a-ustring.o: luatexdir/luafontloader/fontforge/Unicode/ustring.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ustring.o -MD -MP -MF $(DEPDIR)/libff_a-ustring.Tpo -c -o libff_a-ustring.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/ustring.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/ustring.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-ustring.Tpo $(DEPDIR)/libff_a-ustring.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/ustring.c' object='libff_a-ustring.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/ustring.c' object='libff_a-ustring.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ustring.o `test -f 'luatexdir/luafontforge/fontforge/Unicode/ustring.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/Unicode/ustring.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ustring.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/ustring.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/ustring.c
 
-libff_a-ustring.obj: luatexdir/luafontforge/fontforge/Unicode/ustring.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ustring.obj -MD -MP -MF $(DEPDIR)/libff_a-ustring.Tpo -c -o libff_a-ustring.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/ustring.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/ustring.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/ustring.c'; fi`
+libff_a-ustring.obj: luatexdir/luafontloader/fontforge/Unicode/ustring.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ustring.obj -MD -MP -MF $(DEPDIR)/libff_a-ustring.Tpo -c -o libff_a-ustring.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/ustring.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/ustring.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/ustring.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-ustring.Tpo $(DEPDIR)/libff_a-ustring.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/Unicode/ustring.c' object='libff_a-ustring.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/ustring.c' object='libff_a-ustring.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ustring.obj `if test -f 'luatexdir/luafontforge/fontforge/Unicode/ustring.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/Unicode/ustring.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/Unicode/ustring.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ustring.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/ustring.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/ustring.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/ustring.c'; fi`
 
-libff_a-autohint.o: luatexdir/luafontforge/fontforge/fontforge/autohint.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-autohint.o -MD -MP -MF $(DEPDIR)/libff_a-autohint.Tpo -c -o libff_a-autohint.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/autohint.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/autohint.c
+libff_a-utype.o: luatexdir/luafontloader/fontforge/Unicode/utype.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-utype.o -MD -MP -MF $(DEPDIR)/libff_a-utype.Tpo -c -o libff_a-utype.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/utype.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/utype.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-utype.Tpo $(DEPDIR)/libff_a-utype.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/utype.c' object='libff_a-utype.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-utype.o `test -f 'luatexdir/luafontloader/fontforge/Unicode/utype.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/Unicode/utype.c
+
+libff_a-utype.obj: luatexdir/luafontloader/fontforge/Unicode/utype.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-utype.obj -MD -MP -MF $(DEPDIR)/libff_a-utype.Tpo -c -o libff_a-utype.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/utype.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/utype.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/utype.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-utype.Tpo $(DEPDIR)/libff_a-utype.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/Unicode/utype.c' object='libff_a-utype.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-utype.obj `if test -f 'luatexdir/luafontloader/fontforge/Unicode/utype.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/Unicode/utype.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/Unicode/utype.c'; fi`
+
+libff_a-autohint.o: luatexdir/luafontloader/fontforge/fontforge/autohint.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-autohint.o -MD -MP -MF $(DEPDIR)/libff_a-autohint.Tpo -c -o libff_a-autohint.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/autohint.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/autohint.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-autohint.Tpo $(DEPDIR)/libff_a-autohint.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/autohint.c' object='libff_a-autohint.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/autohint.c' object='libff_a-autohint.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-autohint.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/autohint.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/autohint.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-autohint.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/autohint.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/autohint.c
 
-libff_a-autohint.obj: luatexdir/luafontforge/fontforge/fontforge/autohint.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-autohint.obj -MD -MP -MF $(DEPDIR)/libff_a-autohint.Tpo -c -o libff_a-autohint.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/autohint.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/autohint.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/autohint.c'; fi`
+libff_a-autohint.obj: luatexdir/luafontloader/fontforge/fontforge/autohint.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-autohint.obj -MD -MP -MF $(DEPDIR)/libff_a-autohint.Tpo -c -o libff_a-autohint.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/autohint.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/autohint.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/autohint.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-autohint.Tpo $(DEPDIR)/libff_a-autohint.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/autohint.c' object='libff_a-autohint.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/autohint.c' object='libff_a-autohint.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-autohint.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/autohint.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/autohint.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/autohint.c'; fi`
+
+libff_a-clipnoui.o: luatexdir/luafontloader/fontforge/fontforge/clipnoui.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-clipnoui.o -MD -MP -MF $(DEPDIR)/libff_a-clipnoui.Tpo -c -o libff_a-clipnoui.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/clipnoui.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/clipnoui.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-clipnoui.Tpo $(DEPDIR)/libff_a-clipnoui.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/clipnoui.c' object='libff_a-clipnoui.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-clipnoui.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/clipnoui.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/clipnoui.c
+
+libff_a-clipnoui.obj: luatexdir/luafontloader/fontforge/fontforge/clipnoui.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-clipnoui.obj -MD -MP -MF $(DEPDIR)/libff_a-clipnoui.Tpo -c -o libff_a-clipnoui.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/clipnoui.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/clipnoui.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/clipnoui.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-clipnoui.Tpo $(DEPDIR)/libff_a-clipnoui.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/clipnoui.c' object='libff_a-clipnoui.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-autohint.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/autohint.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/autohint.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/autohint.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-clipnoui.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/clipnoui.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/clipnoui.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/clipnoui.c'; fi`
 
-libff_a-charview.o: luatexdir/luafontforge/fontforge/fontforge/charview.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-charview.o -MD -MP -MF $(DEPDIR)/libff_a-charview.Tpo -c -o libff_a-charview.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/charview.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/charview.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-charview.Tpo $(DEPDIR)/libff_a-charview.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/charview.c' object='libff_a-charview.o' libtool=no @AMDEPBACKSLASH@
+libff_a-cvundoes.o: luatexdir/luafontloader/fontforge/fontforge/cvundoes.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-cvundoes.o -MD -MP -MF $(DEPDIR)/libff_a-cvundoes.Tpo -c -o libff_a-cvundoes.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/cvundoes.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/cvundoes.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-cvundoes.Tpo $(DEPDIR)/libff_a-cvundoes.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/cvundoes.c' object='libff_a-cvundoes.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-charview.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/charview.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/charview.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-cvundoes.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/cvundoes.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/cvundoes.c
 
-libff_a-charview.obj: luatexdir/luafontforge/fontforge/fontforge/charview.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-charview.obj -MD -MP -MF $(DEPDIR)/libff_a-charview.Tpo -c -o libff_a-charview.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/charview.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/charview.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/charview.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-charview.Tpo $(DEPDIR)/libff_a-charview.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/charview.c' object='libff_a-charview.obj' libtool=no @AMDEPBACKSLASH@
+libff_a-cvundoes.obj: luatexdir/luafontloader/fontforge/fontforge/cvundoes.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-cvundoes.obj -MD -MP -MF $(DEPDIR)/libff_a-cvundoes.Tpo -c -o libff_a-cvundoes.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/cvundoes.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/cvundoes.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/cvundoes.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-cvundoes.Tpo $(DEPDIR)/libff_a-cvundoes.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/cvundoes.c' object='libff_a-cvundoes.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-charview.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/charview.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/charview.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/charview.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-cvundoes.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/cvundoes.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/cvundoes.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/cvundoes.c'; fi`
 
-libff_a-contextchain.o: luatexdir/luafontforge/fontforge/fontforge/contextchain.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-contextchain.o -MD -MP -MF $(DEPDIR)/libff_a-contextchain.Tpo -c -o libff_a-contextchain.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/contextchain.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/contextchain.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-contextchain.Tpo $(DEPDIR)/libff_a-contextchain.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/contextchain.c' object='libff_a-contextchain.o' libtool=no @AMDEPBACKSLASH@
+libff_a-dumppfa.o: luatexdir/luafontloader/fontforge/fontforge/dumppfa.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-dumppfa.o -MD -MP -MF $(DEPDIR)/libff_a-dumppfa.Tpo -c -o libff_a-dumppfa.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/dumppfa.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/dumppfa.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-dumppfa.Tpo $(DEPDIR)/libff_a-dumppfa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/dumppfa.c' object='libff_a-dumppfa.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-contextchain.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/contextchain.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/contextchain.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-dumppfa.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/dumppfa.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/dumppfa.c
 
-libff_a-contextchain.obj: luatexdir/luafontforge/fontforge/fontforge/contextchain.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-contextchain.obj -MD -MP -MF $(DEPDIR)/libff_a-contextchain.Tpo -c -o libff_a-contextchain.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/contextchain.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/contextchain.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/contextchain.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-contextchain.Tpo $(DEPDIR)/libff_a-contextchain.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/contextchain.c' object='libff_a-contextchain.obj' libtool=no @AMDEPBACKSLASH@
+libff_a-dumppfa.obj: luatexdir/luafontloader/fontforge/fontforge/dumppfa.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-dumppfa.obj -MD -MP -MF $(DEPDIR)/libff_a-dumppfa.Tpo -c -o libff_a-dumppfa.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/dumppfa.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/dumppfa.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/dumppfa.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-dumppfa.Tpo $(DEPDIR)/libff_a-dumppfa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/dumppfa.c' object='libff_a-dumppfa.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-contextchain.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/contextchain.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/contextchain.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/contextchain.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-dumppfa.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/dumppfa.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/dumppfa.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/dumppfa.c'; fi`
 
-libff_a-encoding.o: luatexdir/luafontforge/fontforge/fontforge/encoding.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-encoding.o -MD -MP -MF $(DEPDIR)/libff_a-encoding.Tpo -c -o libff_a-encoding.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/encoding.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/encoding.c
+libff_a-encoding.o: luatexdir/luafontloader/fontforge/fontforge/encoding.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-encoding.o -MD -MP -MF $(DEPDIR)/libff_a-encoding.Tpo -c -o libff_a-encoding.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/encoding.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/encoding.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-encoding.Tpo $(DEPDIR)/libff_a-encoding.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/encoding.c' object='libff_a-encoding.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/encoding.c' object='libff_a-encoding.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-encoding.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/encoding.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/encoding.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-encoding.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/encoding.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/encoding.c
 
-libff_a-encoding.obj: luatexdir/luafontforge/fontforge/fontforge/encoding.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-encoding.obj -MD -MP -MF $(DEPDIR)/libff_a-encoding.Tpo -c -o libff_a-encoding.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/encoding.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/encoding.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/encoding.c'; fi`
+libff_a-encoding.obj: luatexdir/luafontloader/fontforge/fontforge/encoding.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-encoding.obj -MD -MP -MF $(DEPDIR)/libff_a-encoding.Tpo -c -o libff_a-encoding.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/encoding.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/encoding.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/encoding.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-encoding.Tpo $(DEPDIR)/libff_a-encoding.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/encoding.c' object='libff_a-encoding.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/encoding.c' object='libff_a-encoding.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-encoding.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/encoding.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/encoding.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/encoding.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-encoding.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/encoding.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/encoding.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/encoding.c'; fi`
 
-libff_a-featurefile.o: luatexdir/luafontforge/fontforge/fontforge/featurefile.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-featurefile.o -MD -MP -MF $(DEPDIR)/libff_a-featurefile.Tpo -c -o libff_a-featurefile.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/featurefile.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/featurefile.c
+libff_a-featurefile.o: luatexdir/luafontloader/fontforge/fontforge/featurefile.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-featurefile.o -MD -MP -MF $(DEPDIR)/libff_a-featurefile.Tpo -c -o libff_a-featurefile.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/featurefile.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/featurefile.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-featurefile.Tpo $(DEPDIR)/libff_a-featurefile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/featurefile.c' object='libff_a-featurefile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/featurefile.c' object='libff_a-featurefile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-featurefile.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/featurefile.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/featurefile.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-featurefile.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/featurefile.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/featurefile.c
 
-libff_a-featurefile.obj: luatexdir/luafontforge/fontforge/fontforge/featurefile.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-featurefile.obj -MD -MP -MF $(DEPDIR)/libff_a-featurefile.Tpo -c -o libff_a-featurefile.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/featurefile.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/featurefile.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/featurefile.c'; fi`
+libff_a-featurefile.obj: luatexdir/luafontloader/fontforge/fontforge/featurefile.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-featurefile.obj -MD -MP -MF $(DEPDIR)/libff_a-featurefile.Tpo -c -o libff_a-featurefile.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/featurefile.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/featurefile.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/featurefile.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-featurefile.Tpo $(DEPDIR)/libff_a-featurefile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/featurefile.c' object='libff_a-featurefile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/featurefile.c' object='libff_a-featurefile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-featurefile.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/featurefile.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/featurefile.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/featurefile.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-featurefile.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/featurefile.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/featurefile.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/featurefile.c'; fi`
 
-libff_a-fontinfo.o: luatexdir/luafontforge/fontforge/fontforge/fontinfo.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fontinfo.o -MD -MP -MF $(DEPDIR)/libff_a-fontinfo.Tpo -c -o libff_a-fontinfo.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/fontinfo.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/fontinfo.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fontinfo.Tpo $(DEPDIR)/libff_a-fontinfo.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/fontinfo.c' object='libff_a-fontinfo.o' libtool=no @AMDEPBACKSLASH@
+libff_a-fontviewbase.o: luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fontviewbase.o -MD -MP -MF $(DEPDIR)/libff_a-fontviewbase.Tpo -c -o libff_a-fontviewbase.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fontviewbase.Tpo $(DEPDIR)/libff_a-fontviewbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c' object='libff_a-fontviewbase.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fontinfo.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/fontinfo.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/fontinfo.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fontviewbase.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c
 
-libff_a-fontinfo.obj: luatexdir/luafontforge/fontforge/fontforge/fontinfo.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fontinfo.obj -MD -MP -MF $(DEPDIR)/libff_a-fontinfo.Tpo -c -o libff_a-fontinfo.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/fontinfo.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/fontinfo.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/fontinfo.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fontinfo.Tpo $(DEPDIR)/libff_a-fontinfo.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/fontinfo.c' object='libff_a-fontinfo.obj' libtool=no @AMDEPBACKSLASH@
+libff_a-fontviewbase.obj: luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fontviewbase.obj -MD -MP -MF $(DEPDIR)/libff_a-fontviewbase.Tpo -c -o libff_a-fontviewbase.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fontviewbase.Tpo $(DEPDIR)/libff_a-fontviewbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c' object='libff_a-fontviewbase.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fontinfo.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/fontinfo.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/fontinfo.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/fontinfo.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fontviewbase.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c'; fi`
 
-libff_a-fontview.o: luatexdir/luafontforge/fontforge/fontforge/fontview.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fontview.o -MD -MP -MF $(DEPDIR)/libff_a-fontview.Tpo -c -o libff_a-fontview.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/fontview.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/fontview.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fontview.Tpo $(DEPDIR)/libff_a-fontview.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/fontview.c' object='libff_a-fontview.o' libtool=no @AMDEPBACKSLASH@
+libff_a-fvcomposit.o: luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fvcomposit.o -MD -MP -MF $(DEPDIR)/libff_a-fvcomposit.Tpo -c -o libff_a-fvcomposit.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fvcomposit.Tpo $(DEPDIR)/libff_a-fvcomposit.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c' object='libff_a-fvcomposit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fontview.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/fontview.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/fontview.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fvcomposit.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c
 
-libff_a-fontview.obj: luatexdir/luafontforge/fontforge/fontforge/fontview.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fontview.obj -MD -MP -MF $(DEPDIR)/libff_a-fontview.Tpo -c -o libff_a-fontview.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/fontview.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/fontview.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/fontview.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fontview.Tpo $(DEPDIR)/libff_a-fontview.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/fontview.c' object='libff_a-fontview.obj' libtool=no @AMDEPBACKSLASH@
+libff_a-fvcomposit.obj: luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fvcomposit.obj -MD -MP -MF $(DEPDIR)/libff_a-fvcomposit.Tpo -c -o libff_a-fvcomposit.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fvcomposit.Tpo $(DEPDIR)/libff_a-fvcomposit.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c' object='libff_a-fvcomposit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fontview.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/fontview.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/fontview.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/fontview.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fvcomposit.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c'; fi`
 
-libff_a-fvfonts.o: luatexdir/luafontforge/fontforge/fontforge/fvfonts.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fvfonts.o -MD -MP -MF $(DEPDIR)/libff_a-fvfonts.Tpo -c -o libff_a-fvfonts.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/fvfonts.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/fvfonts.c
+libff_a-fvfonts.o: luatexdir/luafontloader/fontforge/fontforge/fvfonts.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fvfonts.o -MD -MP -MF $(DEPDIR)/libff_a-fvfonts.Tpo -c -o libff_a-fvfonts.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/fvfonts.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/fvfonts.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fvfonts.Tpo $(DEPDIR)/libff_a-fvfonts.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/fvfonts.c' object='libff_a-fvfonts.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/fvfonts.c' object='libff_a-fvfonts.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fvfonts.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/fvfonts.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/fvfonts.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fvfonts.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/fvfonts.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/fvfonts.c
 
-libff_a-fvfonts.obj: luatexdir/luafontforge/fontforge/fontforge/fvfonts.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fvfonts.obj -MD -MP -MF $(DEPDIR)/libff_a-fvfonts.Tpo -c -o libff_a-fvfonts.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/fvfonts.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/fvfonts.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/fvfonts.c'; fi`
+libff_a-fvfonts.obj: luatexdir/luafontloader/fontforge/fontforge/fvfonts.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fvfonts.obj -MD -MP -MF $(DEPDIR)/libff_a-fvfonts.Tpo -c -o libff_a-fvfonts.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/fvfonts.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/fvfonts.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/fvfonts.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fvfonts.Tpo $(DEPDIR)/libff_a-fvfonts.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/fvfonts.c' object='libff_a-fvfonts.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fvfonts.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/fvfonts.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/fvfonts.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/fvfonts.c'; fi`
-
-libff_a-kernclass.o: luatexdir/luafontforge/fontforge/fontforge/kernclass.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-kernclass.o -MD -MP -MF $(DEPDIR)/libff_a-kernclass.Tpo -c -o libff_a-kernclass.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/kernclass.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/kernclass.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-kernclass.Tpo $(DEPDIR)/libff_a-kernclass.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/kernclass.c' object='libff_a-kernclass.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-kernclass.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/kernclass.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/kernclass.c
-
-libff_a-kernclass.obj: luatexdir/luafontforge/fontforge/fontforge/kernclass.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-kernclass.obj -MD -MP -MF $(DEPDIR)/libff_a-kernclass.Tpo -c -o libff_a-kernclass.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/kernclass.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/kernclass.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/kernclass.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-kernclass.Tpo $(DEPDIR)/libff_a-kernclass.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/kernclass.c' object='libff_a-kernclass.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/fvfonts.c' object='libff_a-fvfonts.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-kernclass.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/kernclass.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/kernclass.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/kernclass.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fvfonts.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/fvfonts.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/fvfonts.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/fvfonts.c'; fi`
 
-libff_a-lookups.o: luatexdir/luafontforge/fontforge/fontforge/lookups.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-lookups.o -MD -MP -MF $(DEPDIR)/libff_a-lookups.Tpo -c -o libff_a-lookups.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/lookups.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/lookups.c
+libff_a-lookups.o: luatexdir/luafontloader/fontforge/fontforge/lookups.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-lookups.o -MD -MP -MF $(DEPDIR)/libff_a-lookups.Tpo -c -o libff_a-lookups.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/lookups.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/lookups.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-lookups.Tpo $(DEPDIR)/libff_a-lookups.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/lookups.c' object='libff_a-lookups.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/lookups.c' object='libff_a-lookups.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-lookups.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/lookups.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/lookups.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-lookups.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/lookups.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/lookups.c
 
-libff_a-lookups.obj: luatexdir/luafontforge/fontforge/fontforge/lookups.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-lookups.obj -MD -MP -MF $(DEPDIR)/libff_a-lookups.Tpo -c -o libff_a-lookups.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/lookups.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/lookups.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/lookups.c'; fi`
+libff_a-lookups.obj: luatexdir/luafontloader/fontforge/fontforge/lookups.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-lookups.obj -MD -MP -MF $(DEPDIR)/libff_a-lookups.Tpo -c -o libff_a-lookups.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/lookups.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/lookups.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/lookups.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-lookups.Tpo $(DEPDIR)/libff_a-lookups.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/lookups.c' object='libff_a-lookups.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/lookups.c' object='libff_a-lookups.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-lookups.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/lookups.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/lookups.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/lookups.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-lookups.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/lookups.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/lookups.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/lookups.c'; fi`
 
-libff_a-macbinary.o: luatexdir/luafontforge/fontforge/fontforge/macbinary.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-macbinary.o -MD -MP -MF $(DEPDIR)/libff_a-macbinary.Tpo -c -o libff_a-macbinary.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/macbinary.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/macbinary.c
+libff_a-macbinary.o: luatexdir/luafontloader/fontforge/fontforge/macbinary.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-macbinary.o -MD -MP -MF $(DEPDIR)/libff_a-macbinary.Tpo -c -o libff_a-macbinary.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/macbinary.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/macbinary.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-macbinary.Tpo $(DEPDIR)/libff_a-macbinary.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/macbinary.c' object='libff_a-macbinary.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/macbinary.c' object='libff_a-macbinary.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-macbinary.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/macbinary.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/macbinary.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-macbinary.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/macbinary.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/macbinary.c
 
-libff_a-macbinary.obj: luatexdir/luafontforge/fontforge/fontforge/macbinary.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-macbinary.obj -MD -MP -MF $(DEPDIR)/libff_a-macbinary.Tpo -c -o libff_a-macbinary.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/macbinary.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/macbinary.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/macbinary.c'; fi`
+libff_a-macbinary.obj: luatexdir/luafontloader/fontforge/fontforge/macbinary.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-macbinary.obj -MD -MP -MF $(DEPDIR)/libff_a-macbinary.Tpo -c -o libff_a-macbinary.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/macbinary.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/macbinary.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/macbinary.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-macbinary.Tpo $(DEPDIR)/libff_a-macbinary.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/macbinary.c' object='libff_a-macbinary.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/macbinary.c' object='libff_a-macbinary.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-macbinary.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/macbinary.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/macbinary.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/macbinary.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-macbinary.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/macbinary.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/macbinary.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/macbinary.c'; fi`
 
-libff_a-macenc.o: luatexdir/luafontforge/fontforge/fontforge/macenc.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-macenc.o -MD -MP -MF $(DEPDIR)/libff_a-macenc.Tpo -c -o libff_a-macenc.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/macenc.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/macenc.c
+libff_a-macenc.o: luatexdir/luafontloader/fontforge/fontforge/macenc.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-macenc.o -MD -MP -MF $(DEPDIR)/libff_a-macenc.Tpo -c -o libff_a-macenc.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/macenc.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/macenc.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-macenc.Tpo $(DEPDIR)/libff_a-macenc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/macenc.c' object='libff_a-macenc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/macenc.c' object='libff_a-macenc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-macenc.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/macenc.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/macenc.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-macenc.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/macenc.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/macenc.c
 
-libff_a-macenc.obj: luatexdir/luafontforge/fontforge/fontforge/macenc.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-macenc.obj -MD -MP -MF $(DEPDIR)/libff_a-macenc.Tpo -c -o libff_a-macenc.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/macenc.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/macenc.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/macenc.c'; fi`
+libff_a-macenc.obj: luatexdir/luafontloader/fontforge/fontforge/macenc.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-macenc.obj -MD -MP -MF $(DEPDIR)/libff_a-macenc.Tpo -c -o libff_a-macenc.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/macenc.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/macenc.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/macenc.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-macenc.Tpo $(DEPDIR)/libff_a-macenc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/macenc.c' object='libff_a-macenc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/macenc.c' object='libff_a-macenc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-macenc.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/macenc.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/macenc.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/macenc.c'; fi`
+
+libff_a-mathconstants.o: luatexdir/luafontloader/fontforge/fontforge/mathconstants.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-mathconstants.o -MD -MP -MF $(DEPDIR)/libff_a-mathconstants.Tpo -c -o libff_a-mathconstants.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/mathconstants.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/mathconstants.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-mathconstants.Tpo $(DEPDIR)/libff_a-mathconstants.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/mathconstants.c' object='libff_a-mathconstants.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-macenc.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/macenc.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/macenc.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/macenc.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-mathconstants.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/mathconstants.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/mathconstants.c
 
-libff_a-namelist.o: luatexdir/luafontforge/fontforge/fontforge/namelist.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-namelist.o -MD -MP -MF $(DEPDIR)/libff_a-namelist.Tpo -c -o libff_a-namelist.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/namelist.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/namelist.c
+libff_a-mathconstants.obj: luatexdir/luafontloader/fontforge/fontforge/mathconstants.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-mathconstants.obj -MD -MP -MF $(DEPDIR)/libff_a-mathconstants.Tpo -c -o libff_a-mathconstants.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/mathconstants.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/mathconstants.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/mathconstants.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-mathconstants.Tpo $(DEPDIR)/libff_a-mathconstants.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/mathconstants.c' object='libff_a-mathconstants.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-mathconstants.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/mathconstants.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/mathconstants.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/mathconstants.c'; fi`
+
+libff_a-mm.o: luatexdir/luafontloader/fontforge/fontforge/mm.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-mm.o -MD -MP -MF $(DEPDIR)/libff_a-mm.Tpo -c -o libff_a-mm.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/mm.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/mm.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-mm.Tpo $(DEPDIR)/libff_a-mm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/mm.c' object='libff_a-mm.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-mm.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/mm.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/mm.c
+
+libff_a-mm.obj: luatexdir/luafontloader/fontforge/fontforge/mm.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-mm.obj -MD -MP -MF $(DEPDIR)/libff_a-mm.Tpo -c -o libff_a-mm.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/mm.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/mm.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/mm.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-mm.Tpo $(DEPDIR)/libff_a-mm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/mm.c' object='libff_a-mm.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-mm.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/mm.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/mm.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/mm.c'; fi`
+
+libff_a-namelist.o: luatexdir/luafontloader/fontforge/fontforge/namelist.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-namelist.o -MD -MP -MF $(DEPDIR)/libff_a-namelist.Tpo -c -o libff_a-namelist.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/namelist.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/namelist.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-namelist.Tpo $(DEPDIR)/libff_a-namelist.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/namelist.c' object='libff_a-namelist.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/namelist.c' object='libff_a-namelist.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-namelist.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/namelist.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/namelist.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-namelist.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/namelist.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/namelist.c
 
-libff_a-namelist.obj: luatexdir/luafontforge/fontforge/fontforge/namelist.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-namelist.obj -MD -MP -MF $(DEPDIR)/libff_a-namelist.Tpo -c -o libff_a-namelist.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/namelist.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/namelist.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/namelist.c'; fi`
+libff_a-namelist.obj: luatexdir/luafontloader/fontforge/fontforge/namelist.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-namelist.obj -MD -MP -MF $(DEPDIR)/libff_a-namelist.Tpo -c -o libff_a-namelist.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/namelist.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/namelist.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/namelist.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-namelist.Tpo $(DEPDIR)/libff_a-namelist.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/namelist.c' object='libff_a-namelist.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/namelist.c' object='libff_a-namelist.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-namelist.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/namelist.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/namelist.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/namelist.c'; fi`
+
+libff_a-noprefs.o: luatexdir/luafontloader/fontforge/fontforge/noprefs.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-noprefs.o -MD -MP -MF $(DEPDIR)/libff_a-noprefs.Tpo -c -o libff_a-noprefs.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/noprefs.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/noprefs.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-noprefs.Tpo $(DEPDIR)/libff_a-noprefs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/noprefs.c' object='libff_a-noprefs.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-namelist.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/namelist.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/namelist.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/namelist.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-noprefs.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/noprefs.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/noprefs.c
 
-libff_a-parsepfa.o: luatexdir/luafontforge/fontforge/fontforge/parsepfa.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsepfa.o -MD -MP -MF $(DEPDIR)/libff_a-parsepfa.Tpo -c -o libff_a-parsepfa.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/parsepfa.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/parsepfa.c
+libff_a-noprefs.obj: luatexdir/luafontloader/fontforge/fontforge/noprefs.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-noprefs.obj -MD -MP -MF $(DEPDIR)/libff_a-noprefs.Tpo -c -o libff_a-noprefs.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/noprefs.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/noprefs.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/noprefs.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-noprefs.Tpo $(DEPDIR)/libff_a-noprefs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/noprefs.c' object='libff_a-noprefs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-noprefs.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/noprefs.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/noprefs.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/noprefs.c'; fi`
+
+libff_a-nouiutil.o: luatexdir/luafontloader/fontforge/fontforge/nouiutil.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-nouiutil.o -MD -MP -MF $(DEPDIR)/libff_a-nouiutil.Tpo -c -o libff_a-nouiutil.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/nouiutil.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/nouiutil.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-nouiutil.Tpo $(DEPDIR)/libff_a-nouiutil.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/nouiutil.c' object='libff_a-nouiutil.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-nouiutil.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/nouiutil.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/nouiutil.c
+
+libff_a-nouiutil.obj: luatexdir/luafontloader/fontforge/fontforge/nouiutil.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-nouiutil.obj -MD -MP -MF $(DEPDIR)/libff_a-nouiutil.Tpo -c -o libff_a-nouiutil.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/nouiutil.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/nouiutil.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/nouiutil.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-nouiutil.Tpo $(DEPDIR)/libff_a-nouiutil.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/nouiutil.c' object='libff_a-nouiutil.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-nouiutil.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/nouiutil.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/nouiutil.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/nouiutil.c'; fi`
+
+libff_a-parsepfa.o: luatexdir/luafontloader/fontforge/fontforge/parsepfa.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsepfa.o -MD -MP -MF $(DEPDIR)/libff_a-parsepfa.Tpo -c -o libff_a-parsepfa.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/parsepfa.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/parsepfa.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-parsepfa.Tpo $(DEPDIR)/libff_a-parsepfa.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/parsepfa.c' object='libff_a-parsepfa.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/parsepfa.c' object='libff_a-parsepfa.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsepfa.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/parsepfa.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/parsepfa.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsepfa.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/parsepfa.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/parsepfa.c
 
-libff_a-parsepfa.obj: luatexdir/luafontforge/fontforge/fontforge/parsepfa.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsepfa.obj -MD -MP -MF $(DEPDIR)/libff_a-parsepfa.Tpo -c -o libff_a-parsepfa.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/parsepfa.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/parsepfa.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/parsepfa.c'; fi`
+libff_a-parsepfa.obj: luatexdir/luafontloader/fontforge/fontforge/parsepfa.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsepfa.obj -MD -MP -MF $(DEPDIR)/libff_a-parsepfa.Tpo -c -o libff_a-parsepfa.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/parsepfa.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/parsepfa.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/parsepfa.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-parsepfa.Tpo $(DEPDIR)/libff_a-parsepfa.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/parsepfa.c' object='libff_a-parsepfa.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/parsepfa.c' object='libff_a-parsepfa.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsepfa.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/parsepfa.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/parsepfa.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/parsepfa.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsepfa.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/parsepfa.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/parsepfa.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/parsepfa.c'; fi`
 
-libff_a-parsettf.o: luatexdir/luafontforge/fontforge/fontforge/parsettf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettf.o -MD -MP -MF $(DEPDIR)/libff_a-parsettf.Tpo -c -o libff_a-parsettf.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettf.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/parsettf.c
+libff_a-parsettf.o: luatexdir/luafontloader/fontforge/fontforge/parsettf.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettf.o -MD -MP -MF $(DEPDIR)/libff_a-parsettf.Tpo -c -o libff_a-parsettf.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettf.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/parsettf.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-parsettf.Tpo $(DEPDIR)/libff_a-parsettf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/parsettf.c' object='libff_a-parsettf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/parsettf.c' object='libff_a-parsettf.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettf.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettf.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/parsettf.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettf.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettf.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/parsettf.c
 
-libff_a-parsettf.obj: luatexdir/luafontforge/fontforge/fontforge/parsettf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettf.obj -MD -MP -MF $(DEPDIR)/libff_a-parsettf.Tpo -c -o libff_a-parsettf.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettf.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/parsettf.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/parsettf.c'; fi`
+libff_a-parsettf.obj: luatexdir/luafontloader/fontforge/fontforge/parsettf.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettf.obj -MD -MP -MF $(DEPDIR)/libff_a-parsettf.Tpo -c -o libff_a-parsettf.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettf.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/parsettf.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/parsettf.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-parsettf.Tpo $(DEPDIR)/libff_a-parsettf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/parsettf.c' object='libff_a-parsettf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/parsettf.c' object='libff_a-parsettf.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettf.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettf.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/parsettf.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/parsettf.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettf.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettf.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/parsettf.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/parsettf.c'; fi`
 
-libff_a-parsettfatt.o: luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettfatt.o -MD -MP -MF $(DEPDIR)/libff_a-parsettfatt.Tpo -c -o libff_a-parsettfatt.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c
+libff_a-parsettfatt.o: luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettfatt.o -MD -MP -MF $(DEPDIR)/libff_a-parsettfatt.Tpo -c -o libff_a-parsettfatt.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-parsettfatt.Tpo $(DEPDIR)/libff_a-parsettfatt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c' object='libff_a-parsettfatt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c' object='libff_a-parsettfatt.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettfatt.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettfatt.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c
 
-libff_a-parsettfatt.obj: luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettfatt.obj -MD -MP -MF $(DEPDIR)/libff_a-parsettfatt.Tpo -c -o libff_a-parsettfatt.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c'; fi`
+libff_a-parsettfatt.obj: luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettfatt.obj -MD -MP -MF $(DEPDIR)/libff_a-parsettfatt.Tpo -c -o libff_a-parsettfatt.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-parsettfatt.Tpo $(DEPDIR)/libff_a-parsettfatt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c' object='libff_a-parsettfatt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c' object='libff_a-parsettfatt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettfatt.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/parsettfatt.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettfatt.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c'; fi`
 
-libff_a-parsettfvar.o: luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettfvar.o -MD -MP -MF $(DEPDIR)/libff_a-parsettfvar.Tpo -c -o libff_a-parsettfvar.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c
+libff_a-parsettfvar.o: luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettfvar.o -MD -MP -MF $(DEPDIR)/libff_a-parsettfvar.Tpo -c -o libff_a-parsettfvar.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-parsettfvar.Tpo $(DEPDIR)/libff_a-parsettfvar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c' object='libff_a-parsettfvar.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c' object='libff_a-parsettfvar.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettfvar.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettfvar.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c
 
-libff_a-parsettfvar.obj: luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettfvar.obj -MD -MP -MF $(DEPDIR)/libff_a-parsettfvar.Tpo -c -o libff_a-parsettfvar.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c'; fi`
+libff_a-parsettfvar.obj: luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-parsettfvar.obj -MD -MP -MF $(DEPDIR)/libff_a-parsettfvar.Tpo -c -o libff_a-parsettfvar.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-parsettfvar.Tpo $(DEPDIR)/libff_a-parsettfvar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c' object='libff_a-parsettfvar.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettfvar.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/parsettfvar.c'; fi`
-
-libff_a-prefs.o: luatexdir/luafontforge/fontforge/fontforge/prefs.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-prefs.o -MD -MP -MF $(DEPDIR)/libff_a-prefs.Tpo -c -o libff_a-prefs.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/prefs.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/prefs.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-prefs.Tpo $(DEPDIR)/libff_a-prefs.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/prefs.c' object='libff_a-prefs.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-prefs.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/prefs.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/prefs.c
-
-libff_a-prefs.obj: luatexdir/luafontforge/fontforge/fontforge/prefs.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-prefs.obj -MD -MP -MF $(DEPDIR)/libff_a-prefs.Tpo -c -o libff_a-prefs.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/prefs.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/prefs.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/prefs.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-prefs.Tpo $(DEPDIR)/libff_a-prefs.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/prefs.c' object='libff_a-prefs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c' object='libff_a-parsettfvar.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-prefs.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/prefs.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/prefs.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/prefs.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-parsettfvar.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c'; fi`
 
-libff_a-psread.o: luatexdir/luafontforge/fontforge/fontforge/psread.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-psread.o -MD -MP -MF $(DEPDIR)/libff_a-psread.Tpo -c -o libff_a-psread.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/psread.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/psread.c
+libff_a-psread.o: luatexdir/luafontloader/fontforge/fontforge/psread.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-psread.o -MD -MP -MF $(DEPDIR)/libff_a-psread.Tpo -c -o libff_a-psread.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/psread.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/psread.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-psread.Tpo $(DEPDIR)/libff_a-psread.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/psread.c' object='libff_a-psread.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/psread.c' object='libff_a-psread.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-psread.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/psread.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/psread.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-psread.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/psread.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/psread.c
 
-libff_a-psread.obj: luatexdir/luafontforge/fontforge/fontforge/psread.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-psread.obj -MD -MP -MF $(DEPDIR)/libff_a-psread.Tpo -c -o libff_a-psread.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/psread.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/psread.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/psread.c'; fi`
+libff_a-psread.obj: luatexdir/luafontloader/fontforge/fontforge/psread.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-psread.obj -MD -MP -MF $(DEPDIR)/libff_a-psread.Tpo -c -o libff_a-psread.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/psread.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/psread.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/psread.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-psread.Tpo $(DEPDIR)/libff_a-psread.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/psread.c' object='libff_a-psread.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/psread.c' object='libff_a-psread.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-psread.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/psread.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/psread.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/psread.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-psread.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/psread.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/psread.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/psread.c'; fi`
 
-libff_a-pua.o: luatexdir/luafontforge/fontforge/fontforge/pua.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-pua.o -MD -MP -MF $(DEPDIR)/libff_a-pua.Tpo -c -o libff_a-pua.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/pua.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/pua.c
+libff_a-pua.o: luatexdir/luafontloader/fontforge/fontforge/pua.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-pua.o -MD -MP -MF $(DEPDIR)/libff_a-pua.Tpo -c -o libff_a-pua.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/pua.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/pua.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-pua.Tpo $(DEPDIR)/libff_a-pua.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/pua.c' object='libff_a-pua.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/pua.c' object='libff_a-pua.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-pua.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/pua.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/pua.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-pua.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/pua.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/pua.c
 
-libff_a-pua.obj: luatexdir/luafontforge/fontforge/fontforge/pua.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-pua.obj -MD -MP -MF $(DEPDIR)/libff_a-pua.Tpo -c -o libff_a-pua.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/pua.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/pua.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/pua.c'; fi`
+libff_a-pua.obj: luatexdir/luafontloader/fontforge/fontforge/pua.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-pua.obj -MD -MP -MF $(DEPDIR)/libff_a-pua.Tpo -c -o libff_a-pua.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/pua.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/pua.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/pua.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-pua.Tpo $(DEPDIR)/libff_a-pua.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/pua.c' object='libff_a-pua.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/pua.c' object='libff_a-pua.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-pua.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/pua.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/pua.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/pua.c'; fi`
+
+libff_a-python.o: luatexdir/luafontloader/fontforge/fontforge/python.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-python.o -MD -MP -MF $(DEPDIR)/libff_a-python.Tpo -c -o libff_a-python.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/python.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/python.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-python.Tpo $(DEPDIR)/libff_a-python.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/python.c' object='libff_a-python.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-python.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/python.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/python.c
+
+libff_a-python.obj: luatexdir/luafontloader/fontforge/fontforge/python.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-python.obj -MD -MP -MF $(DEPDIR)/libff_a-python.Tpo -c -o libff_a-python.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/python.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/python.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/python.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-python.Tpo $(DEPDIR)/libff_a-python.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/python.c' object='libff_a-python.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-pua.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/pua.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/pua.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/pua.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-python.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/python.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/python.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/python.c'; fi`
 
-libff_a-splinefill.o: luatexdir/luafontforge/fontforge/fontforge/splinefill.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinefill.o -MD -MP -MF $(DEPDIR)/libff_a-splinefill.Tpo -c -o libff_a-splinefill.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splinefill.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splinefill.c
+libff_a-sfd1.o: luatexdir/luafontloader/fontforge/fontforge/sfd1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-sfd1.o -MD -MP -MF $(DEPDIR)/libff_a-sfd1.Tpo -c -o libff_a-sfd1.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/sfd1.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/sfd1.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-sfd1.Tpo $(DEPDIR)/libff_a-sfd1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/sfd1.c' object='libff_a-sfd1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-sfd1.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/sfd1.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/sfd1.c
+
+libff_a-sfd1.obj: luatexdir/luafontloader/fontforge/fontforge/sfd1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-sfd1.obj -MD -MP -MF $(DEPDIR)/libff_a-sfd1.Tpo -c -o libff_a-sfd1.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/sfd1.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/sfd1.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/sfd1.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-sfd1.Tpo $(DEPDIR)/libff_a-sfd1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/sfd1.c' object='libff_a-sfd1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-sfd1.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/sfd1.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/sfd1.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/sfd1.c'; fi`
+
+libff_a-splinechar.o: luatexdir/luafontloader/fontforge/fontforge/splinechar.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinechar.o -MD -MP -MF $(DEPDIR)/libff_a-splinechar.Tpo -c -o libff_a-splinechar.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinechar.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinechar.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinechar.Tpo $(DEPDIR)/libff_a-splinechar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinechar.c' object='libff_a-splinechar.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinechar.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinechar.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinechar.c
+
+libff_a-splinechar.obj: luatexdir/luafontloader/fontforge/fontforge/splinechar.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinechar.obj -MD -MP -MF $(DEPDIR)/libff_a-splinechar.Tpo -c -o libff_a-splinechar.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinechar.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinechar.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinechar.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinechar.Tpo $(DEPDIR)/libff_a-splinechar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinechar.c' object='libff_a-splinechar.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinechar.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinechar.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinechar.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinechar.c'; fi`
+
+libff_a-splinefill.o: luatexdir/luafontloader/fontforge/fontforge/splinefill.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinefill.o -MD -MP -MF $(DEPDIR)/libff_a-splinefill.Tpo -c -o libff_a-splinefill.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinefill.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinefill.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinefill.Tpo $(DEPDIR)/libff_a-splinefill.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splinefill.c' object='libff_a-splinefill.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinefill.c' object='libff_a-splinefill.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinefill.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splinefill.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splinefill.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinefill.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinefill.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinefill.c
 
-libff_a-splinefill.obj: luatexdir/luafontforge/fontforge/fontforge/splinefill.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinefill.obj -MD -MP -MF $(DEPDIR)/libff_a-splinefill.Tpo -c -o libff_a-splinefill.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splinefill.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splinefill.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splinefill.c'; fi`
+libff_a-splinefill.obj: luatexdir/luafontloader/fontforge/fontforge/splinefill.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinefill.obj -MD -MP -MF $(DEPDIR)/libff_a-splinefill.Tpo -c -o libff_a-splinefill.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinefill.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinefill.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinefill.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinefill.Tpo $(DEPDIR)/libff_a-splinefill.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splinefill.c' object='libff_a-splinefill.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinefill.c' object='libff_a-splinefill.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinefill.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splinefill.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splinefill.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splinefill.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinefill.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinefill.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinefill.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinefill.c'; fi`
 
-libff_a-splineorder2.o: luatexdir/luafontforge/fontforge/fontforge/splineorder2.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineorder2.o -MD -MP -MF $(DEPDIR)/libff_a-splineorder2.Tpo -c -o libff_a-splineorder2.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splineorder2.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splineorder2.c
+libff_a-splinefont.o: luatexdir/luafontloader/fontforge/fontforge/splinefont.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinefont.o -MD -MP -MF $(DEPDIR)/libff_a-splinefont.Tpo -c -o libff_a-splinefont.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinefont.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinefont.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinefont.Tpo $(DEPDIR)/libff_a-splinefont.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinefont.c' object='libff_a-splinefont.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinefont.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinefont.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinefont.c
+
+libff_a-splinefont.obj: luatexdir/luafontloader/fontforge/fontforge/splinefont.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinefont.obj -MD -MP -MF $(DEPDIR)/libff_a-splinefont.Tpo -c -o libff_a-splinefont.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinefont.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinefont.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinefont.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinefont.Tpo $(DEPDIR)/libff_a-splinefont.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinefont.c' object='libff_a-splinefont.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinefont.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinefont.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinefont.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinefont.c'; fi`
+
+libff_a-splineorder2.o: luatexdir/luafontloader/fontforge/fontforge/splineorder2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineorder2.o -MD -MP -MF $(DEPDIR)/libff_a-splineorder2.Tpo -c -o libff_a-splineorder2.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splineorder2.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splineorder2.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splineorder2.Tpo $(DEPDIR)/libff_a-splineorder2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splineorder2.c' object='libff_a-splineorder2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splineorder2.c' object='libff_a-splineorder2.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineorder2.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splineorder2.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splineorder2.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineorder2.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splineorder2.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splineorder2.c
 
-libff_a-splineorder2.obj: luatexdir/luafontforge/fontforge/fontforge/splineorder2.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineorder2.obj -MD -MP -MF $(DEPDIR)/libff_a-splineorder2.Tpo -c -o libff_a-splineorder2.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splineorder2.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splineorder2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splineorder2.c'; fi`
+libff_a-splineorder2.obj: luatexdir/luafontloader/fontforge/fontforge/splineorder2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineorder2.obj -MD -MP -MF $(DEPDIR)/libff_a-splineorder2.Tpo -c -o libff_a-splineorder2.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splineorder2.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splineorder2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splineorder2.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splineorder2.Tpo $(DEPDIR)/libff_a-splineorder2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splineorder2.c' object='libff_a-splineorder2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splineorder2.c' object='libff_a-splineorder2.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineorder2.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splineorder2.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splineorder2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splineorder2.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineorder2.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splineorder2.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splineorder2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splineorder2.c'; fi`
 
-libff_a-splineoverlap.o: luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineoverlap.o -MD -MP -MF $(DEPDIR)/libff_a-splineoverlap.Tpo -c -o libff_a-splineoverlap.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c
+libff_a-splineoverlap.o: luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineoverlap.o -MD -MP -MF $(DEPDIR)/libff_a-splineoverlap.Tpo -c -o libff_a-splineoverlap.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splineoverlap.Tpo $(DEPDIR)/libff_a-splineoverlap.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c' object='libff_a-splineoverlap.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c' object='libff_a-splineoverlap.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineoverlap.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineoverlap.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c
 
-libff_a-splineoverlap.obj: luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineoverlap.obj -MD -MP -MF $(DEPDIR)/libff_a-splineoverlap.Tpo -c -o libff_a-splineoverlap.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c'; fi`
+libff_a-splineoverlap.obj: luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineoverlap.obj -MD -MP -MF $(DEPDIR)/libff_a-splineoverlap.Tpo -c -o libff_a-splineoverlap.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splineoverlap.Tpo $(DEPDIR)/libff_a-splineoverlap.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c' object='libff_a-splineoverlap.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c' object='libff_a-splineoverlap.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineoverlap.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splineoverlap.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineoverlap.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c'; fi`
 
-libff_a-splinerefigure.o: luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinerefigure.o -MD -MP -MF $(DEPDIR)/libff_a-splinerefigure.Tpo -c -o libff_a-splinerefigure.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c
+libff_a-splinerefigure.o: luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinerefigure.o -MD -MP -MF $(DEPDIR)/libff_a-splinerefigure.Tpo -c -o libff_a-splinerefigure.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinerefigure.Tpo $(DEPDIR)/libff_a-splinerefigure.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c' object='libff_a-splinerefigure.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c' object='libff_a-splinerefigure.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinerefigure.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinerefigure.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c
 
-libff_a-splinerefigure.obj: luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinerefigure.obj -MD -MP -MF $(DEPDIR)/libff_a-splinerefigure.Tpo -c -o libff_a-splinerefigure.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c'; fi`
+libff_a-splinerefigure.obj: luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinerefigure.obj -MD -MP -MF $(DEPDIR)/libff_a-splinerefigure.Tpo -c -o libff_a-splinerefigure.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinerefigure.Tpo $(DEPDIR)/libff_a-splinerefigure.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c' object='libff_a-splinerefigure.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c' object='libff_a-splinerefigure.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinerefigure.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splinerefigure.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinerefigure.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c'; fi`
 
-libff_a-splinesave.o: luatexdir/luafontforge/fontforge/fontforge/splinesave.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinesave.o -MD -MP -MF $(DEPDIR)/libff_a-splinesave.Tpo -c -o libff_a-splinesave.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splinesave.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splinesave.c
+libff_a-splinesave.o: luatexdir/luafontloader/fontforge/fontforge/splinesave.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinesave.o -MD -MP -MF $(DEPDIR)/libff_a-splinesave.Tpo -c -o libff_a-splinesave.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinesave.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinesave.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinesave.Tpo $(DEPDIR)/libff_a-splinesave.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splinesave.c' object='libff_a-splinesave.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinesave.c' object='libff_a-splinesave.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinesave.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splinesave.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splinesave.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinesave.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinesave.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinesave.c
 
-libff_a-splinesave.obj: luatexdir/luafontforge/fontforge/fontforge/splinesave.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinesave.obj -MD -MP -MF $(DEPDIR)/libff_a-splinesave.Tpo -c -o libff_a-splinesave.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splinesave.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splinesave.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splinesave.c'; fi`
+libff_a-splinesave.obj: luatexdir/luafontloader/fontforge/fontforge/splinesave.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinesave.obj -MD -MP -MF $(DEPDIR)/libff_a-splinesave.Tpo -c -o libff_a-splinesave.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinesave.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinesave.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinesave.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinesave.Tpo $(DEPDIR)/libff_a-splinesave.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splinesave.c' object='libff_a-splinesave.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinesave.c' object='libff_a-splinesave.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinesave.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splinesave.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splinesave.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splinesave.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinesave.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinesave.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinesave.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinesave.c'; fi`
 
-libff_a-splinestroke.o: luatexdir/luafontforge/fontforge/fontforge/splinestroke.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinestroke.o -MD -MP -MF $(DEPDIR)/libff_a-splinestroke.Tpo -c -o libff_a-splinestroke.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splinestroke.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splinestroke.c
+libff_a-splinesaveafm.o: luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinesaveafm.o -MD -MP -MF $(DEPDIR)/libff_a-splinesaveafm.Tpo -c -o libff_a-splinesaveafm.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinesaveafm.Tpo $(DEPDIR)/libff_a-splinesaveafm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c' object='libff_a-splinesaveafm.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinesaveafm.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c
+
+libff_a-splinesaveafm.obj: luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinesaveafm.obj -MD -MP -MF $(DEPDIR)/libff_a-splinesaveafm.Tpo -c -o libff_a-splinesaveafm.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinesaveafm.Tpo $(DEPDIR)/libff_a-splinesaveafm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c' object='libff_a-splinesaveafm.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinesaveafm.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c'; fi`
+
+libff_a-splinestroke.o: luatexdir/luafontloader/fontforge/fontforge/splinestroke.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinestroke.o -MD -MP -MF $(DEPDIR)/libff_a-splinestroke.Tpo -c -o libff_a-splinestroke.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinestroke.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinestroke.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinestroke.Tpo $(DEPDIR)/libff_a-splinestroke.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splinestroke.c' object='libff_a-splinestroke.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinestroke.c' object='libff_a-splinestroke.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinestroke.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splinestroke.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splinestroke.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinestroke.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splinestroke.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splinestroke.c
 
-libff_a-splinestroke.obj: luatexdir/luafontforge/fontforge/fontforge/splinestroke.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinestroke.obj -MD -MP -MF $(DEPDIR)/libff_a-splinestroke.Tpo -c -o libff_a-splinestroke.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splinestroke.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splinestroke.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splinestroke.c'; fi`
+libff_a-splinestroke.obj: luatexdir/luafontloader/fontforge/fontforge/splinestroke.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splinestroke.obj -MD -MP -MF $(DEPDIR)/libff_a-splinestroke.Tpo -c -o libff_a-splinestroke.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinestroke.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinestroke.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinestroke.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splinestroke.Tpo $(DEPDIR)/libff_a-splinestroke.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splinestroke.c' object='libff_a-splinestroke.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splinestroke.c' object='libff_a-splinestroke.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinestroke.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splinestroke.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splinestroke.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splinestroke.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splinestroke.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splinestroke.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splinestroke.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splinestroke.c'; fi`
 
-libff_a-splineutil.o: luatexdir/luafontforge/fontforge/fontforge/splineutil.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineutil.o -MD -MP -MF $(DEPDIR)/libff_a-splineutil.Tpo -c -o libff_a-splineutil.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splineutil.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splineutil.c
+libff_a-splineutil.o: luatexdir/luafontloader/fontforge/fontforge/splineutil.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineutil.o -MD -MP -MF $(DEPDIR)/libff_a-splineutil.Tpo -c -o libff_a-splineutil.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splineutil.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splineutil.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splineutil.Tpo $(DEPDIR)/libff_a-splineutil.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splineutil.c' object='libff_a-splineutil.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splineutil.c' object='libff_a-splineutil.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineutil.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splineutil.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splineutil.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineutil.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splineutil.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splineutil.c
 
-libff_a-splineutil.obj: luatexdir/luafontforge/fontforge/fontforge/splineutil.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineutil.obj -MD -MP -MF $(DEPDIR)/libff_a-splineutil.Tpo -c -o libff_a-splineutil.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splineutil.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splineutil.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splineutil.c'; fi`
+libff_a-splineutil.obj: luatexdir/luafontloader/fontforge/fontforge/splineutil.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineutil.obj -MD -MP -MF $(DEPDIR)/libff_a-splineutil.Tpo -c -o libff_a-splineutil.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splineutil.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splineutil.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splineutil.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splineutil.Tpo $(DEPDIR)/libff_a-splineutil.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splineutil.c' object='libff_a-splineutil.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splineutil.c' object='libff_a-splineutil.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineutil.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splineutil.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splineutil.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splineutil.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineutil.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splineutil.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splineutil.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splineutil.c'; fi`
 
-libff_a-splineutil2.o: luatexdir/luafontforge/fontforge/fontforge/splineutil2.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineutil2.o -MD -MP -MF $(DEPDIR)/libff_a-splineutil2.Tpo -c -o libff_a-splineutil2.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splineutil2.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splineutil2.c
+libff_a-splineutil2.o: luatexdir/luafontloader/fontforge/fontforge/splineutil2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineutil2.o -MD -MP -MF $(DEPDIR)/libff_a-splineutil2.Tpo -c -o libff_a-splineutil2.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splineutil2.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splineutil2.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splineutil2.Tpo $(DEPDIR)/libff_a-splineutil2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splineutil2.c' object='libff_a-splineutil2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splineutil2.c' object='libff_a-splineutil2.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineutil2.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/splineutil2.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/splineutil2.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineutil2.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/splineutil2.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/splineutil2.c
 
-libff_a-splineutil2.obj: luatexdir/luafontforge/fontforge/fontforge/splineutil2.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineutil2.obj -MD -MP -MF $(DEPDIR)/libff_a-splineutil2.Tpo -c -o libff_a-splineutil2.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splineutil2.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splineutil2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splineutil2.c'; fi`
+libff_a-splineutil2.obj: luatexdir/luafontloader/fontforge/fontforge/splineutil2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-splineutil2.obj -MD -MP -MF $(DEPDIR)/libff_a-splineutil2.Tpo -c -o libff_a-splineutil2.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splineutil2.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splineutil2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splineutil2.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-splineutil2.Tpo $(DEPDIR)/libff_a-splineutil2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/splineutil2.c' object='libff_a-splineutil2.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineutil2.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/splineutil2.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/splineutil2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/splineutil2.c'; fi`
-
-libff_a-stamp.o: luatexdir/luafontforge/fontforge/fontforge/stamp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-stamp.o -MD -MP -MF $(DEPDIR)/libff_a-stamp.Tpo -c -o libff_a-stamp.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/stamp.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/stamp.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-stamp.Tpo $(DEPDIR)/libff_a-stamp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/stamp.c' object='libff_a-stamp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/splineutil2.c' object='libff_a-splineutil2.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-stamp.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/stamp.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/stamp.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-splineutil2.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/splineutil2.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/splineutil2.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/splineutil2.c'; fi`
 
-libff_a-stamp.obj: luatexdir/luafontforge/fontforge/fontforge/stamp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-stamp.obj -MD -MP -MF $(DEPDIR)/libff_a-stamp.Tpo -c -o libff_a-stamp.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/stamp.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/stamp.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/stamp.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-stamp.Tpo $(DEPDIR)/libff_a-stamp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/stamp.c' object='libff_a-stamp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-stamp.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/stamp.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/stamp.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/stamp.c'; fi`
-
-libff_a-start.o: luatexdir/luafontforge/fontforge/fontforge/start.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-start.o -MD -MP -MF $(DEPDIR)/libff_a-start.Tpo -c -o libff_a-start.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/start.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/start.c
+libff_a-start.o: luatexdir/luafontloader/fontforge/fontforge/start.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-start.o -MD -MP -MF $(DEPDIR)/libff_a-start.Tpo -c -o libff_a-start.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/start.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/start.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-start.Tpo $(DEPDIR)/libff_a-start.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/start.c' object='libff_a-start.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/start.c' object='libff_a-start.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-start.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/start.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/start.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-start.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/start.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/start.c
 
-libff_a-start.obj: luatexdir/luafontforge/fontforge/fontforge/start.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-start.obj -MD -MP -MF $(DEPDIR)/libff_a-start.Tpo -c -o libff_a-start.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/start.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/start.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/start.c'; fi`
+libff_a-start.obj: luatexdir/luafontloader/fontforge/fontforge/start.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-start.obj -MD -MP -MF $(DEPDIR)/libff_a-start.Tpo -c -o libff_a-start.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/start.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/start.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/start.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-start.Tpo $(DEPDIR)/libff_a-start.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/start.c' object='libff_a-start.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/start.c' object='libff_a-start.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-start.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/start.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/start.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/start.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-start.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/start.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/start.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/start.c'; fi`
 
-libff_a-stemdb.o: luatexdir/luafontforge/fontforge/fontforge/stemdb.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-stemdb.o -MD -MP -MF $(DEPDIR)/libff_a-stemdb.Tpo -c -o libff_a-stemdb.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/stemdb.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/stemdb.c
+libff_a-stemdb.o: luatexdir/luafontloader/fontforge/fontforge/stemdb.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-stemdb.o -MD -MP -MF $(DEPDIR)/libff_a-stemdb.Tpo -c -o libff_a-stemdb.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/stemdb.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/stemdb.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-stemdb.Tpo $(DEPDIR)/libff_a-stemdb.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/stemdb.c' object='libff_a-stemdb.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/stemdb.c' object='libff_a-stemdb.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-stemdb.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/stemdb.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/stemdb.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-stemdb.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/stemdb.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/stemdb.c
 
-libff_a-stemdb.obj: luatexdir/luafontforge/fontforge/fontforge/stemdb.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-stemdb.obj -MD -MP -MF $(DEPDIR)/libff_a-stemdb.Tpo -c -o libff_a-stemdb.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/stemdb.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/stemdb.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/stemdb.c'; fi`
+libff_a-stemdb.obj: luatexdir/luafontloader/fontforge/fontforge/stemdb.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-stemdb.obj -MD -MP -MF $(DEPDIR)/libff_a-stemdb.Tpo -c -o libff_a-stemdb.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/stemdb.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/stemdb.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/stemdb.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-stemdb.Tpo $(DEPDIR)/libff_a-stemdb.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/stemdb.c' object='libff_a-stemdb.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/stemdb.c' object='libff_a-stemdb.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-stemdb.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/stemdb.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/stemdb.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/stemdb.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-stemdb.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/stemdb.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/stemdb.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/stemdb.c'; fi`
 
-libff_a-tottf.o: luatexdir/luafontforge/fontforge/fontforge/tottf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottf.o -MD -MP -MF $(DEPDIR)/libff_a-tottf.Tpo -c -o libff_a-tottf.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/tottf.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/tottf.c
+libff_a-tottf.o: luatexdir/luafontloader/fontforge/fontforge/tottf.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottf.o -MD -MP -MF $(DEPDIR)/libff_a-tottf.Tpo -c -o libff_a-tottf.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/tottf.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/tottf.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-tottf.Tpo $(DEPDIR)/libff_a-tottf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/tottf.c' object='libff_a-tottf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/tottf.c' object='libff_a-tottf.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottf.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/tottf.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/tottf.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottf.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/tottf.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/tottf.c
 
-libff_a-tottf.obj: luatexdir/luafontforge/fontforge/fontforge/tottf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottf.obj -MD -MP -MF $(DEPDIR)/libff_a-tottf.Tpo -c -o libff_a-tottf.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/tottf.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/tottf.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/tottf.c'; fi`
+libff_a-tottf.obj: luatexdir/luafontloader/fontforge/fontforge/tottf.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottf.obj -MD -MP -MF $(DEPDIR)/libff_a-tottf.Tpo -c -o libff_a-tottf.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/tottf.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/tottf.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/tottf.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-tottf.Tpo $(DEPDIR)/libff_a-tottf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/tottf.c' object='libff_a-tottf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/tottf.c' object='libff_a-tottf.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottf.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/tottf.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/tottf.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/tottf.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottf.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/tottf.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/tottf.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/tottf.c'; fi`
 
-libff_a-tottfgpos.o: luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottfgpos.o -MD -MP -MF $(DEPDIR)/libff_a-tottfgpos.Tpo -c -o libff_a-tottfgpos.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-tottfgpos.Tpo $(DEPDIR)/libff_a-tottfgpos.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c' object='libff_a-tottfgpos.o' libtool=no @AMDEPBACKSLASH@
+libff_a-tottfaat.o: luatexdir/luafontloader/fontforge/fontforge/tottfaat.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottfaat.o -MD -MP -MF $(DEPDIR)/libff_a-tottfaat.Tpo -c -o libff_a-tottfaat.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/tottfaat.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/tottfaat.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-tottfaat.Tpo $(DEPDIR)/libff_a-tottfaat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/tottfaat.c' object='libff_a-tottfaat.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottfgpos.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottfaat.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/tottfaat.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/tottfaat.c
 
-libff_a-tottfgpos.obj: luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottfgpos.obj -MD -MP -MF $(DEPDIR)/libff_a-tottfgpos.Tpo -c -o libff_a-tottfgpos.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-tottfgpos.Tpo $(DEPDIR)/libff_a-tottfgpos.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c' object='libff_a-tottfgpos.obj' libtool=no @AMDEPBACKSLASH@
+libff_a-tottfaat.obj: luatexdir/luafontloader/fontforge/fontforge/tottfaat.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottfaat.obj -MD -MP -MF $(DEPDIR)/libff_a-tottfaat.Tpo -c -o libff_a-tottfaat.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/tottfaat.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/tottfaat.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/tottfaat.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-tottfaat.Tpo $(DEPDIR)/libff_a-tottfaat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/tottfaat.c' object='libff_a-tottfaat.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottfgpos.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/tottfgpos.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottfaat.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/tottfaat.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/tottfaat.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/tottfaat.c'; fi`
 
-libff_a-tottfvar.o: luatexdir/luafontforge/fontforge/fontforge/tottfvar.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottfvar.o -MD -MP -MF $(DEPDIR)/libff_a-tottfvar.Tpo -c -o libff_a-tottfvar.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/tottfvar.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/tottfvar.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-tottfvar.Tpo $(DEPDIR)/libff_a-tottfvar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/tottfvar.c' object='libff_a-tottfvar.o' libtool=no @AMDEPBACKSLASH@
+libff_a-tottfgpos.o: luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottfgpos.o -MD -MP -MF $(DEPDIR)/libff_a-tottfgpos.Tpo -c -o libff_a-tottfgpos.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-tottfgpos.Tpo $(DEPDIR)/libff_a-tottfgpos.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c' object='libff_a-tottfgpos.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottfvar.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/tottfvar.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/tottfvar.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottfgpos.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c
 
-libff_a-tottfvar.obj: luatexdir/luafontforge/fontforge/fontforge/tottfvar.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottfvar.obj -MD -MP -MF $(DEPDIR)/libff_a-tottfvar.Tpo -c -o libff_a-tottfvar.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/tottfvar.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/tottfvar.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/tottfvar.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-tottfvar.Tpo $(DEPDIR)/libff_a-tottfvar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/tottfvar.c' object='libff_a-tottfvar.obj' libtool=no @AMDEPBACKSLASH@
+libff_a-tottfgpos.obj: luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-tottfgpos.obj -MD -MP -MF $(DEPDIR)/libff_a-tottfgpos.Tpo -c -o libff_a-tottfgpos.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-tottfgpos.Tpo $(DEPDIR)/libff_a-tottfgpos.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c' object='libff_a-tottfgpos.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottfvar.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/tottfvar.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/tottfvar.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/tottfvar.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-tottfgpos.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c'; fi`
 
-libff_a-ttfspecial.o: luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ttfspecial.o -MD -MP -MF $(DEPDIR)/libff_a-ttfspecial.Tpo -c -o libff_a-ttfspecial.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c
+libff_a-ttfspecial.o: luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ttfspecial.o -MD -MP -MF $(DEPDIR)/libff_a-ttfspecial.Tpo -c -o libff_a-ttfspecial.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-ttfspecial.Tpo $(DEPDIR)/libff_a-ttfspecial.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c' object='libff_a-ttfspecial.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c' object='libff_a-ttfspecial.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ttfspecial.o `test -f 'luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c' || echo '$(srcdir)/'`luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ttfspecial.o `test -f 'luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c
 
-libff_a-ttfspecial.obj: luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ttfspecial.obj -MD -MP -MF $(DEPDIR)/libff_a-ttfspecial.Tpo -c -o libff_a-ttfspecial.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c'; fi`
+libff_a-ttfspecial.obj: luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ttfspecial.obj -MD -MP -MF $(DEPDIR)/libff_a-ttfspecial.Tpo -c -o libff_a-ttfspecial.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-ttfspecial.Tpo $(DEPDIR)/libff_a-ttfspecial.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c' object='libff_a-ttfspecial.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c' object='libff_a-ttfspecial.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ttfspecial.obj `if test -f 'luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c'; fi`
+
+libff_a-fsys.o: luatexdir/luafontloader/fontforge/gutils/fsys.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fsys.o -MD -MP -MF $(DEPDIR)/libff_a-fsys.Tpo -c -o libff_a-fsys.o `test -f 'luatexdir/luafontloader/fontforge/gutils/fsys.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/gutils/fsys.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fsys.Tpo $(DEPDIR)/libff_a-fsys.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/gutils/fsys.c' object='libff_a-fsys.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ttfspecial.obj `if test -f 'luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/fontforge/fontforge/ttfspecial.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fsys.o `test -f 'luatexdir/luafontloader/fontforge/gutils/fsys.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/gutils/fsys.c
 
-libff_a-ffdummies.o: luatexdir/luafontforge/src/ffdummies.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ffdummies.o -MD -MP -MF $(DEPDIR)/libff_a-ffdummies.Tpo -c -o libff_a-ffdummies.o `test -f 'luatexdir/luafontforge/src/ffdummies.c' || echo '$(srcdir)/'`luatexdir/luafontforge/src/ffdummies.c
+libff_a-fsys.obj: luatexdir/luafontloader/fontforge/gutils/fsys.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-fsys.obj -MD -MP -MF $(DEPDIR)/libff_a-fsys.Tpo -c -o libff_a-fsys.obj `if test -f 'luatexdir/luafontloader/fontforge/gutils/fsys.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/gutils/fsys.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/gutils/fsys.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-fsys.Tpo $(DEPDIR)/libff_a-fsys.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/gutils/fsys.c' object='libff_a-fsys.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-fsys.obj `if test -f 'luatexdir/luafontloader/fontforge/gutils/fsys.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/gutils/fsys.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/gutils/fsys.c'; fi`
+
+libff_a-gwwintl.o: luatexdir/luafontloader/fontforge/gutils/gwwintl.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-gwwintl.o -MD -MP -MF $(DEPDIR)/libff_a-gwwintl.Tpo -c -o libff_a-gwwintl.o `test -f 'luatexdir/luafontloader/fontforge/gutils/gwwintl.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/gutils/gwwintl.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-gwwintl.Tpo $(DEPDIR)/libff_a-gwwintl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/gutils/gwwintl.c' object='libff_a-gwwintl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-gwwintl.o `test -f 'luatexdir/luafontloader/fontforge/gutils/gwwintl.c' || echo '$(srcdir)/'`luatexdir/luafontloader/fontforge/gutils/gwwintl.c
+
+libff_a-gwwintl.obj: luatexdir/luafontloader/fontforge/gutils/gwwintl.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-gwwintl.obj -MD -MP -MF $(DEPDIR)/libff_a-gwwintl.Tpo -c -o libff_a-gwwintl.obj `if test -f 'luatexdir/luafontloader/fontforge/gutils/gwwintl.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/gutils/gwwintl.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/gutils/gwwintl.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-gwwintl.Tpo $(DEPDIR)/libff_a-gwwintl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/fontforge/gutils/gwwintl.c' object='libff_a-gwwintl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-gwwintl.obj `if test -f 'luatexdir/luafontloader/fontforge/gutils/gwwintl.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/fontforge/gutils/gwwintl.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/fontforge/gutils/gwwintl.c'; fi`
+
+libff_a-ffdummies.o: luatexdir/luafontloader/src/ffdummies.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ffdummies.o -MD -MP -MF $(DEPDIR)/libff_a-ffdummies.Tpo -c -o libff_a-ffdummies.o `test -f 'luatexdir/luafontloader/src/ffdummies.c' || echo '$(srcdir)/'`luatexdir/luafontloader/src/ffdummies.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-ffdummies.Tpo $(DEPDIR)/libff_a-ffdummies.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/src/ffdummies.c' object='libff_a-ffdummies.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/src/ffdummies.c' object='libff_a-ffdummies.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ffdummies.o `test -f 'luatexdir/luafontforge/src/ffdummies.c' || echo '$(srcdir)/'`luatexdir/luafontforge/src/ffdummies.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ffdummies.o `test -f 'luatexdir/luafontloader/src/ffdummies.c' || echo '$(srcdir)/'`luatexdir/luafontloader/src/ffdummies.c
 
-libff_a-ffdummies.obj: luatexdir/luafontforge/src/ffdummies.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ffdummies.obj -MD -MP -MF $(DEPDIR)/libff_a-ffdummies.Tpo -c -o libff_a-ffdummies.obj `if test -f 'luatexdir/luafontforge/src/ffdummies.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/src/ffdummies.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/src/ffdummies.c'; fi`
+libff_a-ffdummies.obj: luatexdir/luafontloader/src/ffdummies.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-ffdummies.obj -MD -MP -MF $(DEPDIR)/libff_a-ffdummies.Tpo -c -o libff_a-ffdummies.obj `if test -f 'luatexdir/luafontloader/src/ffdummies.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/src/ffdummies.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/src/ffdummies.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-ffdummies.Tpo $(DEPDIR)/libff_a-ffdummies.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/src/ffdummies.c' object='libff_a-ffdummies.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/src/ffdummies.c' object='libff_a-ffdummies.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ffdummies.obj `if test -f 'luatexdir/luafontforge/src/ffdummies.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/src/ffdummies.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/src/ffdummies.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-ffdummies.obj `if test -f 'luatexdir/luafontloader/src/ffdummies.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/src/ffdummies.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/src/ffdummies.c'; fi`
 
-libff_a-luafflib.o: luatexdir/luafontforge/src/luafflib.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-luafflib.o -MD -MP -MF $(DEPDIR)/libff_a-luafflib.Tpo -c -o libff_a-luafflib.o `test -f 'luatexdir/luafontforge/src/luafflib.c' || echo '$(srcdir)/'`luatexdir/luafontforge/src/luafflib.c
+libff_a-luafflib.o: luatexdir/luafontloader/src/luafflib.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-luafflib.o -MD -MP -MF $(DEPDIR)/libff_a-luafflib.Tpo -c -o libff_a-luafflib.o `test -f 'luatexdir/luafontloader/src/luafflib.c' || echo '$(srcdir)/'`luatexdir/luafontloader/src/luafflib.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-luafflib.Tpo $(DEPDIR)/libff_a-luafflib.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/src/luafflib.c' object='libff_a-luafflib.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/src/luafflib.c' object='libff_a-luafflib.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-luafflib.o `test -f 'luatexdir/luafontforge/src/luafflib.c' || echo '$(srcdir)/'`luatexdir/luafontforge/src/luafflib.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-luafflib.o `test -f 'luatexdir/luafontloader/src/luafflib.c' || echo '$(srcdir)/'`luatexdir/luafontloader/src/luafflib.c
 
-libff_a-luafflib.obj: luatexdir/luafontforge/src/luafflib.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-luafflib.obj -MD -MP -MF $(DEPDIR)/libff_a-luafflib.Tpo -c -o libff_a-luafflib.obj `if test -f 'luatexdir/luafontforge/src/luafflib.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/src/luafflib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/src/luafflib.c'; fi`
+libff_a-luafflib.obj: luatexdir/luafontloader/src/luafflib.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libff_a-luafflib.obj -MD -MP -MF $(DEPDIR)/libff_a-luafflib.Tpo -c -o libff_a-luafflib.obj `if test -f 'luatexdir/luafontloader/src/luafflib.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/src/luafflib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/src/luafflib.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libff_a-luafflib.Tpo $(DEPDIR)/libff_a-luafflib.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontforge/src/luafflib.c' object='libff_a-luafflib.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luafontloader/src/luafflib.c' object='libff_a-luafflib.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-luafflib.obj `if test -f 'luatexdir/luafontforge/src/luafflib.c'; then $(CYGPATH_W) 'luatexdir/luafontforge/src/luafflib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontforge/src/luafflib.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libff_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libff_a-luafflib.obj `if test -f 'luatexdir/luafontloader/src/luafflib.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/src/luafflib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/src/luafflib.c'; fi`
 
 liblua51_a-lapi.o: luatexdir/lua51/lapi.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua51_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblua51_a-lapi.o -MD -MP -MF $(DEPDIR)/liblua51_a-lapi.Tpo -c -o liblua51_a-lapi.o `test -f 'luatexdir/lua51/lapi.c' || echo '$(srcdir)/'`luatexdir/lua51/lapi.c
@@ -3229,6 +3670,76 @@ libluamisc_a-lpeg.obj: luatexdir/luapeg/lpeg.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-lpeg.obj `if test -f 'luatexdir/luapeg/lpeg.c'; then $(CYGPATH_W) 'luatexdir/luapeg/lpeg.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luapeg/lpeg.c'; fi`
 
+libluamisc_a-clocks.o: luatexdir/luaprofiler/clocks.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-clocks.o -MD -MP -MF $(DEPDIR)/libluamisc_a-clocks.Tpo -c -o libluamisc_a-clocks.o `test -f 'luatexdir/luaprofiler/clocks.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/clocks.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-clocks.Tpo $(DEPDIR)/libluamisc_a-clocks.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/clocks.c' object='libluamisc_a-clocks.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-clocks.o `test -f 'luatexdir/luaprofiler/clocks.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/clocks.c
+
+libluamisc_a-clocks.obj: luatexdir/luaprofiler/clocks.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-clocks.obj -MD -MP -MF $(DEPDIR)/libluamisc_a-clocks.Tpo -c -o libluamisc_a-clocks.obj `if test -f 'luatexdir/luaprofiler/clocks.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/clocks.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/clocks.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-clocks.Tpo $(DEPDIR)/libluamisc_a-clocks.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/clocks.c' object='libluamisc_a-clocks.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-clocks.obj `if test -f 'luatexdir/luaprofiler/clocks.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/clocks.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/clocks.c'; fi`
+
+libluamisc_a-core_profiler.o: luatexdir/luaprofiler/core_profiler.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-core_profiler.o -MD -MP -MF $(DEPDIR)/libluamisc_a-core_profiler.Tpo -c -o libluamisc_a-core_profiler.o `test -f 'luatexdir/luaprofiler/core_profiler.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/core_profiler.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-core_profiler.Tpo $(DEPDIR)/libluamisc_a-core_profiler.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/core_profiler.c' object='libluamisc_a-core_profiler.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-core_profiler.o `test -f 'luatexdir/luaprofiler/core_profiler.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/core_profiler.c
+
+libluamisc_a-core_profiler.obj: luatexdir/luaprofiler/core_profiler.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-core_profiler.obj -MD -MP -MF $(DEPDIR)/libluamisc_a-core_profiler.Tpo -c -o libluamisc_a-core_profiler.obj `if test -f 'luatexdir/luaprofiler/core_profiler.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/core_profiler.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/core_profiler.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-core_profiler.Tpo $(DEPDIR)/libluamisc_a-core_profiler.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/core_profiler.c' object='libluamisc_a-core_profiler.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-core_profiler.obj `if test -f 'luatexdir/luaprofiler/core_profiler.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/core_profiler.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/core_profiler.c'; fi`
+
+libluamisc_a-function_meter.o: luatexdir/luaprofiler/function_meter.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-function_meter.o -MD -MP -MF $(DEPDIR)/libluamisc_a-function_meter.Tpo -c -o libluamisc_a-function_meter.o `test -f 'luatexdir/luaprofiler/function_meter.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/function_meter.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-function_meter.Tpo $(DEPDIR)/libluamisc_a-function_meter.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/function_meter.c' object='libluamisc_a-function_meter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-function_meter.o `test -f 'luatexdir/luaprofiler/function_meter.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/function_meter.c
+
+libluamisc_a-function_meter.obj: luatexdir/luaprofiler/function_meter.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-function_meter.obj -MD -MP -MF $(DEPDIR)/libluamisc_a-function_meter.Tpo -c -o libluamisc_a-function_meter.obj `if test -f 'luatexdir/luaprofiler/function_meter.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/function_meter.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/function_meter.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-function_meter.Tpo $(DEPDIR)/libluamisc_a-function_meter.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/function_meter.c' object='libluamisc_a-function_meter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-function_meter.obj `if test -f 'luatexdir/luaprofiler/function_meter.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/function_meter.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/function_meter.c'; fi`
+
+libluamisc_a-lua50_profiler.o: luatexdir/luaprofiler/lua50_profiler.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-lua50_profiler.o -MD -MP -MF $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo -c -o libluamisc_a-lua50_profiler.o `test -f 'luatexdir/luaprofiler/lua50_profiler.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/lua50_profiler.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo $(DEPDIR)/libluamisc_a-lua50_profiler.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/lua50_profiler.c' object='libluamisc_a-lua50_profiler.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-lua50_profiler.o `test -f 'luatexdir/luaprofiler/lua50_profiler.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/lua50_profiler.c
+
+libluamisc_a-lua50_profiler.obj: luatexdir/luaprofiler/lua50_profiler.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-lua50_profiler.obj -MD -MP -MF $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo -c -o libluamisc_a-lua50_profiler.obj `if test -f 'luatexdir/luaprofiler/lua50_profiler.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/lua50_profiler.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/lua50_profiler.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo $(DEPDIR)/libluamisc_a-lua50_profiler.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/lua50_profiler.c' object='libluamisc_a-lua50_profiler.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-lua50_profiler.obj `if test -f 'luatexdir/luaprofiler/lua50_profiler.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/lua50_profiler.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/lua50_profiler.c'; fi`
+
+libluamisc_a-stack.o: luatexdir/luaprofiler/stack.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-stack.o -MD -MP -MF $(DEPDIR)/libluamisc_a-stack.Tpo -c -o libluamisc_a-stack.o `test -f 'luatexdir/luaprofiler/stack.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/stack.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-stack.Tpo $(DEPDIR)/libluamisc_a-stack.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/stack.c' object='libluamisc_a-stack.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-stack.o `test -f 'luatexdir/luaprofiler/stack.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/stack.c
+
+libluamisc_a-stack.obj: luatexdir/luaprofiler/stack.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-stack.obj -MD -MP -MF $(DEPDIR)/libluamisc_a-stack.Tpo -c -o libluamisc_a-stack.obj `if test -f 'luatexdir/luaprofiler/stack.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/stack.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/stack.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-stack.Tpo $(DEPDIR)/libluamisc_a-stack.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/stack.c' object='libluamisc_a-stack.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-stack.obj `if test -f 'luatexdir/luaprofiler/stack.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/stack.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/stack.c'; fi`
+
 libluamisc_a-luazip.o: luatexdir/luazip/src/luazip.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-luazip.o -MD -MP -MF $(DEPDIR)/libluamisc_a-luazip.Tpo -c -o libluamisc_a-luazip.o `test -f 'luatexdir/luazip/src/luazip.c' || echo '$(srcdir)/'`luatexdir/luazip/src/luazip.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-luazip.Tpo $(DEPDIR)/libluamisc_a-luazip.Po
@@ -3299,33 +3810,201 @@ libluamisc_a-slnudata.obj: luatexdir/slnunicode/slnudata.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-slnudata.obj `if test -f 'luatexdir/slnunicode/slnudata.c'; then $(CYGPATH_W) 'luatexdir/slnunicode/slnudata.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/slnunicode/slnudata.c'; fi`
 
-libluatex_a-avl.o: luatexdir/avl.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-avl.o -MD -MP -MF $(DEPDIR)/libluatex_a-avl.Tpo -c -o libluatex_a-avl.o `test -f 'luatexdir/avl.c' || echo '$(srcdir)/'`luatexdir/avl.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-avl.Tpo $(DEPDIR)/libluatex_a-avl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/avl.c' object='libluatex_a-avl.o' libtool=no @AMDEPBACKSLASH@
+libluasocket_a-auxiliar.o: luatexdir/luasocket/src/auxiliar.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-auxiliar.o -MD -MP -MF $(DEPDIR)/libluasocket_a-auxiliar.Tpo -c -o libluasocket_a-auxiliar.o `test -f 'luatexdir/luasocket/src/auxiliar.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/auxiliar.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-auxiliar.Tpo $(DEPDIR)/libluasocket_a-auxiliar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/auxiliar.c' object='libluasocket_a-auxiliar.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-avl.o `test -f 'luatexdir/avl.c' || echo '$(srcdir)/'`luatexdir/avl.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-auxiliar.o `test -f 'luatexdir/luasocket/src/auxiliar.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/auxiliar.c
 
-libluatex_a-avl.obj: luatexdir/avl.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-avl.obj -MD -MP -MF $(DEPDIR)/libluatex_a-avl.Tpo -c -o libluatex_a-avl.obj `if test -f 'luatexdir/avl.c'; then $(CYGPATH_W) 'luatexdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/avl.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-avl.Tpo $(DEPDIR)/libluatex_a-avl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/avl.c' object='libluatex_a-avl.obj' libtool=no @AMDEPBACKSLASH@
+libluasocket_a-auxiliar.obj: luatexdir/luasocket/src/auxiliar.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-auxiliar.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-auxiliar.Tpo -c -o libluasocket_a-auxiliar.obj `if test -f 'luatexdir/luasocket/src/auxiliar.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/auxiliar.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/auxiliar.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-auxiliar.Tpo $(DEPDIR)/libluasocket_a-auxiliar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/auxiliar.c' object='libluasocket_a-auxiliar.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-avl.obj `if test -f 'luatexdir/avl.c'; then $(CYGPATH_W) 'luatexdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/avl.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-auxiliar.obj `if test -f 'luatexdir/luasocket/src/auxiliar.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/auxiliar.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/auxiliar.c'; fi`
 
-libluatex_a-avlstuff.o: luatexdir/avlstuff.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-avlstuff.o -MD -MP -MF $(DEPDIR)/libluatex_a-avlstuff.Tpo -c -o libluatex_a-avlstuff.o `test -f 'luatexdir/avlstuff.c' || echo '$(srcdir)/'`luatexdir/avlstuff.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-avlstuff.Tpo $(DEPDIR)/libluatex_a-avlstuff.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/avlstuff.c' object='libluatex_a-avlstuff.o' libtool=no @AMDEPBACKSLASH@
+libluasocket_a-buffer.o: luatexdir/luasocket/src/buffer.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-buffer.o -MD -MP -MF $(DEPDIR)/libluasocket_a-buffer.Tpo -c -o libluasocket_a-buffer.o `test -f 'luatexdir/luasocket/src/buffer.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/buffer.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-buffer.Tpo $(DEPDIR)/libluasocket_a-buffer.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/buffer.c' object='libluasocket_a-buffer.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-avlstuff.o `test -f 'luatexdir/avlstuff.c' || echo '$(srcdir)/'`luatexdir/avlstuff.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-buffer.o `test -f 'luatexdir/luasocket/src/buffer.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/buffer.c
 
-libluatex_a-avlstuff.obj: luatexdir/avlstuff.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-avlstuff.obj -MD -MP -MF $(DEPDIR)/libluatex_a-avlstuff.Tpo -c -o libluatex_a-avlstuff.obj `if test -f 'luatexdir/avlstuff.c'; then $(CYGPATH_W) 'luatexdir/avlstuff.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/avlstuff.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-avlstuff.Tpo $(DEPDIR)/libluatex_a-avlstuff.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/avlstuff.c' object='libluatex_a-avlstuff.obj' libtool=no @AMDEPBACKSLASH@
+libluasocket_a-buffer.obj: luatexdir/luasocket/src/buffer.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-buffer.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-buffer.Tpo -c -o libluasocket_a-buffer.obj `if test -f 'luatexdir/luasocket/src/buffer.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/buffer.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/buffer.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-buffer.Tpo $(DEPDIR)/libluasocket_a-buffer.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/buffer.c' object='libluasocket_a-buffer.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-buffer.obj `if test -f 'luatexdir/luasocket/src/buffer.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/buffer.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/buffer.c'; fi`
+
+libluasocket_a-except.o: luatexdir/luasocket/src/except.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-except.o -MD -MP -MF $(DEPDIR)/libluasocket_a-except.Tpo -c -o libluasocket_a-except.o `test -f 'luatexdir/luasocket/src/except.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/except.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-except.Tpo $(DEPDIR)/libluasocket_a-except.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/except.c' object='libluasocket_a-except.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-except.o `test -f 'luatexdir/luasocket/src/except.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/except.c
+
+libluasocket_a-except.obj: luatexdir/luasocket/src/except.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-except.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-except.Tpo -c -o libluasocket_a-except.obj `if test -f 'luatexdir/luasocket/src/except.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/except.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/except.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-except.Tpo $(DEPDIR)/libluasocket_a-except.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/except.c' object='libluasocket_a-except.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-except.obj `if test -f 'luatexdir/luasocket/src/except.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/except.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/except.c'; fi`
+
+libluasocket_a-inet.o: luatexdir/luasocket/src/inet.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-inet.o -MD -MP -MF $(DEPDIR)/libluasocket_a-inet.Tpo -c -o libluasocket_a-inet.o `test -f 'luatexdir/luasocket/src/inet.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/inet.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-inet.Tpo $(DEPDIR)/libluasocket_a-inet.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/inet.c' object='libluasocket_a-inet.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-inet.o `test -f 'luatexdir/luasocket/src/inet.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/inet.c
+
+libluasocket_a-inet.obj: luatexdir/luasocket/src/inet.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-inet.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-inet.Tpo -c -o libluasocket_a-inet.obj `if test -f 'luatexdir/luasocket/src/inet.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/inet.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/inet.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-inet.Tpo $(DEPDIR)/libluasocket_a-inet.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/inet.c' object='libluasocket_a-inet.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-inet.obj `if test -f 'luatexdir/luasocket/src/inet.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/inet.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/inet.c'; fi`
+
+libluasocket_a-io.o: luatexdir/luasocket/src/io.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-io.o -MD -MP -MF $(DEPDIR)/libluasocket_a-io.Tpo -c -o libluasocket_a-io.o `test -f 'luatexdir/luasocket/src/io.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/io.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-io.Tpo $(DEPDIR)/libluasocket_a-io.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/io.c' object='libluasocket_a-io.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-io.o `test -f 'luatexdir/luasocket/src/io.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/io.c
+
+libluasocket_a-io.obj: luatexdir/luasocket/src/io.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-io.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-io.Tpo -c -o libluasocket_a-io.obj `if test -f 'luatexdir/luasocket/src/io.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/io.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/io.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-io.Tpo $(DEPDIR)/libluasocket_a-io.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/io.c' object='libluasocket_a-io.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-io.obj `if test -f 'luatexdir/luasocket/src/io.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/io.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/io.c'; fi`
+
+libluasocket_a-lua_preload.o: luatexdir/luasocket/src/lua_preload.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-lua_preload.o -MD -MP -MF $(DEPDIR)/libluasocket_a-lua_preload.Tpo -c -o libluasocket_a-lua_preload.o `test -f 'luatexdir/luasocket/src/lua_preload.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/lua_preload.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-lua_preload.Tpo $(DEPDIR)/libluasocket_a-lua_preload.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/lua_preload.c' object='libluasocket_a-lua_preload.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-lua_preload.o `test -f 'luatexdir/luasocket/src/lua_preload.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/lua_preload.c
+
+libluasocket_a-lua_preload.obj: luatexdir/luasocket/src/lua_preload.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-lua_preload.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-lua_preload.Tpo -c -o libluasocket_a-lua_preload.obj `if test -f 'luatexdir/luasocket/src/lua_preload.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/lua_preload.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/lua_preload.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-lua_preload.Tpo $(DEPDIR)/libluasocket_a-lua_preload.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/lua_preload.c' object='libluasocket_a-lua_preload.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-lua_preload.obj `if test -f 'luatexdir/luasocket/src/lua_preload.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/lua_preload.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/lua_preload.c'; fi`
+
+libluasocket_a-luasocket.o: luatexdir/luasocket/src/luasocket.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-luasocket.o -MD -MP -MF $(DEPDIR)/libluasocket_a-luasocket.Tpo -c -o libluasocket_a-luasocket.o `test -f 'luatexdir/luasocket/src/luasocket.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/luasocket.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-luasocket.Tpo $(DEPDIR)/libluasocket_a-luasocket.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/luasocket.c' object='libluasocket_a-luasocket.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-luasocket.o `test -f 'luatexdir/luasocket/src/luasocket.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/luasocket.c
+
+libluasocket_a-luasocket.obj: luatexdir/luasocket/src/luasocket.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-luasocket.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-luasocket.Tpo -c -o libluasocket_a-luasocket.obj `if test -f 'luatexdir/luasocket/src/luasocket.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/luasocket.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/luasocket.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-luasocket.Tpo $(DEPDIR)/libluasocket_a-luasocket.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/luasocket.c' object='libluasocket_a-luasocket.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-luasocket.obj `if test -f 'luatexdir/luasocket/src/luasocket.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/luasocket.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/luasocket.c'; fi`
+
+libluasocket_a-mime.o: luatexdir/luasocket/src/mime.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-mime.o -MD -MP -MF $(DEPDIR)/libluasocket_a-mime.Tpo -c -o libluasocket_a-mime.o `test -f 'luatexdir/luasocket/src/mime.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/mime.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-mime.Tpo $(DEPDIR)/libluasocket_a-mime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/mime.c' object='libluasocket_a-mime.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-mime.o `test -f 'luatexdir/luasocket/src/mime.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/mime.c
+
+libluasocket_a-mime.obj: luatexdir/luasocket/src/mime.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-mime.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-mime.Tpo -c -o libluasocket_a-mime.obj `if test -f 'luatexdir/luasocket/src/mime.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/mime.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/mime.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-mime.Tpo $(DEPDIR)/libluasocket_a-mime.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/mime.c' object='libluasocket_a-mime.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-mime.obj `if test -f 'luatexdir/luasocket/src/mime.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/mime.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/mime.c'; fi`
+
+libluasocket_a-options.o: luatexdir/luasocket/src/options.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-options.o -MD -MP -MF $(DEPDIR)/libluasocket_a-options.Tpo -c -o libluasocket_a-options.o `test -f 'luatexdir/luasocket/src/options.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/options.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-options.Tpo $(DEPDIR)/libluasocket_a-options.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/options.c' object='libluasocket_a-options.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-options.o `test -f 'luatexdir/luasocket/src/options.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/options.c
+
+libluasocket_a-options.obj: luatexdir/luasocket/src/options.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-options.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-options.Tpo -c -o libluasocket_a-options.obj `if test -f 'luatexdir/luasocket/src/options.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/options.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/options.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-options.Tpo $(DEPDIR)/libluasocket_a-options.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/options.c' object='libluasocket_a-options.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-options.obj `if test -f 'luatexdir/luasocket/src/options.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/options.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/options.c'; fi`
+
+libluasocket_a-select.o: luatexdir/luasocket/src/select.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-select.o -MD -MP -MF $(DEPDIR)/libluasocket_a-select.Tpo -c -o libluasocket_a-select.o `test -f 'luatexdir/luasocket/src/select.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/select.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-select.Tpo $(DEPDIR)/libluasocket_a-select.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/select.c' object='libluasocket_a-select.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-avlstuff.obj `if test -f 'luatexdir/avlstuff.c'; then $(CYGPATH_W) 'luatexdir/avlstuff.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/avlstuff.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-select.o `test -f 'luatexdir/luasocket/src/select.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/select.c
+
+libluasocket_a-select.obj: luatexdir/luasocket/src/select.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-select.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-select.Tpo -c -o libluasocket_a-select.obj `if test -f 'luatexdir/luasocket/src/select.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/select.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/select.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-select.Tpo $(DEPDIR)/libluasocket_a-select.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/select.c' object='libluasocket_a-select.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-select.obj `if test -f 'luatexdir/luasocket/src/select.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/select.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/select.c'; fi`
+
+libluasocket_a-socket.o: luatexdir/luasocket/src/socket.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-socket.o -MD -MP -MF $(DEPDIR)/libluasocket_a-socket.Tpo -c -o libluasocket_a-socket.o `test -f 'luatexdir/luasocket/src/socket.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/socket.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-socket.Tpo $(DEPDIR)/libluasocket_a-socket.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/socket.c' object='libluasocket_a-socket.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-socket.o `test -f 'luatexdir/luasocket/src/socket.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/socket.c
+
+libluasocket_a-socket.obj: luatexdir/luasocket/src/socket.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-socket.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-socket.Tpo -c -o libluasocket_a-socket.obj `if test -f 'luatexdir/luasocket/src/socket.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/socket.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/socket.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-socket.Tpo $(DEPDIR)/libluasocket_a-socket.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/socket.c' object='libluasocket_a-socket.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-socket.obj `if test -f 'luatexdir/luasocket/src/socket.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/socket.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/socket.c'; fi`
+
+libluasocket_a-tcp.o: luatexdir/luasocket/src/tcp.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-tcp.o -MD -MP -MF $(DEPDIR)/libluasocket_a-tcp.Tpo -c -o libluasocket_a-tcp.o `test -f 'luatexdir/luasocket/src/tcp.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/tcp.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-tcp.Tpo $(DEPDIR)/libluasocket_a-tcp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/tcp.c' object='libluasocket_a-tcp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-tcp.o `test -f 'luatexdir/luasocket/src/tcp.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/tcp.c
+
+libluasocket_a-tcp.obj: luatexdir/luasocket/src/tcp.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-tcp.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-tcp.Tpo -c -o libluasocket_a-tcp.obj `if test -f 'luatexdir/luasocket/src/tcp.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/tcp.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/tcp.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-tcp.Tpo $(DEPDIR)/libluasocket_a-tcp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/tcp.c' object='libluasocket_a-tcp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-tcp.obj `if test -f 'luatexdir/luasocket/src/tcp.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/tcp.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/tcp.c'; fi`
+
+libluasocket_a-timeout.o: luatexdir/luasocket/src/timeout.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-timeout.o -MD -MP -MF $(DEPDIR)/libluasocket_a-timeout.Tpo -c -o libluasocket_a-timeout.o `test -f 'luatexdir/luasocket/src/timeout.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/timeout.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-timeout.Tpo $(DEPDIR)/libluasocket_a-timeout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/timeout.c' object='libluasocket_a-timeout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-timeout.o `test -f 'luatexdir/luasocket/src/timeout.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/timeout.c
+
+libluasocket_a-timeout.obj: luatexdir/luasocket/src/timeout.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-timeout.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-timeout.Tpo -c -o libluasocket_a-timeout.obj `if test -f 'luatexdir/luasocket/src/timeout.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/timeout.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/timeout.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-timeout.Tpo $(DEPDIR)/libluasocket_a-timeout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/timeout.c' object='libluasocket_a-timeout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-timeout.obj `if test -f 'luatexdir/luasocket/src/timeout.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/timeout.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/timeout.c'; fi`
+
+libluasocket_a-udp.o: luatexdir/luasocket/src/udp.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-udp.o -MD -MP -MF $(DEPDIR)/libluasocket_a-udp.Tpo -c -o libluasocket_a-udp.o `test -f 'luatexdir/luasocket/src/udp.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/udp.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-udp.Tpo $(DEPDIR)/libluasocket_a-udp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/udp.c' object='libluasocket_a-udp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-udp.o `test -f 'luatexdir/luasocket/src/udp.c' || echo '$(srcdir)/'`luatexdir/luasocket/src/udp.c
+
+libluasocket_a-udp.obj: luatexdir/luasocket/src/udp.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluasocket_a-udp.obj -MD -MP -MF $(DEPDIR)/libluasocket_a-udp.Tpo -c -o libluasocket_a-udp.obj `if test -f 'luatexdir/luasocket/src/udp.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/udp.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/udp.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluasocket_a-udp.Tpo $(DEPDIR)/libluasocket_a-udp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luasocket/src/udp.c' object='libluasocket_a-udp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluasocket_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluasocket_a-udp.obj `if test -f 'luatexdir/luasocket/src/udp.c'; then $(CYGPATH_W) 'luatexdir/luasocket/src/udp.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luasocket/src/udp.c'; fi`
 
 libluatex_a-dofont.o: luatexdir/font/dofont.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-dofont.o -MD -MP -MF $(DEPDIR)/libluatex_a-dofont.Tpo -c -o libluatex_a-dofont.o `test -f 'luatexdir/font/dofont.c' || echo '$(srcdir)/'`luatexdir/font/dofont.c
@@ -3817,20 +4496,6 @@ libluatex_a-llualib.obj: luatexdir/lua/llualib.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-llualib.obj `if test -f 'luatexdir/lua/llualib.c'; then $(CYGPATH_W) 'luatexdir/lua/llualib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/llualib.c'; fi`
 
-libluatex_a-lmplib.o: luatexdir/lua/lmplib.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.o -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.o `test -f 'luatexdir/lua/lmplib.c' || echo '$(srcdir)/'`luatexdir/lua/lmplib.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/lua/lmplib.c' object='libluatex_a-lmplib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.o `test -f 'luatexdir/lua/lmplib.c' || echo '$(srcdir)/'`luatexdir/lua/lmplib.c
-
-libluatex_a-lmplib.obj: luatexdir/lua/lmplib.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.obj -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.obj `if test -f 'luatexdir/lua/lmplib.c'; then $(CYGPATH_W) 'luatexdir/lua/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/lmplib.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/lua/lmplib.c' object='libluatex_a-lmplib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.obj `if test -f 'luatexdir/lua/lmplib.c'; then $(CYGPATH_W) 'luatexdir/lua/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/lmplib.c'; fi`
-
 libluatex_a-lnodelib.o: luatexdir/lua/lnodelib.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lnodelib.o -MD -MP -MF $(DEPDIR)/libluatex_a-lnodelib.Tpo -c -o libluatex_a-lnodelib.o `test -f 'luatexdir/lua/lnodelib.c' || echo '$(srcdir)/'`luatexdir/lua/lnodelib.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-lnodelib.Tpo $(DEPDIR)/libluatex_a-lnodelib.Po
@@ -4013,6 +4678,20 @@ libluatex_a-texluac.obj: luatexdir/lua/texluac.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-texluac.obj `if test -f 'luatexdir/lua/texluac.c'; then $(CYGPATH_W) 'luatexdir/lua/texluac.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/texluac.c'; fi`
 
+libluatex_a-makecpool.o: luatexdir/makecpool.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-makecpool.o -MD -MP -MF $(DEPDIR)/libluatex_a-makecpool.Tpo -c -o libluatex_a-makecpool.o `test -f 'luatexdir/makecpool.c' || echo '$(srcdir)/'`luatexdir/makecpool.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-makecpool.Tpo $(DEPDIR)/libluatex_a-makecpool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/makecpool.c' object='libluatex_a-makecpool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-makecpool.o `test -f 'luatexdir/makecpool.c' || echo '$(srcdir)/'`luatexdir/makecpool.c
+
+libluatex_a-makecpool.obj: luatexdir/makecpool.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-makecpool.obj -MD -MP -MF $(DEPDIR)/libluatex_a-makecpool.Tpo -c -o libluatex_a-makecpool.obj `if test -f 'luatexdir/makecpool.c'; then $(CYGPATH_W) 'luatexdir/makecpool.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/makecpool.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-makecpool.Tpo $(DEPDIR)/libluatex_a-makecpool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/makecpool.c' object='libluatex_a-makecpool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-makecpool.obj `if test -f 'luatexdir/makecpool.c'; then $(CYGPATH_W) 'luatexdir/makecpool.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/makecpool.c'; fi`
+
 libluatex_a-managed-sa.o: luatexdir/managed-sa.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-managed-sa.o -MD -MP -MF $(DEPDIR)/libluatex_a-managed-sa.Tpo -c -o libluatex_a-managed-sa.o `test -f 'luatexdir/managed-sa.c' || echo '$(srcdir)/'`luatexdir/managed-sa.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-managed-sa.Tpo $(DEPDIR)/libluatex_a-managed-sa.Po
@@ -4041,6 +4720,62 @@ libluatex_a-mathcodes.obj: luatexdir/mathcodes.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-mathcodes.obj `if test -f 'luatexdir/mathcodes.c'; then $(CYGPATH_W) 'luatexdir/mathcodes.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/mathcodes.c'; fi`
 
+libluatex_a-lmplib.o: luatexdir/mp/lmplib.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.o -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.o `test -f 'luatexdir/mp/lmplib.c' || echo '$(srcdir)/'`luatexdir/mp/lmplib.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/mp/lmplib.c' object='libluatex_a-lmplib.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.o `test -f 'luatexdir/mp/lmplib.c' || echo '$(srcdir)/'`luatexdir/mp/lmplib.c
+
+libluatex_a-lmplib.obj: luatexdir/mp/lmplib.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.obj -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.obj `if test -f 'luatexdir/mp/lmplib.c'; then $(CYGPATH_W) 'luatexdir/mp/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/mp/lmplib.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/mp/lmplib.c' object='libluatex_a-lmplib.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.obj `if test -f 'luatexdir/mp/lmplib.c'; then $(CYGPATH_W) 'luatexdir/mp/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/mp/lmplib.c'; fi`
+
+libluatex_a-pagetree.o: luatexdir/pdf/pagetree.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pagetree.o -MD -MP -MF $(DEPDIR)/libluatex_a-pagetree.Tpo -c -o libluatex_a-pagetree.o `test -f 'luatexdir/pdf/pagetree.c' || echo '$(srcdir)/'`luatexdir/pdf/pagetree.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-pagetree.Tpo $(DEPDIR)/libluatex_a-pagetree.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/pdf/pagetree.c' object='libluatex_a-pagetree.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pagetree.o `test -f 'luatexdir/pdf/pagetree.c' || echo '$(srcdir)/'`luatexdir/pdf/pagetree.c
+
+libluatex_a-pagetree.obj: luatexdir/pdf/pagetree.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pagetree.obj -MD -MP -MF $(DEPDIR)/libluatex_a-pagetree.Tpo -c -o libluatex_a-pagetree.obj `if test -f 'luatexdir/pdf/pagetree.c'; then $(CYGPATH_W) 'luatexdir/pdf/pagetree.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/pdf/pagetree.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-pagetree.Tpo $(DEPDIR)/libluatex_a-pagetree.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/pdf/pagetree.c' object='libluatex_a-pagetree.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pagetree.obj `if test -f 'luatexdir/pdf/pagetree.c'; then $(CYGPATH_W) 'luatexdir/pdf/pagetree.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/pdf/pagetree.c'; fi`
+
+libluatex_a-pdfpage.o: luatexdir/pdf/pdfpage.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pdfpage.o -MD -MP -MF $(DEPDIR)/libluatex_a-pdfpage.Tpo -c -o libluatex_a-pdfpage.o `test -f 'luatexdir/pdf/pdfpage.c' || echo '$(srcdir)/'`luatexdir/pdf/pdfpage.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-pdfpage.Tpo $(DEPDIR)/libluatex_a-pdfpage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/pdf/pdfpage.c' object='libluatex_a-pdfpage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdfpage.o `test -f 'luatexdir/pdf/pdfpage.c' || echo '$(srcdir)/'`luatexdir/pdf/pdfpage.c
+
+libluatex_a-pdfpage.obj: luatexdir/pdf/pdfpage.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pdfpage.obj -MD -MP -MF $(DEPDIR)/libluatex_a-pdfpage.Tpo -c -o libluatex_a-pdfpage.obj `if test -f 'luatexdir/pdf/pdfpage.c'; then $(CYGPATH_W) 'luatexdir/pdf/pdfpage.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/pdf/pdfpage.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-pdfpage.Tpo $(DEPDIR)/libluatex_a-pdfpage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/pdf/pdfpage.c' object='libluatex_a-pdfpage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdfpage.obj `if test -f 'luatexdir/pdf/pdfpage.c'; then $(CYGPATH_W) 'luatexdir/pdf/pdfpage.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/pdf/pdfpage.c'; fi`
+
+libluatex_a-filename.o: luatexdir/tex/filename.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-filename.o -MD -MP -MF $(DEPDIR)/libluatex_a-filename.Tpo -c -o libluatex_a-filename.o `test -f 'luatexdir/tex/filename.c' || echo '$(srcdir)/'`luatexdir/tex/filename.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-filename.Tpo $(DEPDIR)/libluatex_a-filename.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tex/filename.c' object='libluatex_a-filename.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-filename.o `test -f 'luatexdir/tex/filename.c' || echo '$(srcdir)/'`luatexdir/tex/filename.c
+
+libluatex_a-filename.obj: luatexdir/tex/filename.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-filename.obj -MD -MP -MF $(DEPDIR)/libluatex_a-filename.Tpo -c -o libluatex_a-filename.obj `if test -f 'luatexdir/tex/filename.c'; then $(CYGPATH_W) 'luatexdir/tex/filename.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/filename.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-filename.Tpo $(DEPDIR)/libluatex_a-filename.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tex/filename.c' object='libluatex_a-filename.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-filename.obj `if test -f 'luatexdir/tex/filename.c'; then $(CYGPATH_W) 'luatexdir/tex/filename.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/filename.c'; fi`
+
 libluatex_a-linebreak.o: luatexdir/tex/linebreak.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-linebreak.o -MD -MP -MF $(DEPDIR)/libluatex_a-linebreak.Tpo -c -o libluatex_a-linebreak.o `test -f 'luatexdir/tex/linebreak.c' || echo '$(srcdir)/'`luatexdir/tex/linebreak.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-linebreak.Tpo $(DEPDIR)/libluatex_a-linebreak.Po
@@ -4055,6 +4790,34 @@ libluatex_a-linebreak.obj: luatexdir/tex/linebreak.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-linebreak.obj `if test -f 'luatexdir/tex/linebreak.c'; then $(CYGPATH_W) 'luatexdir/tex/linebreak.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/linebreak.c'; fi`
 
+libluatex_a-math.o: luatexdir/tex/math.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-math.o -MD -MP -MF $(DEPDIR)/libluatex_a-math.Tpo -c -o libluatex_a-math.o `test -f 'luatexdir/tex/math.c' || echo '$(srcdir)/'`luatexdir/tex/math.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-math.Tpo $(DEPDIR)/libluatex_a-math.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tex/math.c' object='libluatex_a-math.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-math.o `test -f 'luatexdir/tex/math.c' || echo '$(srcdir)/'`luatexdir/tex/math.c
+
+libluatex_a-math.obj: luatexdir/tex/math.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-math.obj -MD -MP -MF $(DEPDIR)/libluatex_a-math.Tpo -c -o libluatex_a-math.obj `if test -f 'luatexdir/tex/math.c'; then $(CYGPATH_W) 'luatexdir/tex/math.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/math.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-math.Tpo $(DEPDIR)/libluatex_a-math.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tex/math.c' object='libluatex_a-math.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-math.obj `if test -f 'luatexdir/tex/math.c'; then $(CYGPATH_W) 'luatexdir/tex/math.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/math.c'; fi`
+
+libluatex_a-mlist.o: luatexdir/tex/mlist.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-mlist.o -MD -MP -MF $(DEPDIR)/libluatex_a-mlist.Tpo -c -o libluatex_a-mlist.o `test -f 'luatexdir/tex/mlist.c' || echo '$(srcdir)/'`luatexdir/tex/mlist.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-mlist.Tpo $(DEPDIR)/libluatex_a-mlist.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tex/mlist.c' object='libluatex_a-mlist.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-mlist.o `test -f 'luatexdir/tex/mlist.c' || echo '$(srcdir)/'`luatexdir/tex/mlist.c
+
+libluatex_a-mlist.obj: luatexdir/tex/mlist.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-mlist.obj -MD -MP -MF $(DEPDIR)/libluatex_a-mlist.Tpo -c -o libluatex_a-mlist.obj `if test -f 'luatexdir/tex/mlist.c'; then $(CYGPATH_W) 'luatexdir/tex/mlist.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/mlist.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-mlist.Tpo $(DEPDIR)/libluatex_a-mlist.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tex/mlist.c' object='libluatex_a-mlist.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-mlist.obj `if test -f 'luatexdir/tex/mlist.c'; then $(CYGPATH_W) 'luatexdir/tex/mlist.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/mlist.c'; fi`
+
 libluatex_a-postlinebreak.o: luatexdir/tex/postlinebreak.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-postlinebreak.o -MD -MP -MF $(DEPDIR)/libluatex_a-postlinebreak.Tpo -c -o libluatex_a-postlinebreak.o `test -f 'luatexdir/tex/postlinebreak.c' || echo '$(srcdir)/'`luatexdir/tex/postlinebreak.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-postlinebreak.Tpo $(DEPDIR)/libluatex_a-postlinebreak.Po
@@ -4069,6 +4832,34 @@ libluatex_a-postlinebreak.obj: luatexdir/tex/postlinebreak.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-postlinebreak.obj `if test -f 'luatexdir/tex/postlinebreak.c'; then $(CYGPATH_W) 'luatexdir/tex/postlinebreak.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/postlinebreak.c'; fi`
 
+libluatex_a-primitive.o: luatexdir/tex/primitive.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-primitive.o -MD -MP -MF $(DEPDIR)/libluatex_a-primitive.Tpo -c -o libluatex_a-primitive.o `test -f 'luatexdir/tex/primitive.c' || echo '$(srcdir)/'`luatexdir/tex/primitive.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-primitive.Tpo $(DEPDIR)/libluatex_a-primitive.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tex/primitive.c' object='libluatex_a-primitive.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-primitive.o `test -f 'luatexdir/tex/primitive.c' || echo '$(srcdir)/'`luatexdir/tex/primitive.c
+
+libluatex_a-primitive.obj: luatexdir/tex/primitive.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-primitive.obj -MD -MP -MF $(DEPDIR)/libluatex_a-primitive.Tpo -c -o libluatex_a-primitive.obj `if test -f 'luatexdir/tex/primitive.c'; then $(CYGPATH_W) 'luatexdir/tex/primitive.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/primitive.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-primitive.Tpo $(DEPDIR)/libluatex_a-primitive.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tex/primitive.c' object='libluatex_a-primitive.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-primitive.obj `if test -f 'luatexdir/tex/primitive.c'; then $(CYGPATH_W) 'luatexdir/tex/primitive.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/primitive.c'; fi`
+
+libluatex_a-texdeffont.o: luatexdir/tex/texdeffont.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-texdeffont.o -MD -MP -MF $(DEPDIR)/libluatex_a-texdeffont.Tpo -c -o libluatex_a-texdeffont.o `test -f 'luatexdir/tex/texdeffont.c' || echo '$(srcdir)/'`luatexdir/tex/texdeffont.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-texdeffont.Tpo $(DEPDIR)/libluatex_a-texdeffont.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tex/texdeffont.c' object='libluatex_a-texdeffont.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-texdeffont.o `test -f 'luatexdir/tex/texdeffont.c' || echo '$(srcdir)/'`luatexdir/tex/texdeffont.c
+
+libluatex_a-texdeffont.obj: luatexdir/tex/texdeffont.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-texdeffont.obj -MD -MP -MF $(DEPDIR)/libluatex_a-texdeffont.Tpo -c -o libluatex_a-texdeffont.obj `if test -f 'luatexdir/tex/texdeffont.c'; then $(CYGPATH_W) 'luatexdir/tex/texdeffont.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/texdeffont.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-texdeffont.Tpo $(DEPDIR)/libluatex_a-texdeffont.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tex/texdeffont.c' object='libluatex_a-texdeffont.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-texdeffont.obj `if test -f 'luatexdir/tex/texdeffont.c'; then $(CYGPATH_W) 'luatexdir/tex/texdeffont.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tex/texdeffont.c'; fi`
+
 libluatex_a-texnodes.o: luatexdir/tex/texnodes.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-texnodes.o -MD -MP -MF $(DEPDIR)/libluatex_a-texnodes.Tpo -c -o libluatex_a-texnodes.o `test -f 'luatexdir/tex/texnodes.c' || echo '$(srcdir)/'`luatexdir/tex/texnodes.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-texnodes.Tpo $(DEPDIR)/libluatex_a-texnodes.Po
@@ -4125,33 +4916,75 @@ libluatex_a-textcodes.obj: luatexdir/textcodes.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-textcodes.obj `if test -f 'luatexdir/textcodes.c'; then $(CYGPATH_W) 'luatexdir/textcodes.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/textcodes.c'; fi`
 
-libluatex_a-utils.o: luatexdir/utils.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-utils.o -MD -MP -MF $(DEPDIR)/libluatex_a-utils.Tpo -c -o libluatex_a-utils.o `test -f 'luatexdir/utils.c' || echo '$(srcdir)/'`luatexdir/utils.c
+libluatex_a-avl.o: luatexdir/utils/avl.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-avl.o -MD -MP -MF $(DEPDIR)/libluatex_a-avl.Tpo -c -o libluatex_a-avl.o `test -f 'luatexdir/utils/avl.c' || echo '$(srcdir)/'`luatexdir/utils/avl.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-avl.Tpo $(DEPDIR)/libluatex_a-avl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils/avl.c' object='libluatex_a-avl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-avl.o `test -f 'luatexdir/utils/avl.c' || echo '$(srcdir)/'`luatexdir/utils/avl.c
+
+libluatex_a-avl.obj: luatexdir/utils/avl.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-avl.obj -MD -MP -MF $(DEPDIR)/libluatex_a-avl.Tpo -c -o libluatex_a-avl.obj `if test -f 'luatexdir/utils/avl.c'; then $(CYGPATH_W) 'luatexdir/utils/avl.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils/avl.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-avl.Tpo $(DEPDIR)/libluatex_a-avl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils/avl.c' object='libluatex_a-avl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-avl.obj `if test -f 'luatexdir/utils/avl.c'; then $(CYGPATH_W) 'luatexdir/utils/avl.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils/avl.c'; fi`
+
+libluatex_a-avlstuff.o: luatexdir/utils/avlstuff.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-avlstuff.o -MD -MP -MF $(DEPDIR)/libluatex_a-avlstuff.Tpo -c -o libluatex_a-avlstuff.o `test -f 'luatexdir/utils/avlstuff.c' || echo '$(srcdir)/'`luatexdir/utils/avlstuff.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-avlstuff.Tpo $(DEPDIR)/libluatex_a-avlstuff.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils/avlstuff.c' object='libluatex_a-avlstuff.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-avlstuff.o `test -f 'luatexdir/utils/avlstuff.c' || echo '$(srcdir)/'`luatexdir/utils/avlstuff.c
+
+libluatex_a-avlstuff.obj: luatexdir/utils/avlstuff.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-avlstuff.obj -MD -MP -MF $(DEPDIR)/libluatex_a-avlstuff.Tpo -c -o libluatex_a-avlstuff.obj `if test -f 'luatexdir/utils/avlstuff.c'; then $(CYGPATH_W) 'luatexdir/utils/avlstuff.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils/avlstuff.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-avlstuff.Tpo $(DEPDIR)/libluatex_a-avlstuff.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils/avlstuff.c' object='libluatex_a-avlstuff.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-avlstuff.obj `if test -f 'luatexdir/utils/avlstuff.c'; then $(CYGPATH_W) 'luatexdir/utils/avlstuff.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils/avlstuff.c'; fi`
+
+libluatex_a-synctex.o: luatexdir/utils/synctex.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-synctex.o -MD -MP -MF $(DEPDIR)/libluatex_a-synctex.Tpo -c -o libluatex_a-synctex.o `test -f 'luatexdir/utils/synctex.c' || echo '$(srcdir)/'`luatexdir/utils/synctex.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-synctex.Tpo $(DEPDIR)/libluatex_a-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils/synctex.c' object='libluatex_a-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-synctex.o `test -f 'luatexdir/utils/synctex.c' || echo '$(srcdir)/'`luatexdir/utils/synctex.c
+
+libluatex_a-synctex.obj: luatexdir/utils/synctex.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-synctex.obj -MD -MP -MF $(DEPDIR)/libluatex_a-synctex.Tpo -c -o libluatex_a-synctex.obj `if test -f 'luatexdir/utils/synctex.c'; then $(CYGPATH_W) 'luatexdir/utils/synctex.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils/synctex.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-synctex.Tpo $(DEPDIR)/libluatex_a-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils/synctex.c' object='libluatex_a-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-synctex.obj `if test -f 'luatexdir/utils/synctex.c'; then $(CYGPATH_W) 'luatexdir/utils/synctex.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils/synctex.c'; fi`
+
+libluatex_a-utils.o: luatexdir/utils/utils.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-utils.o -MD -MP -MF $(DEPDIR)/libluatex_a-utils.Tpo -c -o libluatex_a-utils.o `test -f 'luatexdir/utils/utils.c' || echo '$(srcdir)/'`luatexdir/utils/utils.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-utils.Tpo $(DEPDIR)/libluatex_a-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils.c' object='libluatex_a-utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils/utils.c' object='libluatex_a-utils.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-utils.o `test -f 'luatexdir/utils.c' || echo '$(srcdir)/'`luatexdir/utils.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-utils.o `test -f 'luatexdir/utils/utils.c' || echo '$(srcdir)/'`luatexdir/utils/utils.c
 
-libluatex_a-utils.obj: luatexdir/utils.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-utils.obj -MD -MP -MF $(DEPDIR)/libluatex_a-utils.Tpo -c -o libluatex_a-utils.obj `if test -f 'luatexdir/utils.c'; then $(CYGPATH_W) 'luatexdir/utils.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils.c'; fi`
+libluatex_a-utils.obj: luatexdir/utils/utils.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-utils.obj -MD -MP -MF $(DEPDIR)/libluatex_a-utils.Tpo -c -o libluatex_a-utils.obj `if test -f 'luatexdir/utils/utils.c'; then $(CYGPATH_W) 'luatexdir/utils/utils.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils/utils.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-utils.Tpo $(DEPDIR)/libluatex_a-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils.c' object='libluatex_a-utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils/utils.c' object='libluatex_a-utils.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-utils.obj `if test -f 'luatexdir/utils.c'; then $(CYGPATH_W) 'luatexdir/utils.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-utils.obj `if test -f 'luatexdir/utils/utils.c'; then $(CYGPATH_W) 'luatexdir/utils/utils.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils/utils.c'; fi`
 
-libluatex_a-writezip.o: luatexdir/writezip.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-writezip.o -MD -MP -MF $(DEPDIR)/libluatex_a-writezip.Tpo -c -o libluatex_a-writezip.o `test -f 'luatexdir/writezip.c' || echo '$(srcdir)/'`luatexdir/writezip.c
+libluatex_a-writezip.o: luatexdir/utils/writezip.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-writezip.o -MD -MP -MF $(DEPDIR)/libluatex_a-writezip.Tpo -c -o libluatex_a-writezip.o `test -f 'luatexdir/utils/writezip.c' || echo '$(srcdir)/'`luatexdir/utils/writezip.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-writezip.Tpo $(DEPDIR)/libluatex_a-writezip.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/writezip.c' object='libluatex_a-writezip.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils/writezip.c' object='libluatex_a-writezip.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-writezip.o `test -f 'luatexdir/writezip.c' || echo '$(srcdir)/'`luatexdir/writezip.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-writezip.o `test -f 'luatexdir/utils/writezip.c' || echo '$(srcdir)/'`luatexdir/utils/writezip.c
 
-libluatex_a-writezip.obj: luatexdir/writezip.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-writezip.obj -MD -MP -MF $(DEPDIR)/libluatex_a-writezip.Tpo -c -o libluatex_a-writezip.obj `if test -f 'luatexdir/writezip.c'; then $(CYGPATH_W) 'luatexdir/writezip.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/writezip.c'; fi`
+libluatex_a-writezip.obj: luatexdir/utils/writezip.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-writezip.obj -MD -MP -MF $(DEPDIR)/libluatex_a-writezip.Tpo -c -o libluatex_a-writezip.obj `if test -f 'luatexdir/utils/writezip.c'; then $(CYGPATH_W) 'luatexdir/utils/writezip.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils/writezip.c'; fi`
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-writezip.Tpo $(DEPDIR)/libluatex_a-writezip.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/writezip.c' object='libluatex_a-writezip.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/utils/writezip.c' object='libluatex_a-writezip.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-writezip.obj `if test -f 'luatexdir/writezip.c'; then $(CYGPATH_W) 'luatexdir/writezip.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/writezip.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-writezip.obj `if test -f 'luatexdir/utils/writezip.c'; then $(CYGPATH_W) 'luatexdir/utils/writezip.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils/writezip.c'; fi`
 
 libluatex_a-macnames.o: luatexdir/font/macnames.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-macnames.o -MD -MP -MF $(DEPDIR)/libluatex_a-macnames.Tpo -c -o libluatex_a-macnames.o `test -f 'luatexdir/font/macnames.c' || echo '$(srcdir)/'`luatexdir/font/macnames.c
@@ -4195,6 +5028,34 @@ libluatex_a-psout.obj: luatexdir/psout.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-psout.obj `if test -f 'luatexdir/psout.c'; then $(CYGPATH_W) 'luatexdir/psout.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/psout.c'; fi`
 
+libluatex_a-memio.o: luatexdir/memio.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-memio.o -MD -MP -MF $(DEPDIR)/libluatex_a-memio.Tpo -c -o libluatex_a-memio.o `test -f 'luatexdir/memio.c' || echo '$(srcdir)/'`luatexdir/memio.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-memio.Tpo $(DEPDIR)/libluatex_a-memio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/memio.c' object='libluatex_a-memio.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-memio.o `test -f 'luatexdir/memio.c' || echo '$(srcdir)/'`luatexdir/memio.c
+
+libluatex_a-memio.obj: luatexdir/memio.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-memio.obj -MD -MP -MF $(DEPDIR)/libluatex_a-memio.Tpo -c -o libluatex_a-memio.obj `if test -f 'luatexdir/memio.c'; then $(CYGPATH_W) 'luatexdir/memio.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/memio.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-memio.Tpo $(DEPDIR)/libluatex_a-memio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/memio.c' object='libluatex_a-memio.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-memio.obj `if test -f 'luatexdir/memio.c'; then $(CYGPATH_W) 'luatexdir/memio.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/memio.c'; fi`
+
+libluatex_a-tfmin.o: luatexdir/tfmin.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-tfmin.o -MD -MP -MF $(DEPDIR)/libluatex_a-tfmin.Tpo -c -o libluatex_a-tfmin.o `test -f 'luatexdir/tfmin.c' || echo '$(srcdir)/'`luatexdir/tfmin.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-tfmin.Tpo $(DEPDIR)/libluatex_a-tfmin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tfmin.c' object='libluatex_a-tfmin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-tfmin.o `test -f 'luatexdir/tfmin.c' || echo '$(srcdir)/'`luatexdir/tfmin.c
+
+libluatex_a-tfmin.obj: luatexdir/tfmin.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-tfmin.obj -MD -MP -MF $(DEPDIR)/libluatex_a-tfmin.Tpo -c -o libluatex_a-tfmin.obj `if test -f 'luatexdir/tfmin.c'; then $(CYGPATH_W) 'luatexdir/tfmin.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tfmin.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-tfmin.Tpo $(DEPDIR)/libluatex_a-tfmin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tfmin.c' object='libluatex_a-tfmin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-tfmin.obj `if test -f 'luatexdir/tfmin.c'; then $(CYGPATH_W) 'luatexdir/tfmin.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tfmin.c'; fi`
+
 libmd5_a-md5.o: libmd5/md5.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmd5_a-md5.o -MD -MP -MF $(DEPDIR)/libmd5_a-md5.Tpo -c -o libmd5_a-md5.o `test -f 'libmd5/md5.c' || echo '$(srcdir)/'`libmd5/md5.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmd5_a-md5.Tpo $(DEPDIR)/libmd5_a-md5.Po
@@ -6374,7 +7235,7 @@ tangleboot.p: tangle.web tangle.ch
 	  cp $(srcdir)/tangleboot.p .; \
 	fi
 	date >stamp-tangle
-	$(MAKE) $(AM_MAKEFLAGS) tangle
+	$(MAKE) $(AM_MAKEFLAGS) tangle$(EXEEXT)
 ctangle.c: ctangleboot cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) ctangle ctang-w2c
 cweb.c: ctangleboot cwebdir/common.w cwebdir/comm-w2c.ch
@@ -6391,7 +7252,7 @@ ctangleboot.c: cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	  cp $(srcdir)/ctangleboot.c .; \
 	fi
 	date >stamp-ctangle
-	$(MAKE) $(AM_MAKEFLAGS) ctangle
+	$(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT)
 cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
 	if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
 	  CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) common comm-w2c cweb.c; \
@@ -6402,7 +7263,7 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
 	  cp $(srcdir)/cwebboot.c .; \
 	fi
 	date >stamp-ctangle
-	$(MAKE) $(AM_MAKEFLAGS) ctangle
+	$(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT)
 bibtex.c bibtex.h: bibtex-web2c
 bibtex-web2c: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed bibtex.p
 	$(web2c) bibtex
@@ -6662,10 +7523,12 @@ luatangle.p: tangle $(luatangle_sources)
 $(lua_mp_c_h): mp-ctangle
 mp-ctangle: ctangle $(lua_mp_web) luatexd.h
 	$(mkdir_p) luatexdir
-	CWEBINPUTS=$(srcdir)/luatexdir/lua $(ctangle) mp.w
-	CWEBINPUTS=$(srcdir)/luatexdir/lua $(ctangle) psout.w
+	CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) mp.w
+	CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) psout.w
+	CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) tfmin.w
+	CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) memio.w
 	rm -f $(lua_mp_c_h)
-	mv mp.c mplib.h mpmp.h mppsout.h psout.c luatexdir
+	mv mp.c mplib.h mpmp.h mppsout.h psout.c mplibps.h memio.c tfmin.c luatexdir
 	echo timestamp >$@
 	touch $(lua_mp_c_h)
 odvicopy.c odvicopy.h: odvicopy-web2c
diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4
index 3e2c53353ea..faf0e3d5dd3 100644
--- a/Build/source/texk/web2c/aclocal.m4
+++ b/Build/source/texk/web2c/aclocal.m4
@@ -1017,6 +1017,7 @@ AC_SUBST([am__untar])
 m4_include([../../m4/kpse-asm.m4])
 m4_include([../../m4/kpse-common.m4])
 m4_include([../../m4/kpse-cross.m4])
+m4_include([../../m4/kpse-cxx-hack.m4])
 m4_include([../../m4/kpse-kpathsea-flags.m4])
 m4_include([../../m4/kpse-lex.m4])
 m4_include([../../m4/kpse-libpng-flags.m4])
diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am
index ad01159d6f1..a8395d1870f 100644
--- a/Build/source/texk/web2c/am/bootstrap.am
+++ b/Build/source/texk/web2c/am/bootstrap.am
@@ -49,7 +49,7 @@ tangleboot.p: tangle.web tangle.ch
 	  cp $(srcdir)/tangleboot.p .; \
 	fi
 	date >stamp-tangle
-	$(MAKE) $(AM_MAKEFLAGS) tangle
+	$(MAKE) $(AM_MAKEFLAGS) tangle$(EXEEXT)
 DISTCLEANFILES += stamp-tangle tangleboot.c tangleboot.h
 
 ## Bootstrapping ctangle requires making it with itself.  We use the opportunity
@@ -86,7 +86,7 @@ ctangleboot.c: cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	  cp $(srcdir)/ctangleboot.c .; \
 	fi
 	date >stamp-ctangle
-	$(MAKE) $(AM_MAKEFLAGS) ctangle
+	$(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT)
 cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
 	if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \
 	  CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) common comm-w2c cweb.c; \
@@ -97,7 +97,7 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch
 	  cp $(srcdir)/cwebboot.c .; \
 	fi
 	date >stamp-ctangle
-	$(MAKE) $(AM_MAKEFLAGS) ctangle
+	$(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT)
 DISTCLEANFILES += stamp-ctangle
 
 ## Tests
diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index 01e05b9f2e2..6f3bb2a94e1 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -80,6 +80,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the <iostream> header file. */
+#undef HAVE_IOSTREAM
+
 /* Define to 1 if you have the <langinfo_h> header file. */
 #undef HAVE_LANGINFO_H
 
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 3702ba2c72e..1cc486ab0cf 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -880,6 +880,9 @@ TEX_TRUE
 socketlibs
 FMU_FALSE
 FMU_TRUE
+CXX_HACK_LIBS
+CXX_HACK_DEPS
+CXXLD
 CXXCPP
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
@@ -1007,6 +1010,7 @@ enable_dependency_tracking
 with_gnu_ld
 enable_libtool_lock
 enable_largefile
+enable_cxx_runtime_hack
 with_editor
 enable_auto_core
 enable_dump_share
@@ -1703,6 +1707,7 @@ Optional Features:
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-largefile     omit support for large files
+  --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-auto-core      cause TeX&MF to dump core, given a certain filename
   --disable-dump-share    make fmt/base/mem files architecture-dependent
   --enable-fmtutil        use fmtutil for build dumps
@@ -4358,13 +4363,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:4361: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4366: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4364: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4369: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4367: output\"" >&5)
+  (eval echo "\"\$as_me:4372: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5570,7 +5575,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5573 "configure"' > conftest.$ac_ext
+  echo '#line 5578 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7617,11 +7622,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:7620: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7625: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7624: \$? = $ac_status" >&5
+   echo "$as_me:7629: \$? = $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.
@@ -7956,11 +7961,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:7959: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7964: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7963: \$? = $ac_status" >&5
+   echo "$as_me:7968: \$? = $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.
@@ -8061,11 +8066,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:8064: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8069: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8068: \$? = $ac_status" >&5
+   echo "$as_me:8073: \$? = $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
@@ -8116,11 +8121,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:8119: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8124: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8123: \$? = $ac_status" >&5
+   echo "$as_me:8128: \$? = $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
@@ -10916,7 +10921,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10919 "configure"
+#line 10924 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11012,7 +11017,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11015 "configure"
+#line 11020 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13017,241 +13022,6 @@ _ACEOF
 fi
 
 
-## texk/web2c/ac/web2c.ac
-## configure options for TeX and MF
-
-# Check whether --with-editor was given.
-if test "${with_editor+set}" = set; then
-  withval=$with_editor;
-fi
-# Check whether --enable-auto-core was given.
-if test "${enable_auto_core+set}" = set; then
-  enableval=$enable_auto_core;
-fi
-# Check whether --enable-dump-share was given.
-if test "${enable_dump_share+set}" = set; then
-  enableval=$enable_dump_share;
-fi
-# Check whether --enable-fmtutil was given.
-if test "${enable_fmtutil+set}" = set; then
-  enableval=$enable_fmtutil;
-fi
-## configure options for TeX
-# Check whether --enable-ipc was given.
-if test "${enable_ipc+set}" = set; then
-  enableval=$enable_ipc;
-fi
-# Check whether --enable-tex was given.
-if test "${enable_tex+set}" = set; then
-  enableval=$enable_tex;
-fi
-case $enable_tex in
-  yes|no) : ;;
-  *) enable_tex=yes ;;
-esac
-# Check whether --enable-etex was given.
-if test "${enable_etex+set}" = set; then
-  enableval=$enable_etex;
-fi
-case $enable_etex in
-  yes|no) : ;;
-  *) enable_etex=no ;;
-esac
-# Check whether --enable-omega was given.
-if test "${enable_omega+set}" = set; then
-  enableval=$enable_omega;
-fi
-case $enable_omega in
-  yes|no) : ;;
-  *) enable_omega=no ;;
-esac
-# Check whether --enable-aleph was given.
-if test "${enable_aleph+set}" = set; then
-  enableval=$enable_aleph;
-fi
-case $enable_aleph in
-  yes|no) : ;;
-  *) enable_aleph=yes ;;
-esac
-# Check whether --enable-pdftex was given.
-if test "${enable_pdftex+set}" = set; then
-  enableval=$enable_pdftex;
-fi
-case $enable_pdftex in
-  yes|no) : ;;
-  *) enable_pdftex=yes ;;
-esac
-
-test "x$enable_pdftex" = xno || {
-  need_xpdf=yes
-  need_libpng=yes
-  need_obsdcompat=yes
-}
-# Check whether --enable-luatex was given.
-if test "${enable_luatex+set}" = set; then
-  enableval=$enable_luatex;
-fi
-case $enable_luatex in
-  yes|no) : ;;
-  *) enable_luatex=yes ;;
-esac
-
-test "x$enable_luatex" = xno || {
-  need_xpdf=yes
-  need_libpng=yes
-  need_obsdcompat=yes
-}
-# Check whether --enable-xetex was given.
-if test "${enable_xetex+set}" = set; then
-  enableval=$enable_xetex;
-fi
-case $enable_xetex in
-  yes|no) : ;;
-  *) enable_xetex=no ;;
-esac
-
-test "x$enable_xetex" = xno || {
-  need_xpdf=yes
-  need_libpng=yes
-  need_freetype2=yes
-}
-## configure options for MF
-# Check whether --enable-mf was given.
-if test "${enable_mf+set}" = set; then
-  enableval=$enable_mf;
-fi
-# Check whether --enable-mf-nowin was given.
-if test "${enable_mf_nowin+set}" = set; then
-  enableval=$enable_mf_nowin;
-fi
-
-# Check whether --with-mf-x-toolkit was given.
-if test "${with_mf_x_toolkit+set}" = set; then
-  withval=$with_mf_x_toolkit;
-fi
-# Check whether --enable-epsfwin was given.
-if test "${enable_epsfwin+set}" = set; then
-  enableval=$enable_epsfwin;
-fi
-# Check whether --enable-hp2627win was given.
-if test "${enable_hp2627win+set}" = set; then
-  enableval=$enable_hp2627win;
-fi
-# Check whether --enable-mftalkwin was given.
-if test "${enable_mftalkwin+set}" = set; then
-  enableval=$enable_mftalkwin;
-fi
-# Check whether --enable-nextwin was given.
-if test "${enable_nextwin+set}" = set; then
-  enableval=$enable_nextwin;
-fi
-# Check whether --enable-regiswin was given.
-if test "${enable_regiswin+set}" = set; then
-  enableval=$enable_regiswin;
-fi
-# Check whether --enable-suntoolswin was given.
-if test "${enable_suntoolswin+set}" = set; then
-  enableval=$enable_suntoolswin;
-fi
-# Check whether --enable-tektronixwin was given.
-if test "${enable_tektronixwin+set}" = set; then
-  enableval=$enable_tektronixwin;
-fi
-# Check whether --enable-unitermwin was given.
-if test "${enable_unitermwin+set}" = set; then
-  enableval=$enable_unitermwin;
-fi
-## configure options for MP
-# Check whether --enable-mp was given.
-if test "${enable_mp+set}" = set; then
-  enableval=$enable_mp;
-fi
-## configure options for WEB programs
-# Check whether --enable-web-progs was given.
-if test "${enable_web_progs+set}" = set; then
-  enableval=$enable_web_progs;
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking whether gcc asm needs underscore" >&5
-$as_echo_n "checking whether gcc asm needs underscore... " >&6; }
-if test "${pb_cv_asm_underscore+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-# Some versions of GCC asm for i386 need an underscore prepended to
-# external symbols. Figure out if this is so.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-extern char val ;
-extern void sub () ;
-#if defined (__i386__) && defined (__GNUC__)
-asm("        .align 4\n"
-".globl sub\n"
-"sub:\n"
-"        movb \$1,val\n"
-"        ret\n");
-#else
-void sub () { val = 1; }
-#endif /* assembler */
-char val ;
-int
-main ()
-{
-sub (); return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  pb_cv_asm_underscore=no
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	pb_cv_asm_underscore=yes
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $pb_cv_asm_underscore" >&5
-$as_echo "$pb_cv_asm_underscore" >&6; }
-if test "x$pb_cv_asm_underscore" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define ASM_NEEDS_UNDERSCORE 1
-_ACEOF
-
-fi
-
-
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -16263,11 +16033,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:16266: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16036: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16270: \$? = $ac_status" >&5
+   echo "$as_me:16040: \$? = $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.
@@ -16362,11 +16132,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:16365: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16135: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16369: \$? = $ac_status" >&5
+   echo "$as_me:16139: \$? = $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
@@ -16414,11 +16184,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:16417: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16187: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16421: \$? = $ac_status" >&5
+   echo "$as_me:16191: \$? = $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
@@ -17379,99 +17149,201 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-
-case $with_editor in
-  ''|yes|no) with_editor='vi +%d %s' ;;
-esac
+# Check whether --enable-cxx-runtime-hack was given.
+if test "${enable_cxx_runtime_hack+set}" = set; then
+  enableval=$enable_cxx_runtime_hack;
+fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define EDITOR "$with_editor"
-_ACEOF
+cpp_link_hack=false
+if test "x$GXX" = xyes && test "x$enable_cxx_runtime_hack" = xyes; then
 
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-if test "x$enable_auto_core" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define FUNNY_CORE_DUMP 1
+for ac_header in iostream
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_header_compiler=no
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
-if test "x$enable_dump_share" = xno; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_DUMP_SHARE 1
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
 fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
- if test "x$enable_fmtutil" = xyes; then
-  FMU_TRUE=
-  FMU_FALSE='#'
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ---------------------------- ##
+## Report this to tex-k@tug.org ##
+## ---------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 else
-  FMU_TRUE='#'
-  FMU_FALSE=
+  eval "$as_ac_Header=\$ac_header_preproc"
 fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
-if test "x$enable_ipc" = xyes; then
+fi
 
-# -lsocket is needed on Solaris, at least.  Maybe -lnsl on SCO, too?
-# See ac_path_xtra.
-{ $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
-if test "${ac_cv_func_connect+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+done
+
+{ $as_echo "$as_me:$LINENO: checking for statically linking C++ runtime library" >&5
+$as_echo_n "checking for statically linking C++ runtime library... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define connect innocuous_connect
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
+#ifdef HAVE_IOSTREAM
+#include <iostream>
+using namespace std;
 #else
-# include <assert.h>
+#include <iostream.h>
 #endif
-
-#undef connect
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_connect || defined __stub___connect
-choke me
-#endif
-
 int
 main ()
 {
-return connect ();
+cout <<"worksok\n";
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
+flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
+flags_try2='-lgcc -lc -lgcc'
+kpse_save_LIBS=$LIBS
+for flags in "$flags_try1" "$flags_try2"; do
+  LIBS="$kpse_save_LIBS $flags_try0 $flags"
+  rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -17486,36 +17358,228 @@ $as_echo "$ac_try_echo") >&5
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
+	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_func_connect=yes
+  case `(./conftest$ac_exeext; exit) 2>/dev/null` in
+       worksok)
+         cpp_link_hack=true; break;;
+     esac
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_func_connect=no
+
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+      conftest$ac_exeext
+done
+LIBS=$kpse_save_LIBS
+
+if $cpp_link_hack; then
+  CXX_HACK_LIBS="$flags_try0 $flags"
+  { $as_echo "$as_me:$LINENO: result: ok using $CXX_HACK_LIBS" >&5
+$as_echo "ok using $CXX_HACK_LIBS" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: not supported" >&5
+$as_echo "not supported" >&6; }
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
-if test "x$ac_cv_func_connect" = x""yes; then
-  :
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+if $cpp_link_hack; then
+  CXXLD='$(top_builddir)/CXXLD.sh'
+  CXX_HACK_DEPS=$CXXLD
+  cxxld_sh="#! ${CONFIG_SHELL-/bin/sh}
+# CXXLD.sh.  Generated by configure.
+set -- $CXX \"\$@\" $CXX_HACK_LIBS
+echo \"\$0:\" \"\$@\"
+exec \"\$@\""
+  ac_config_files="$ac_config_files CXXLD.sh:Makefile.in"
+
 else
-  { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
+  CXXLD='$(CXX)'
+fi
+
+
+
+
+
+
+## texk/web2c/ac/web2c.ac
+## configure options for TeX and MF
+
+# Check whether --with-editor was given.
+if test "${with_editor+set}" = set; then
+  withval=$with_editor;
+fi
+# Check whether --enable-auto-core was given.
+if test "${enable_auto_core+set}" = set; then
+  enableval=$enable_auto_core;
+fi
+# Check whether --enable-dump-share was given.
+if test "${enable_dump_share+set}" = set; then
+  enableval=$enable_dump_share;
+fi
+# Check whether --enable-fmtutil was given.
+if test "${enable_fmtutil+set}" = set; then
+  enableval=$enable_fmtutil;
+fi
+## configure options for TeX
+# Check whether --enable-ipc was given.
+if test "${enable_ipc+set}" = set; then
+  enableval=$enable_ipc;
+fi
+# Check whether --enable-tex was given.
+if test "${enable_tex+set}" = set; then
+  enableval=$enable_tex;
+fi
+case $enable_tex in
+  yes|no) : ;;
+  *) enable_tex=yes ;;
+esac
+# Check whether --enable-etex was given.
+if test "${enable_etex+set}" = set; then
+  enableval=$enable_etex;
+fi
+case $enable_etex in
+  yes|no) : ;;
+  *) enable_etex=no ;;
+esac
+# Check whether --enable-omega was given.
+if test "${enable_omega+set}" = set; then
+  enableval=$enable_omega;
+fi
+case $enable_omega in
+  yes|no) : ;;
+  *) enable_omega=no ;;
+esac
+# Check whether --enable-aleph was given.
+if test "${enable_aleph+set}" = set; then
+  enableval=$enable_aleph;
+fi
+case $enable_aleph in
+  yes|no) : ;;
+  *) enable_aleph=yes ;;
+esac
+# Check whether --enable-pdftex was given.
+if test "${enable_pdftex+set}" = set; then
+  enableval=$enable_pdftex;
+fi
+case $enable_pdftex in
+  yes|no) : ;;
+  *) enable_pdftex=yes ;;
+esac
+
+test "x$enable_pdftex" = xno || {
+  need_xpdf=yes
+  need_libpng=yes
+  need_obsdcompat=yes
+}
+# Check whether --enable-luatex was given.
+if test "${enable_luatex+set}" = set; then
+  enableval=$enable_luatex;
+fi
+case $enable_luatex in
+  yes|no) : ;;
+  *) enable_luatex=yes ;;
+esac
+
+test "x$enable_luatex" = xno || {
+  need_xpdf=yes
+  need_libpng=yes
+  need_obsdcompat=yes
+}
+# Check whether --enable-xetex was given.
+if test "${enable_xetex+set}" = set; then
+  enableval=$enable_xetex;
+fi
+case $enable_xetex in
+  yes|no) : ;;
+  *) enable_xetex=no ;;
+esac
+
+test "x$enable_xetex" = xno || {
+  need_xpdf=yes
+  need_libpng=yes
+  need_freetype2=yes
+}
+## configure options for MF
+# Check whether --enable-mf was given.
+if test "${enable_mf+set}" = set; then
+  enableval=$enable_mf;
+fi
+# Check whether --enable-mf-nowin was given.
+if test "${enable_mf_nowin+set}" = set; then
+  enableval=$enable_mf_nowin;
+fi
+
+# Check whether --with-mf-x-toolkit was given.
+if test "${with_mf_x_toolkit+set}" = set; then
+  withval=$with_mf_x_toolkit;
+fi
+# Check whether --enable-epsfwin was given.
+if test "${enable_epsfwin+set}" = set; then
+  enableval=$enable_epsfwin;
+fi
+# Check whether --enable-hp2627win was given.
+if test "${enable_hp2627win+set}" = set; then
+  enableval=$enable_hp2627win;
+fi
+# Check whether --enable-mftalkwin was given.
+if test "${enable_mftalkwin+set}" = set; then
+  enableval=$enable_mftalkwin;
+fi
+# Check whether --enable-nextwin was given.
+if test "${enable_nextwin+set}" = set; then
+  enableval=$enable_nextwin;
+fi
+# Check whether --enable-regiswin was given.
+if test "${enable_regiswin+set}" = set; then
+  enableval=$enable_regiswin;
+fi
+# Check whether --enable-suntoolswin was given.
+if test "${enable_suntoolswin+set}" = set; then
+  enableval=$enable_suntoolswin;
+fi
+# Check whether --enable-tektronixwin was given.
+if test "${enable_tektronixwin+set}" = set; then
+  enableval=$enable_tektronixwin;
+fi
+# Check whether --enable-unitermwin was given.
+if test "${enable_unitermwin+set}" = set; then
+  enableval=$enable_unitermwin;
+fi
+## configure options for MP
+# Check whether --enable-mp was given.
+if test "${enable_mp+set}" = set; then
+  enableval=$enable_mp;
+fi
+## configure options for WEB programs
+# Check whether --enable-web-progs was given.
+if test "${enable_web_progs+set}" = set; then
+  enableval=$enable_web_progs;
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking whether gcc asm needs underscore" >&5
+$as_echo_n "checking whether gcc asm needs underscore... " >&6; }
+if test "${pb_cv_asm_underscore+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket  $LIBS"
+
+# Some versions of GCC asm for i386 need an underscore prepended to
+# external symbols. Figure out if this is so.
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17523,17 +17587,22 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
+extern char val ;
+extern void sub () ;
+#if defined (__i386__) && defined (__GNUC__)
+asm("        .align 4\n"
+".globl sub\n"
+"sub:\n"
+"        movb \$1,val\n"
+"        ret\n");
+#else
+void sub () { val = 1; }
+#endif /* assembler */
+char val ;
 int
 main ()
 {
-return connect ();
+sub (); return 0;
   ;
   return 0;
 }
@@ -17559,31 +17628,77 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_lib_socket_connect=yes
+  pb_cv_asm_underscore=no
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_socket_connect=no
+	pb_cv_asm_underscore=yes
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then
-  socketlibs="-lsocket"
+{ $as_echo "$as_me:$LINENO: result: $pb_cv_asm_underscore" >&5
+$as_echo "$pb_cv_asm_underscore" >&6; }
+if test "x$pb_cv_asm_underscore" = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ASM_NEEDS_UNDERSCORE 1
+_ACEOF
+
+fi
+
+
+case $with_editor in
+  ''|yes|no) with_editor='vi +%d %s' ;;
+esac
+
+
+cat >>confdefs.h <<_ACEOF
+#define EDITOR "$with_editor"
+_ACEOF
+
+
+if test "x$enable_auto_core" = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define FUNNY_CORE_DUMP 1
+_ACEOF
+
+fi
+
+
+if test "x$enable_dump_share" = xno; then
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_DUMP_SHARE 1
+_ACEOF
+
+fi
+
+
+ if test "x$enable_fmtutil" = xyes; then
+  FMU_TRUE=
+  FMU_FALSE='#'
 else
-  { $as_echo "$as_me:$LINENO: checking for connect in -lnsl" >&5
-$as_echo_n "checking for connect in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_connect+set}" = set; then
+  FMU_TRUE='#'
+  FMU_FALSE=
+fi
+
+
+# -lsocket is needed on Solaris, at least.  Maybe -lnsl on SCO, too?
+# See ac_path_xtra.
+if test "x$enable_ipc:$enable_luatex" != xno:no; then
+
+kpse_save_LIBS=$LIBS
+{ $as_echo "$as_me:$LINENO: checking for library containing connect" >&5
+$as_echo_n "checking for library containing connect... " >&6; }
+if test "${ac_cv_search_connect+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17606,7 +17721,14 @@ return connect ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+for ac_lib in '' socket nsl wsock32; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -17627,32 +17749,52 @@ $as_echo "$ac_try_echo") >&5
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_lib_nsl_connect=yes
+  ac_cv_search_connect=$ac_res
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_nsl_connect=no
+
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+      conftest$ac_exeext
+  if test "${ac_cv_search_connect+set}" = set; then
+  break
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_connect" >&5
-$as_echo "$ac_cv_lib_nsl_connect" >&6; }
-if test "x$ac_cv_lib_nsl_connect" = x""yes; then
-  socketlibs="-lnsl"
+done
+if test "${ac_cv_search_connect+set}" = set; then
+  :
 else
-  { $as_echo "$as_me:$LINENO: WARNING: no socket library: disabling ipc" >&5
-$as_echo "$as_me: WARNING: no socket library: disabling ipc" >&2;}
-                                           enable_ipc=no
+  ac_cv_search_connect=no
 fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5
+$as_echo "$ac_cv_search_connect" >&6; }
+ac_res=$ac_cv_search_connect
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
+LIBS=$kpse_save_LIBS
+case $ac_cv_search_connect in
+  "none required") : ;;
+  no) if test "x$enable_luatex" = xyes; then
+  { { $as_echo "$as_me:$LINENO: error: Sorry, no socket library: can not build luaTeX" >&5
+$as_echo "$as_me: error: Sorry, no socket library: can not build luaTeX" >&2;}
+   { (exit 1); exit 1; }; }
+else
+  { $as_echo "$as_me:$LINENO: WARNING: no socket library: disabling ipc" >&5
+$as_echo "$as_me: WARNING: no socket library: disabling ipc" >&2;}
+                                   enable_ipc=no
 fi
+ ;;
+  *) socketlibs="-l$ac_cv_search_connect" ;;
+esac
 
 if test "x$enable_ipc" = xyes; then
 
@@ -22490,7 +22632,7 @@ fi
 
 
 if test "x$enable_luatex" = xyes; then
-  ac_config_headers="$ac_config_headers ff-config.h:luatexdir/luafontforge/ff-config.in"
+  ac_config_headers="$ac_config_headers ff-config.h:luatexdir/luafontloader/ff-config.in"
 
 
 for ac_header in langinfo_h
@@ -24478,6 +24620,7 @@ fi
 ac_aux_dir='$ac_aux_dir'
 
 
+cxxld_sh='$cxxld_sh'
 
 _ACEOF
 
@@ -24489,8 +24632,9 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:Makefile.in" ;;
     "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;;
-    "ff-config.h") CONFIG_HEADERS="$CONFIG_HEADERS ff-config.h:luatexdir/luafontforge/ff-config.in" ;;
+    "ff-config.h") CONFIG_HEADERS="$CONFIG_HEADERS ff-config.h:luatexdir/luafontloader/ff-config.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
@@ -26088,6 +26232,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 _LT_EOF
 
  ;;
+    "CXXLD.sh":F) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;;
     "c-auto.h":H) sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \
       -e 's/^#define VERSION/#define WEB2C_VERSION/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h ;;
 
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 07da4331be8..5b68f07f6f0 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -36,14 +36,16 @@ AC_DEFINE_UNQUOTED([WEB2CVERSION], [" (Web2C $WEB2CVERSION)"])
 
 dnl Common code for all programs using libkpathsea.
 KPSE_COMMON([web2c programs])
+
+AC_PROG_CXX
+KPSE_CXX_HACK
+
 dnl Include additional code for web2c.
 KPSE_WEB2C_PREPARE
 m4_include([ac/web2c.ac])
 
 KPSE_ASM_UNDERSCORE
 
-AC_PROG_CXX
-
 AS_CASE([$with_editor], [''|yes|no], [with_editor='vi +%d %s'])
 AC_DEFINE_UNQUOTED([EDITOR], ["$with_editor"],
                    [web2c: Default editor for interactive `e' option.])
@@ -59,16 +61,19 @@ AS_IF([test "x$enable_dump_share" = xno],
 
 AM_CONDITIONAL([FMU], [test "x$enable_fmtutil" = xyes])
 
-AS_IF([test "x$enable_ipc" = xyes], [
 # -lsocket is needed on Solaris, at least.  Maybe -lnsl on SCO, too?
 # See ac_path_xtra.
-AC_CHECK_FUNC([connect], ,
-              [AC_CHECK_LIB([socket], [connect],
-                            [socketlibs="-lsocket"],
-                            [AC_CHECK_LIB([nsl], [connect],
-                                          [socketlibs="-lnsl"],
-                                          [AC_MSG_WARN([no socket library: disabling ipc])
-                                           enable_ipc=no])])])
+AS_IF([test "x$enable_ipc:$enable_luatex" != xno:no], [
+kpse_save_LIBS=$LIBS
+AC_SEARCH_LIBS([connect], [socket nsl wsock32])
+LIBS=$kpse_save_LIBS
+AS_CASE([$ac_cv_search_connect],
+        ["none required"], [],
+        [no], [AS_IF([test "x$enable_luatex" = xyes],
+                     [AC_MSG_ERROR([Sorry, no socket library: can not build luaTeX])],
+                     [AC_MSG_WARN([no socket library: disabling ipc])
+                                   enable_ipc=no])],
+        [socketlibs="-l$ac_cv_search_connect"])
 AS_IF([test "x$enable_ipc" = xyes],
       [AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.])])
 ])
diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index 43961d6cfe4..4d661ebc460 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -38,6 +38,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -98,6 +99,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index acb41669c86..7d6192a5934 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -39,6 +39,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -103,6 +104,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/web2c/libsluapdf.mk b/Build/source/texk/web2c/libsluapdf.mk
deleted file mode 100644
index 4e3d74d4fc7..00000000000
--- a/Build/source/texk/web2c/libsluapdf.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id$
-# Libraries common to luatex and pdftex.
-# Public domain.
-
-# libz
-ZLIBDIR=../../libs/zlib
-ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
-ZLIBDEP = @ZLIBDEP@
-LDZLIB = @LDZLIB@
-
-$(ZLIBDIR)/libz.a: $(ZLIBSRCDIR)
-	cd $(ZLIBDIR) && $(MAKE) $(common_makeargs) libz.a
-
-# libpng
-LIBPNGDIR=../../libs/libpng
-LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
-LIBPNGDEP = @LIBPNGDEP@
-LDLIBPNG = @LDLIBPNG@
-
-$(LIBPNGDIR)/libpng.a: $(LIBPNGSRCDIR)/*.c
-	cd $(LIBPNGDIR) && $(MAKE) $(common_makeargs) libpng.a
-
-# libxpdf
-LIBXPDFDIR=../../libs/xpdf
-LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
-LIBXPDFDEP = @LIBXPDFDEP@
-LDLIBXPDF = @LDLIBXPDF@
-
-$(LIBXPDFDIR)/fofi/libfofi.a: $(LIBXPDFSRCDIR)/fofi/*.cc \
-	$(LIBXPDFSRCDIR)/fofi/*.h
-	cd $(LIBXPDFDIR)/fofi; $(MAKE) $(common_makeargs) libfofi.a
-$(LIBXPDFDIR)/goo/libGoo.a: $(LIBXPDFSRCDIR)/goo/*.cc \
-	$(LIBXPDFSRCDIR)/goo/*.c $(LIBXPDFSRCDIR)/goo/*.h
-	cd $(LIBXPDFDIR)/goo; $(MAKE) $(common_makeargs) libGoo.a
-$(LIBXPDFDIR)/xpdf/libxpdf.a: $(LIBXPDFSRCDIR)/xpdf/*.cc \
-	$(LIBXPDFSRCDIR)/xpdf/*.h
-	cd $(LIBXPDFDIR)/xpdf; $(MAKE) $(common_makeargs) libxpdf.a
-
-# md5
-LIBMD5DIR=../../libs/md5
-LIBMD5SRCDIR=$(srcdir)/$(LIBMD5DIR)
-LIBMD5DEP=$(LIBMD5DIR)/md5.o
-
-$(LIBMD5DEP): $(LIBMD5SRCDIR)/md5.c $(LIBMD5SRCDIR)/md5.h
-clean:: md5lib-clean
-md5lib-clean:
-	rm -f $(LIBMD5DEP)
-
-# obsdcompat
-LIBOBSDDIR=../../libs/obsdcompat
-LIBOBSDSRCDIR=$(srcdir)/$(LIBOBSDDIR)
-LIBOBSDDEP=@LIBOBSDDEP@
-LDLIBOBSD=@LDLIBOBSD@
-
-$(LIBOBSDDIR)/libopenbsd-compat.a: $(LIBOBSDSRCDIR)/*.c $(LIBOBSDSRCDIR)/*.h
-# common_makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' $(XMAKEARGS)
-# CFLAGS setzt libopenbsd-compat selbst, nicht durchreichen!
-	cd $(LIBOBSDDIR); $(MAKE) $(MFLAGS) $(XMAKEARGS) libopenbsd-compat.a
-
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index 72b83334526..f7e35d1010b 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -270,13 +270,13 @@ libluasocket_a_SOURCES = \
 
 EXTRA_DIST += \
 	luatexdir/luasocket/src/socket_lua.c \
-    luatexdir/luasocket/src/ftp_lua.c \
-    luatexdir/luasocket/src/http_lua.c \
-    luatexdir/luasocket/src/smtp_lua.c \
-    luatexdir/luasocket/src/tp_lua.c \
-    luatexdir/luasocket/src/url_lua.c \
-    luatexdir/luasocket/src/ltn12_lua.c \
-    luatexdir/luasocket/src/mime_lua.c
+	luatexdir/luasocket/src/ftp_lua.c \
+	luatexdir/luasocket/src/http_lua.c \
+	luatexdir/luasocket/src/smtp_lua.c \
+	luatexdir/luasocket/src/tp_lua.c \
+	luatexdir/luasocket/src/url_lua.c \
+	luatexdir/luasocket/src/ltn12_lua.c \
+	luatexdir/luasocket/src/mime_lua.c
 
 ## Not used
 ##
@@ -287,62 +287,63 @@ EXTRA_DIST += \
 	luatexdir/luasocket/src/usocket.c \
 	luatexdir/luasocket/src/wsocket.c \
 	luatexdir/luasocket/src/wsocket.h \
-    luatexdir/luasocket/src/ftp.lua \
-    luatexdir/luasocket/src/http.lua \
-    luatexdir/luasocket/src/smtp.lua \
-    luatexdir/luasocket/src/tp.lua \
-    luatexdir/luasocket/src/url.lua \
-    luatexdir/luasocket/src/ltn12.lua \
-    luatexdir/luasocket/src/mime.lua \
-    luatexdir/luasocket/LICENSE \
-    luatexdir/luasocket/NEW \
-    luatexdir/luasocket/README \
-    luatexdir/luasocket/config \
-    luatexdir/luasocket/luasocket.sln \
-    luatexdir/luasocket/makefile \
-    luatexdir/luasocket/mime.vcproj \
-    luatexdir/luasocket/socket.vcproj \
-    luatexdir/luasocket/doc/dns.html \
-    luatexdir/luasocket/doc/ftp.html \
-    luatexdir/luasocket/doc/http.html \
-    luatexdir/luasocket/doc/index.html \
-    luatexdir/luasocket/doc/installation.html \
-    luatexdir/luasocket/doc/introduction.html \
-    luatexdir/luasocket/doc/ltn12.html \
-    luatexdir/luasocket/doc/luasocket.png \
-    luatexdir/luasocket/doc/mime.html \
-    luatexdir/luasocket/doc/reference.css \
-    luatexdir/luasocket/doc/reference.html \
-    luatexdir/luasocket/doc/smtp.html \
-    luatexdir/luasocket/doc/socket.html \
-    luatexdir/luasocket/doc/tcp.html \
-    luatexdir/luasocket/doc/udp.html \
-    luatexdir/luasocket/doc/url.html \
-    luatexdir/luasocket/etc/README \
-    luatexdir/luasocket/etc/b64.lua \
-    luatexdir/luasocket/etc/check-links.lua \
-    luatexdir/luasocket/etc/check-memory.lua \
-    luatexdir/luasocket/etc/dict.lua \
-    luatexdir/luasocket/etc/dispatch.lua \
-    luatexdir/luasocket/etc/eol.lua \
-    luatexdir/luasocket/etc/forward.lua \
-    luatexdir/luasocket/etc/get.lua \
-    luatexdir/luasocket/etc/lp.lua \
-    luatexdir/luasocket/etc/qp.lua \
-    luatexdir/luasocket/etc/tftp.lua \
-    luatexdir/luasocket/samples/README \
-    luatexdir/luasocket/samples/cddb.lua \
-    luatexdir/luasocket/samples/daytimeclnt.lua \
-    luatexdir/luasocket/samples/echoclnt.lua \
-    luatexdir/luasocket/samples/echosrvr.lua \
-    luatexdir/luasocket/samples/listener.lua \
-    luatexdir/luasocket/samples/lpr.lua \
-    luatexdir/luasocket/samples/talker.lua \
-    luatexdir/luasocket/samples/tinyirc.lua \
-    luatexdir/luasocket/test/README \
-    luatexdir/luasocket/test/testclnt.lua \
-    luatexdir/luasocket/test/testsrvr.lua \
-    luatexdir/luasocket/test/testsupport.lua
+	luatexdir/luasocket/src/ftp.lua \
+	luatexdir/luasocket/src/http.lua \
+	luatexdir/luasocket/src/smtp.lua \
+	luatexdir/luasocket/src/socket.lua \
+	luatexdir/luasocket/src/tp.lua \
+	luatexdir/luasocket/src/url.lua \
+	luatexdir/luasocket/src/ltn12.lua \
+	luatexdir/luasocket/src/mime.lua \
+	luatexdir/luasocket/LICENSE \
+	luatexdir/luasocket/NEW \
+	luatexdir/luasocket/README \
+	luatexdir/luasocket/config \
+	luatexdir/luasocket/luasocket.sln \
+	luatexdir/luasocket/makefile \
+	luatexdir/luasocket/mime.vcproj \
+	luatexdir/luasocket/socket.vcproj \
+	luatexdir/luasocket/doc/dns.html \
+	luatexdir/luasocket/doc/ftp.html \
+	luatexdir/luasocket/doc/http.html \
+	luatexdir/luasocket/doc/index.html \
+	luatexdir/luasocket/doc/installation.html \
+	luatexdir/luasocket/doc/introduction.html \
+	luatexdir/luasocket/doc/ltn12.html \
+	luatexdir/luasocket/doc/luasocket.png \
+	luatexdir/luasocket/doc/mime.html \
+	luatexdir/luasocket/doc/reference.css \
+	luatexdir/luasocket/doc/reference.html \
+	luatexdir/luasocket/doc/smtp.html \
+	luatexdir/luasocket/doc/socket.html \
+	luatexdir/luasocket/doc/tcp.html \
+	luatexdir/luasocket/doc/udp.html \
+	luatexdir/luasocket/doc/url.html \
+	luatexdir/luasocket/etc/README \
+	luatexdir/luasocket/etc/b64.lua \
+	luatexdir/luasocket/etc/check-links.lua \
+	luatexdir/luasocket/etc/check-memory.lua \
+	luatexdir/luasocket/etc/dict.lua \
+	luatexdir/luasocket/etc/dispatch.lua \
+	luatexdir/luasocket/etc/eol.lua \
+	luatexdir/luasocket/etc/forward.lua \
+	luatexdir/luasocket/etc/get.lua \
+	luatexdir/luasocket/etc/lp.lua \
+	luatexdir/luasocket/etc/qp.lua \
+	luatexdir/luasocket/etc/tftp.lua \
+	luatexdir/luasocket/samples/README \
+	luatexdir/luasocket/samples/cddb.lua \
+	luatexdir/luasocket/samples/daytimeclnt.lua \
+	luatexdir/luasocket/samples/echoclnt.lua \
+	luatexdir/luasocket/samples/echosrvr.lua \
+	luatexdir/luasocket/samples/listener.lua \
+	luatexdir/luasocket/samples/lpr.lua \
+	luatexdir/luasocket/samples/talker.lua \
+	luatexdir/luasocket/samples/tinyirc.lua \
+	luatexdir/luasocket/test/README \
+	luatexdir/luasocket/test/testclnt.lua \
+	luatexdir/luasocket/test/testsrvr.lua \
+	luatexdir/luasocket/test/testsupport.lua
 
 ## libluamisc (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler,
 ## and slnunicode)
@@ -363,11 +364,11 @@ libluamisc_a_SOURCES = \
 	luatexdir/luamd5/md5lib.c \
 	luatexdir/luapeg/lpeg.c \
 	luatexdir/luaprofiler/clocks.h \
-    luatexdir/luaprofiler/core_profiler.h \
-    luatexdir/luaprofiler/function_meter.h  \
-    luatexdir/luaprofiler/luaprofiler.h  \
-    luatexdir/luaprofiler/stack.h \
-    luatexdir/luaprofiler/clocks.c \
+	luatexdir/luaprofiler/core_profiler.h \
+	luatexdir/luaprofiler/function_meter.h  \
+	luatexdir/luaprofiler/luaprofiler.h  \
+	luatexdir/luaprofiler/stack.h \
+	luatexdir/luaprofiler/clocks.c \
 	luatexdir/luaprofiler/core_profiler.c \
 	luatexdir/luaprofiler/function_meter.c \
 	luatexdir/luaprofiler/lua50_profiler.c \
@@ -428,129 +429,127 @@ libff_a_CPPFLAGS = \
 	-I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge
 
 libff_a_SOURCES = \
-    luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c \
-    luatexdir/luafontloader/fontforge/Unicode/alphabet.c \
-    luatexdir/luafontloader/fontforge/Unicode/backtrns.c \
-    luatexdir/luafontloader/fontforge/Unicode/char.c \
-    luatexdir/luafontloader/fontforge/Unicode/cjk.c \
-    luatexdir/luafontloader/fontforge/Unicode/combiners.h \
-    luatexdir/luafontloader/fontforge/Unicode/dump.c \
-    luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c \
-    luatexdir/luafontloader/fontforge/Unicode/memory.c \
-    luatexdir/luafontloader/fontforge/Unicode/ucharmap.c \
-    luatexdir/luafontloader/fontforge/Unicode/unialt.c \
-    luatexdir/luafontloader/fontforge/Unicode/ustring.c \
-    luatexdir/luafontloader/fontforge/Unicode/utype.c \
-    luatexdir/luafontloader/fontforge/fontforge/PfEd.h \
-    luatexdir/luafontloader/fontforge/fontforge/autohint.c \
-    luatexdir/luafontloader/fontforge/fontforge/baseviews.h \
-    luatexdir/luafontloader/fontforge/fontforge/clipnoui.c \
-    luatexdir/luafontloader/fontforge/fontforge/configure-pfaedit.h \
-    luatexdir/luafontloader/fontforge/fontforge/cvundoes.c \
-    luatexdir/luafontloader/fontforge/fontforge/dumppfa.c \
-    luatexdir/luafontloader/fontforge/fontforge/edgelist.h \
-    luatexdir/luafontloader/fontforge/fontforge/edgelist2.h \
-    luatexdir/luafontloader/fontforge/fontforge/encoding.c \
-    luatexdir/luafontloader/fontforge/fontforge/encoding.h \
-    luatexdir/luafontloader/fontforge/fontforge/featurefile.c \
-    luatexdir/luafontloader/fontforge/fontforge/fontforgevw.h \
-    luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c \
-    luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c \
-    luatexdir/luafontloader/fontforge/fontforge/fvfonts.c \
-    luatexdir/luafontloader/fontforge/fontforge/libffstamp.h \
-    luatexdir/luafontloader/fontforge/fontforge/libstamp.pre \
-    luatexdir/luafontloader/fontforge/fontforge/lookups.c \
-    luatexdir/luafontloader/fontforge/fontforge/lookups.h \
-    luatexdir/luafontloader/fontforge/fontforge/macbinary.c \
-    luatexdir/luafontloader/fontforge/fontforge/macenc.c \
-    luatexdir/luafontloader/fontforge/fontforge/mathconstants.c \
-    luatexdir/luafontloader/fontforge/fontforge/mm.c \
-    luatexdir/luafontloader/fontforge/fontforge/mm.h \
-    luatexdir/luafontloader/fontforge/fontforge/namelist.c \
-    luatexdir/luafontloader/fontforge/fontforge/noprefs.c \
-    luatexdir/luafontloader/fontforge/fontforge/nouiutil.c \
-    luatexdir/luafontloader/fontforge/fontforge/parsepfa.c \
-    luatexdir/luafontloader/fontforge/fontforge/parsettf.c \
-    luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c \
-    luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c \
-    luatexdir/luafontloader/fontforge/fontforge/pfaedit.h \
-    luatexdir/luafontloader/fontforge/fontforge/plugins.h \
-    luatexdir/luafontloader/fontforge/fontforge/psfont.h \
-    luatexdir/luafontloader/fontforge/fontforge/psread.c \
-    luatexdir/luafontloader/fontforge/fontforge/pua.c \
-    luatexdir/luafontloader/fontforge/fontforge/python.c \
-    luatexdir/luafontloader/fontforge/fontforge/scripting.h \
-    luatexdir/luafontloader/fontforge/fontforge/sd.h \
-    luatexdir/luafontloader/fontforge/fontforge/sfd1.c \
-    luatexdir/luafontloader/fontforge/fontforge/sfd1.h \
-    luatexdir/luafontloader/fontforge/fontforge/splinechar.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinefill.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinefont.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinefont.h \
-    luatexdir/luafontloader/fontforge/fontforge/splineorder2.c \
-    luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinesave.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinestroke.c \
-    luatexdir/luafontloader/fontforge/fontforge/splineutil.c \
-    luatexdir/luafontloader/fontforge/fontforge/splineutil2.c \
-    luatexdir/luafontloader/fontforge/fontforge/start.c \
-    luatexdir/luafontloader/fontforge/fontforge/stemdb.c \
-    luatexdir/luafontloader/fontforge/fontforge/stemdb.h \
-    luatexdir/luafontloader/fontforge/fontforge/tottf.c \
-    luatexdir/luafontloader/fontforge/fontforge/tottfaat.c \
-    luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c \
-    luatexdir/luafontloader/fontforge/fontforge/ttf.h \
-    luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c \
-    luatexdir/luafontloader/fontforge/fontforge/uiinterface.h \
-    luatexdir/luafontloader/fontforge/fontforge/unicoderange.h \
-    luatexdir/luafontloader/fontforge/fontforge/views.h \
-    luatexdir/luafontloader/fontforge/gutils/fsys.c \
-    luatexdir/luafontloader/fontforge/gutils/gwwintl.c \
-    luatexdir/luafontloader/fontforge/inc/basics.h \
-    luatexdir/luafontloader/fontforge/inc/chardata.h \
-    luatexdir/luafontloader/fontforge/inc/charset.h \
-    luatexdir/luafontloader/fontforge/inc/dynamic.h \
-    luatexdir/luafontloader/fontforge/inc/fileutil.h \
-    luatexdir/luafontloader/fontforge/inc/gdraw.h \
-    luatexdir/luafontloader/fontforge/inc/gfile.h \
-    luatexdir/luafontloader/fontforge/inc/ggadget.h \
-    luatexdir/luafontloader/fontforge/inc/gicons.h \
-    luatexdir/luafontloader/fontforge/inc/gimage.h \
-    luatexdir/luafontloader/fontforge/inc/gio.h \
-    luatexdir/luafontloader/fontforge/inc/gkeysym.h \
-    luatexdir/luafontloader/fontforge/inc/gprogress.h \
-    luatexdir/luafontloader/fontforge/inc/gresource.h \
-    luatexdir/luafontloader/fontforge/inc/gwidget.h \
-    luatexdir/luafontloader/fontforge/inc/gwwiconv.h \
-    luatexdir/luafontloader/fontforge/inc/intl.h \
-    luatexdir/luafontloader/fontforge/inc/ustring.h \
-    luatexdir/luafontloader/fontforge/inc/utype.h \
-    luatexdir/luafontloader/src/ffdummies.c \
-    luatexdir/luafontloader/src/luafflib.c
+	luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c \
+	luatexdir/luafontloader/fontforge/Unicode/alphabet.c \
+	luatexdir/luafontloader/fontforge/Unicode/backtrns.c \
+	luatexdir/luafontloader/fontforge/Unicode/char.c \
+	luatexdir/luafontloader/fontforge/Unicode/cjk.c \
+	luatexdir/luafontloader/fontforge/Unicode/combiners.h \
+	luatexdir/luafontloader/fontforge/Unicode/dump.c \
+	luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c \
+	luatexdir/luafontloader/fontforge/Unicode/memory.c \
+	luatexdir/luafontloader/fontforge/Unicode/ucharmap.c \
+	luatexdir/luafontloader/fontforge/Unicode/unialt.c \
+	luatexdir/luafontloader/fontforge/Unicode/ustring.c \
+	luatexdir/luafontloader/fontforge/Unicode/utype.c \
+	luatexdir/luafontloader/fontforge/fontforge/PfEd.h \
+	luatexdir/luafontloader/fontforge/fontforge/autohint.c \
+	luatexdir/luafontloader/fontforge/fontforge/baseviews.h \
+	luatexdir/luafontloader/fontforge/fontforge/clipnoui.c \
+	luatexdir/luafontloader/fontforge/fontforge/configure-pfaedit.h \
+	luatexdir/luafontloader/fontforge/fontforge/cvundoes.c \
+	luatexdir/luafontloader/fontforge/fontforge/dumppfa.c \
+	luatexdir/luafontloader/fontforge/fontforge/edgelist.h \
+	luatexdir/luafontloader/fontforge/fontforge/edgelist2.h \
+	luatexdir/luafontloader/fontforge/fontforge/encoding.c \
+	luatexdir/luafontloader/fontforge/fontforge/encoding.h \
+	luatexdir/luafontloader/fontforge/fontforge/featurefile.c \
+	luatexdir/luafontloader/fontforge/fontforge/fontforgevw.h \
+	luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c \
+	luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c \
+	luatexdir/luafontloader/fontforge/fontforge/fvfonts.c \
+	luatexdir/luafontloader/fontforge/fontforge/libffstamp.h \
+	luatexdir/luafontloader/fontforge/fontforge/libstamp.pre \
+	luatexdir/luafontloader/fontforge/fontforge/lookups.c \
+	luatexdir/luafontloader/fontforge/fontforge/lookups.h \
+	luatexdir/luafontloader/fontforge/fontforge/macbinary.c \
+	luatexdir/luafontloader/fontforge/fontforge/macenc.c \
+	luatexdir/luafontloader/fontforge/fontforge/mathconstants.c \
+	luatexdir/luafontloader/fontforge/fontforge/mm.c \
+	luatexdir/luafontloader/fontforge/fontforge/mm.h \
+	luatexdir/luafontloader/fontforge/fontforge/namelist.c \
+	luatexdir/luafontloader/fontforge/fontforge/noprefs.c \
+	luatexdir/luafontloader/fontforge/fontforge/nouiutil.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsepfa.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsettf.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c \
+	luatexdir/luafontloader/fontforge/fontforge/pfaedit.h \
+	luatexdir/luafontloader/fontforge/fontforge/plugins.h \
+	luatexdir/luafontloader/fontforge/fontforge/psfont.h \
+	luatexdir/luafontloader/fontforge/fontforge/psread.c \
+	luatexdir/luafontloader/fontforge/fontforge/pua.c \
+	luatexdir/luafontloader/fontforge/fontforge/python.c \
+	luatexdir/luafontloader/fontforge/fontforge/scripting.h \
+	luatexdir/luafontloader/fontforge/fontforge/sd.h \
+	luatexdir/luafontloader/fontforge/fontforge/sfd1.c \
+	luatexdir/luafontloader/fontforge/fontforge/sfd1.h \
+	luatexdir/luafontloader/fontforge/fontforge/splinechar.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinefill.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinefont.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinefont.h \
+	luatexdir/luafontloader/fontforge/fontforge/splineorder2.c \
+	luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinesave.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinestroke.c \
+	luatexdir/luafontloader/fontforge/fontforge/splineutil.c \
+	luatexdir/luafontloader/fontforge/fontforge/splineutil2.c \
+	luatexdir/luafontloader/fontforge/fontforge/start.c \
+	luatexdir/luafontloader/fontforge/fontforge/stemdb.c \
+	luatexdir/luafontloader/fontforge/fontforge/stemdb.h \
+	luatexdir/luafontloader/fontforge/fontforge/tottf.c \
+	luatexdir/luafontloader/fontforge/fontforge/tottfaat.c \
+	luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c \
+	luatexdir/luafontloader/fontforge/fontforge/ttf.h \
+	luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c \
+	luatexdir/luafontloader/fontforge/fontforge/uiinterface.h \
+	luatexdir/luafontloader/fontforge/fontforge/unicoderange.h \
+	luatexdir/luafontloader/fontforge/fontforge/views.h \
+	luatexdir/luafontloader/fontforge/gutils/fsys.c \
+	luatexdir/luafontloader/fontforge/gutils/gwwintl.c \
+	luatexdir/luafontloader/fontforge/inc/basics.h \
+	luatexdir/luafontloader/fontforge/inc/chardata.h \
+	luatexdir/luafontloader/fontforge/inc/charset.h \
+	luatexdir/luafontloader/fontforge/inc/dynamic.h \
+	luatexdir/luafontloader/fontforge/inc/fileutil.h \
+	luatexdir/luafontloader/fontforge/inc/gdraw.h \
+	luatexdir/luafontloader/fontforge/inc/gfile.h \
+	luatexdir/luafontloader/fontforge/inc/ggadget.h \
+	luatexdir/luafontloader/fontforge/inc/gicons.h \
+	luatexdir/luafontloader/fontforge/inc/gimage.h \
+	luatexdir/luafontloader/fontforge/inc/gio.h \
+	luatexdir/luafontloader/fontforge/inc/gkeysym.h \
+	luatexdir/luafontloader/fontforge/inc/gprogress.h \
+	luatexdir/luafontloader/fontforge/inc/gresource.h \
+	luatexdir/luafontloader/fontforge/inc/gwidget.h \
+	luatexdir/luafontloader/fontforge/inc/gwwiconv.h \
+	luatexdir/luafontloader/fontforge/inc/intl.h \
+	luatexdir/luafontloader/fontforge/inc/ustring.h \
+	luatexdir/luafontloader/fontforge/inc/utype.h \
+	luatexdir/luafontloader/src/ffdummies.c \
+	luatexdir/luafontloader/src/luafflib.c
 
 EXTRA_DIST += \
 	luatexdir/luafontloader/ChangeLog \
 	luatexdir/luafontloader/fontforge/AUTHORS \
 	luatexdir/luafontloader/fontforge/INSTALL \
 	luatexdir/luafontloader/fontforge/LICENSE \
-	luatexdir/luafontloader/fontforge/VERSION \
-	luatexdir/luafontloader/fontforge/libs \
-	luatexdir/luafontloader/fontforge/po 
+	luatexdir/luafontloader/fontforge/VERSION
 
 ## Not used
 ##
 EXTRA_DIST += \
-    luatexdir/luafontloader/fontforge/Makefile.in \
-    luatexdir/luafontloader/fontforge/Unicode/Makefile.in \
-    luatexdir/luafontloader/fontforge/configure-options \
-    luatexdir/luafontloader/fontforge/configure.in \
-    luatexdir/luafontloader/fontforge/fontforge/Makefile.in \
-    luatexdir/luafontloader/fontforge/gdraw/Makefile.in \
-    luatexdir/luafontloader/fontforge/gutils/Makefile.in \
-    luatexdir/luafontloader/fontforge/inc/config.h.in \
-    luatexdir/luafontloader/fontforge/plugins/Makefile.in
+	luatexdir/luafontloader/fontforge/Makefile.in \
+	luatexdir/luafontloader/fontforge/Unicode/Makefile.in \
+	luatexdir/luafontloader/fontforge/configure-options \
+	luatexdir/luafontloader/fontforge/configure.in \
+	luatexdir/luafontloader/fontforge/fontforge/Makefile.in \
+	luatexdir/luafontloader/fontforge/gdraw/Makefile.in \
+	luatexdir/luafontloader/fontforge/gutils/Makefile.in \
+	luatexdir/luafontloader/fontforge/inc/config.h.in \
+	luatexdir/luafontloader/fontforge/plugins/Makefile.in
 
 ## libluatex
 ##
@@ -633,7 +632,7 @@ libluatex_a_SOURCES = \
 	luatexdir/managed-sa.c \
 	luatexdir/managed-sa.h \
 	luatexdir/mathcodes.c \
-    luatexdir/mp/lmplib.c \
+	luatexdir/mp/lmplib.c \
 	luatexdir/nodes.h \
 	luatexdir/pdf/pagetree.c \
 	luatexdir/pdf/pdfpage.c \
@@ -675,7 +674,7 @@ lua_mp_c_h += luatexdir/mppsout.h luatexdir/psout.c luatexdir/mplibps.h
 lua_mp_c_h += luatexdir/memio.c luatexdir/tfmin.c
 lua_mp_web =  luatexdir/mp/avl.h luatexdir/mp/avl.c luatexdir/mp/mp.w luatexdir/mp/psout.w
 lua_mp_web += luatexdir/mp/memio.w luatexdir/mp/tfmin.w
-lua_mp_CPPFLAGS = -I$(srcdir)/luatexdir/mp
+libluatex_a_CPPFLAGS += -I$(srcdir)/luatexdir/mp
 $(lua_mp_c_h): mp-ctangle
 mp-ctangle: ctangle $(lua_mp_web) luatexd.h
 	$(mkdir_p) luatexdir
@@ -704,7 +703,7 @@ EXTRA_DIST += \
 
 
 ## Tests
-
+##
 dist_check_SCRIPTS += luatexdir/luatangle.test
 
 if LUATEX
@@ -717,6 +716,5 @@ DISTCLEANFILES += cftest.p
 ##
 EXTRA_DIST += \
 	luatexdir/Makefile.in \
-	luatexdir/depend.mk \
 	luatexdir/luatex.mk \
 	luatexdir/luatexlib.mk
diff --git a/Build/source/texk/web2c/luatexdir/avl.h b/Build/source/texk/web2c/luatexdir/avl.h
deleted file mode 100644
index b9f9e3c01a9..00000000000
--- a/Build/source/texk/web2c/luatexdir/avl.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Produced by texiweb from libavl.w. */
-
-/* libavl - library for manipulation of binary trees.
-   Copyright (C) 1998-2002, 2004 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-   See the GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
-
-   The author may be contacted at <blp@gnu.org> on the Internet, or
-   write to Ben Pfaff, Stanford University, Computer Science Dept., 353
-   Serra Mall, Stanford CA 94305, USA.
-*/
-
-#ifndef AVL_H
-#define AVL_H 1
-
-#include <stddef.h>
-
-/* Function types. */
-typedef int avl_comparison_func (const void *avl_a, const void *avl_b,
-                                 void *avl_param);
-typedef void avl_item_func (void *avl_item, void *avl_param);
-typedef void *avl_copy_func (void *avl_item, void *avl_param);
-
-#ifndef LIBAVL_ALLOCATOR
-#define LIBAVL_ALLOCATOR
-/* Memory allocator. */
-struct libavl_allocator
-  {
-    void *(*libavl_malloc) (struct libavl_allocator *, size_t libavl_size);
-    void (*libavl_free) (struct libavl_allocator *, void *libavl_block);
-  };
-#endif
-
-/* Default memory allocator. */
-extern struct libavl_allocator avl_allocator_default;
-void *avl_malloc (struct libavl_allocator *, size_t);
-void avl_free (struct libavl_allocator *, void *);
-
-/* Maximum AVL height. */
-#ifndef AVL_MAX_HEIGHT
-#define AVL_MAX_HEIGHT 32
-#endif
-
-/* Tree data structure. */
-struct avl_table
-  {
-    struct avl_node *avl_root;          /* Tree's root. */
-    avl_comparison_func *avl_compare;   /* Comparison function. */
-    void *avl_param;                    /* Extra argument to |avl_compare|. */
-    struct libavl_allocator *avl_alloc; /* Memory allocator. */
-    size_t avl_count;                   /* Number of items in tree. */
-    unsigned long avl_generation;       /* Generation number. */
-  };
-
-/* An AVL tree node. */
-struct avl_node
-  {
-    struct avl_node *avl_link[2];  /* Subtrees. */
-    void *avl_data;                /* Pointer to data. */
-    signed char avl_balance;       /* Balance factor. */
-  };
-
-/* AVL traverser structure. */
-struct avl_traverser
-  {
-    struct avl_table *avl_table;        /* Tree being traversed. */
-    struct avl_node *avl_node;          /* Current node in tree. */
-    struct avl_node *avl_stack[AVL_MAX_HEIGHT];
-                                        /* All the nodes above |avl_node|. */
-    size_t avl_height;                  /* Number of nodes in |avl_parent|. */
-    unsigned long avl_generation;       /* Generation number. */
-  };
-
-/* Table functions. */
-struct avl_table *avl_create (avl_comparison_func *, void *,
-                              struct libavl_allocator *);
-struct avl_table *avl_copy (const struct avl_table *, avl_copy_func *,
-                            avl_item_func *, struct libavl_allocator *);
-void avl_destroy (struct avl_table *, avl_item_func *);
-void **avl_probe (struct avl_table *, void *);
-void *avl_insert (struct avl_table *, void *);
-void *avl_replace (struct avl_table *, void *);
-void *avl_delete (struct avl_table *, const void *);
-void *avl_find (const struct avl_table *, const void *);
-void avl_assert_insert (struct avl_table *, void *);
-void *avl_assert_delete (struct avl_table *, void *);
-
-#define avl_count(table) ((size_t) (table)->avl_count)
-
-/* Table traverser functions. */
-void avl_t_init (struct avl_traverser *, struct avl_table *);
-void *avl_t_first (struct avl_traverser *, struct avl_table *);
-void *avl_t_last (struct avl_traverser *, struct avl_table *);
-void *avl_t_find (struct avl_traverser *, struct avl_table *, void *);
-void *avl_t_insert (struct avl_traverser *, struct avl_table *, void *);
-void *avl_t_copy (struct avl_traverser *, const struct avl_traverser *);
-void *avl_t_next (struct avl_traverser *);
-void *avl_t_prev (struct avl_traverser *);
-void *avl_t_cur (struct avl_traverser *);
-void *avl_t_replace (struct avl_traverser *, void *);
-
-#endif /* avl.h */
diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am
index 12f7b7e5ad4..df3e78671e7 100644
--- a/Build/source/texk/web2c/man/Makefile.am
+++ b/Build/source/texk/web2c/man/Makefile.am
@@ -1,48 +1,82 @@
 ##
-man_sources = \
+man_sources = $(bootstrap_man_sources)
+EXTRA_DIST = $(bootstrap_man_sources)
+bootstrap_man_sources = cweb.man tangle.man
+
+if WEB
+man_sources += $(web_man_sources)
+endif WEB
+EXTRA_DIST += $(web_man_sources)
+web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
+	gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
+	pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
+
+man_sources += $(mpware_man_sources)
+EXTRA_DIST += $(mpware_man_sources)
+mpware_man_sources = dmp.man makempx.man mpto.man newer.man
+
+if TEX
+man_sources += tex.man
+endif TEX
+EXTRA_DIST += tex.man
+
+if MF
+man_sources += mf.man
+if MFN
+man_sources +=
+endif MFN
+endif MF
+EXTRA_DIST += mf.man
+
+if MP
+man_sources += mpost.man
+endif MP
+EXTRA_DIST += mpost.man
+
+if ETEX
+man_sources += etex.man
+endif ETEX
+EXTRA_DIST += etex.man
+
+if PDFTEX
+man_sources += $(pdeftex_man_sources)
+endif PDFTEX
+EXTRA_DIST += $(pdeftex_man_sources)
+pdeftex_man_sources = pdftex.man pdftosrc.man
+
+if LUATEX
+man_sources +=
+endif LUATEX
+
+if XETEX
+man_sources +=
+endif XETEX
+
+if OTANGLE
+man_sources +=
+endif OTANGLE
+
+if OMEGA
+man_sources += omega.man
+endif OMEGA
+EXTRA_DIST += omega.man
+
+if ALEPH
+man_sources +=
+endif ALEPH
+
+man_sources += $(misc_man_sources)
+EXTRA_DIST += $(misc_man_sources)
+misc_man_sources = \
 	amstex.man \
-	bibtex.man \
-	cweb.man \
-	dmp.man \
-	dvicopy.man \
-	dvitomp.man \
-	dvitype.man \
 	eplain.man \
-	etex.man \
-	gftodvi.man \
-	gftopk.man \
-	gftype.man \
 	latex.man \
-	makempx.man \
-	mf.man \
-	mft.man \
-	mpost.man \
-	mpto.man \
-	newer.man \
-	omega.man \
-	patgen.man \
-	pdfetex.man \
-	pdftex.man \
-	pdftosrc.man \
-	pktogf.man \
-	pktype.man \
-	pltotf.man \
-	pooltype.man \
-	tangle.man \
-	tex.man \
-	tftopl.man \
-	vftovp.man \
-	vptovf.man \
-	weave.man
-
-EXTRA_DIST =
-DISTCLEANFILES =
+	pdfetex.man
 
 include $(top_srcdir)/../am/man.am
 
-## ###### 
-## Obsolete ??
-
+## Obsolete ?
+##
 EXTRA_DIST += \
 	amslatex.min \
 	initex.min \
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 8e6d5bba67c..6d90996ce1c 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -31,6 +31,18 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@WEB_TRUE@am__append_1 = $(web_man_sources)
+@TEX_TRUE@am__append_2 = tex.man
+@MF_TRUE@am__append_3 = mf.man
+@MFN_TRUE@@MF_TRUE@am__append_4 = 
+@MP_TRUE@am__append_5 = mpost.man
+@ETEX_TRUE@am__append_6 = etex.man
+@PDFTEX_TRUE@am__append_7 = $(pdeftex_man_sources)
+@LUATEX_TRUE@am__append_8 = 
+@XETEX_TRUE@am__append_9 = 
+@OTANGLE_TRUE@am__append_10 = 
+@OMEGA_TRUE@am__append_11 = omega.man
+@ALEPH_TRUE@am__append_12 = 
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../am/man.am ChangeLog
 subdir = man
@@ -38,6 +50,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -82,6 +95,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -219,51 +235,37 @@ top_srcdir = @top_srcdir@
 wlibs = @wlibs@
 x_ext_lib = @x_ext_lib@
 x_tool_libs = @x_tool_libs@
-man_sources = \
+man_sources = $(bootstrap_man_sources) $(am__append_1) \
+	$(mpware_man_sources) $(am__append_2) $(am__append_3) \
+	$(am__append_4) $(am__append_5) $(am__append_6) \
+	$(am__append_7) $(am__append_8) $(am__append_9) \
+	$(am__append_10) $(am__append_11) $(am__append_12) \
+	$(misc_man_sources)
+EXTRA_DIST = $(bootstrap_man_sources) $(web_man_sources) \
+	$(mpware_man_sources) tex.man mf.man mpost.man etex.man \
+	$(pdeftex_man_sources) omega.man $(misc_man_sources) \
+	amslatex.min initex.min lamstex.min pdftexman.m4 slitex.min \
+	spell.add virtex.min
+bootstrap_man_sources = cweb.man tangle.man
+web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \
+	gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \
+	pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man
+
+mpware_man_sources = dmp.man makempx.man mpto.man newer.man
+pdeftex_man_sources = pdftex.man pdftosrc.man
+misc_man_sources = \
 	amstex.man \
-	bibtex.man \
-	cweb.man \
-	dmp.man \
-	dvicopy.man \
-	dvitomp.man \
-	dvitype.man \
 	eplain.man \
-	etex.man \
-	gftodvi.man \
-	gftopk.man \
-	gftype.man \
 	latex.man \
-	makempx.man \
-	mf.man \
-	mft.man \
-	mpost.man \
-	mpto.man \
-	newer.man \
-	omega.man \
-	patgen.man \
-	pdfetex.man \
-	pdftex.man \
-	pdftosrc.man \
-	pktogf.man \
-	pktype.man \
-	pltotf.man \
-	pooltype.man \
-	tangle.man \
-	tex.man \
-	tftopl.man \
-	vftovp.man \
-	vptovf.man \
-	weave.man
-
-EXTRA_DIST = $(man_sources) amslatex.min initex.min lamstex.min \
-	pdftexman.m4 slitex.min spell.add virtex.min
-DISTCLEANFILES = sedscript $(man_files) $(DVIS) $(PSS)
+	pdfetex.man
+
 SUFFIXES = .1 .man .ps .dvi
 man_files = $(man_sources:.man=.1)
 nodist_man1_MANS = $(man_files)
 DITROFF = groff
 DVIS = $(man_files:.1=.dvi)
 PSS = $(man_files:.1=.ps)
+DISTCLEANFILES = sedscript $(man_files) $(DVIS) $(PSS)
 all: all-am
 
 .SUFFIXES:
diff --git a/Build/source/texk/web2c/mpware/Makefile.am b/Build/source/texk/web2c/mpware/Makefile.am
index 2f051227ed6..6242822210e 100644
--- a/Build/source/texk/web2c/mpware/Makefile.am
+++ b/Build/source/texk/web2c/mpware/Makefile.am
@@ -26,13 +26,11 @@ mpto_SOURCES = mpto.c
 
 newer_SOURCES = newer.c
 
-## ######
 ## Obsolete ?
-
+##
 EXTRA_DIST = makempx.in
 
-## ######
 ## Evetually delete these files
-
+##
 EXTRA_DIST += Makefile.in.orig
 
diff --git a/Build/source/texk/web2c/mpware/Makefile.in b/Build/source/texk/web2c/mpware/Makefile.in
index 5da7ffc196a..dcda668250f 100644
--- a/Build/source/texk/web2c/mpware/Makefile.in
+++ b/Build/source/texk/web2c/mpware/Makefile.in
@@ -41,6 +41,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -113,6 +114,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index 0880ddae6c4..7f1e581bb44 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -40,6 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -119,6 +120,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 5164fbffe08..89eeaf37e24 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -43,6 +43,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -121,6 +122,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index eff127b9d9a..5fc0c8748b6 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -40,6 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
+	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -108,6 +109,9 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_HACK_DEPS = @CXX_HACK_DEPS@
+CXX_HACK_LIBS = @CXX_HACK_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 1d1192d7c80..74d4ff377d7 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -30,8 +30,12 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) \
+	$(srcdir)/../build-aux/config.guess \
+	$(srcdir)/../build-aux/config.sub \
 	$(srcdir)/../build-aux/install-sh \
 	$(srcdir)/../build-aux/missing $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
@@ -40,7 +44,9 @@ DIST_COMMON = README $(am__configure_deps) \
 	../build-aux/ltmain.sh ../build-aux/missing \
 	../build-aux/texinfo.tex ../build-aux/ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-pkgs.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../m4/kpse-options.m4 \
+	$(top_srcdir)/../m4/kpse-pkgs.m4 \
 	$(top_srcdir)/../m4/kpse-setup.m4 \
 	$(top_srcdir)/../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../ac/withenable.ac \
@@ -173,14 +179,22 @@ am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4
index 09141f30b8f..c917492c6a5 100644
--- a/Build/source/utils/aclocal.m4
+++ b/Build/source/utils/aclocal.m4
@@ -616,6 +616,8 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../m4/kpse-cxx-hack.m4])
+m4_include([../m4/kpse-options.m4])
 m4_include([../m4/kpse-pkgs.m4])
 m4_include([../m4/kpse-setup.m4])
 m4_include([../m4/kpse-web2c.m4])
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 8d0b24c0014..ba156f46dfb 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -633,6 +633,14 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 target_alias
 host_alias
 build_alias
@@ -673,6 +681,9 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_all_pkgs
+enable_cxx_runtime_hack
+enable_multiplatform
 enable_dialog
 enable_pdfopen
 enable_ps2eps
@@ -1408,6 +1419,10 @@ Program names:
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
@@ -1421,6 +1436,10 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-all-pkgs      do not build packages unless explicitly enabled
+  --enable-cxx-runtime-hack  link C++ runtime statically
+  --enable-multiplatform  put executables into bin/PLATFORM and libraries into
+                          lib/PLATFORM
   --disable-dialog        do not build the dialog package
   --disable-pdfopen       do not build the pdfopen package
   --disable-ps2eps        do not build the ps2eps package
@@ -2037,8 +2056,116 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+
 
+# Check whether --enable-all-pkgs was given.
+if test "${enable_all_pkgs+set}" = set; then
+  enableval=$enable_all_pkgs;
+fi
+test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes
+# Check whether --enable-cxx-runtime-hack was given.
+if test "${enable_cxx_runtime_hack+set}" = set; then
+  enableval=$enable_cxx_runtime_hack;
+fi
 
+# Check whether --enable-multiplatform was given.
+if test "${enable_multiplatform+set}" = set; then
+  enableval=$enable_multiplatform;
+fi
+if test "x$enable_multiplatform" = xyes; then
+  if test "x$bindir" = 'x${exec_prefix}/bin'; then
+    bindir="$bindir/$host"
+    ac_configure_args="$ac_configure_args '--bindir=$bindir'"
+  fi
+  if test "x$libdir" = 'x${exec_prefix}/lib'; then
+    libdir="$libdir/$host"
+    ac_configure_args="$ac_configure_args '--libdir=$libdir'"
+  fi
+fi
 
 
 ## ac/withenable.ac
@@ -2053,10 +2180,10 @@ if test "${enable_dialog+set}" = set; then
 fi
 case $enable_dialog in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dialog'" >&5
-$as_echo "$as_me: Assuming \`--enable-dialog'" >&6;}
-     enable_dialog=yes
-     ac_configure_args="$ac_configure_args '--enable-dialog'";;
+  *) enable_dialog=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dialog=$enable_dialog'" >&5
+$as_echo "$as_me: Assuming \`--enable-dialog=$enable_dialog'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dialog=$enable_dialog'";;
 esac
 
 
@@ -2068,10 +2195,10 @@ if test "${enable_pdfopen+set}" = set; then
 fi
 case $enable_pdfopen in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-pdfopen'" >&5
-$as_echo "$as_me: Assuming \`--enable-pdfopen'" >&6;}
-     enable_pdfopen=yes
-     ac_configure_args="$ac_configure_args '--enable-pdfopen'";;
+  *) enable_pdfopen=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&5
+$as_echo "$as_me: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-pdfopen=$enable_pdfopen'";;
 esac
 
 
@@ -2083,10 +2210,10 @@ if test "${enable_ps2eps+set}" = set; then
 fi
 case $enable_ps2eps in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2eps'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2eps'" >&6;}
-     enable_ps2eps=yes
-     ac_configure_args="$ac_configure_args '--enable-ps2eps'";;
+  *) enable_ps2eps=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2eps=$enable_ps2eps'";;
 esac
 
 
@@ -2098,10 +2225,10 @@ if test "${enable_psutils+set}" = set; then
 fi
 case $enable_psutils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-psutils'" >&5
-$as_echo "$as_me: Assuming \`--enable-psutils'" >&6;}
-     enable_psutils=yes
-     ac_configure_args="$ac_configure_args '--enable-psutils'";;
+  *) enable_psutils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-psutils=$enable_psutils'" >&5
+$as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-psutils=$enable_psutils'";;
 esac
 
 
@@ -2113,10 +2240,10 @@ if test "${enable_t1utils+set}" = set; then
 fi
 case $enable_t1utils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-t1utils'" >&5
-$as_echo "$as_me: Assuming \`--enable-t1utils'" >&6;}
-     enable_t1utils=yes
-     ac_configure_args="$ac_configure_args '--enable-t1utils'";;
+  *) enable_t1utils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-t1utils=$enable_t1utils'" >&5
+$as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-t1utils=$enable_t1utils'";;
 esac
 
 
@@ -2128,10 +2255,10 @@ if test "${enable_tpic2pdftex+set}" = set; then
 fi
 case $enable_tpic2pdftex in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-tpic2pdftex'" >&5
-$as_echo "$as_me: Assuming \`--enable-tpic2pdftex'" >&6;}
-     enable_tpic2pdftex=yes
-     ac_configure_args="$ac_configure_args '--enable-tpic2pdftex'";;
+  *) enable_tpic2pdftex=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&5
+$as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tpic2pdftex=$enable_tpic2pdftex'";;
 esac
 
 
@@ -2143,10 +2270,10 @@ if test "${enable_vlna+set}" = set; then
 fi
 case $enable_vlna in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-vlna'" >&5
-$as_echo "$as_me: Assuming \`--enable-vlna'" >&6;}
-     enable_vlna=yes
-     ac_configure_args="$ac_configure_args '--enable-vlna'";;
+  *) enable_vlna=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-vlna=$enable_vlna'" >&5
+$as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-vlna=$enable_vlna'";;
 esac
 
 
@@ -2161,10 +2288,10 @@ if test "${enable_web2c+set}" = set; then
 fi
 case $enable_web2c in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-web2c'" >&5
-$as_echo "$as_me: Assuming \`--enable-web2c'" >&6;}
-     enable_web2c=yes
-     ac_configure_args="$ac_configure_args '--enable-web2c'";;
+  *) enable_web2c=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-web2c=$enable_web2c'" >&5
+$as_echo "$as_me: Assuming \`--enable-web2c=$enable_web2c'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-web2c=$enable_web2c'";;
 esac
 
 test "x$enable_web2c" = xno || {
@@ -2336,10 +2463,10 @@ if test "${enable_one+set}" = set; then
 fi
 case $enable_one in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--disable-one'" >&5
-$as_echo "$as_me: Assuming \`--disable-one'" >&6;}
-     enable_one=no
-     ac_configure_args="$ac_configure_args '--disable-one'";;
+  *) enable_one=no
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-one=$enable_one'" >&5
+$as_echo "$as_me: Assuming \`--enable-one=$enable_one'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-one=$enable_one'";;
 esac
 
 test "x$enable_one" = xno || {
@@ -2359,10 +2486,10 @@ if test "${enable_afm2pl+set}" = set; then
 fi
 case $enable_afm2pl in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-afm2pl'" >&5
-$as_echo "$as_me: Assuming \`--enable-afm2pl'" >&6;}
-     enable_afm2pl=yes
-     ac_configure_args="$ac_configure_args '--enable-afm2pl'";;
+  *) enable_afm2pl=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&5
+$as_echo "$as_me: Assuming \`--enable-afm2pl=$enable_afm2pl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-afm2pl=$enable_afm2pl'";;
 esac
 
 test "x$enable_afm2pl" = xno || {
@@ -2378,10 +2505,10 @@ if test "${enable_bibtex8+set}" = set; then
 fi
 case $enable_bibtex8 in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-bibtex8'" >&5
-$as_echo "$as_me: Assuming \`--enable-bibtex8'" >&6;}
-     enable_bibtex8=yes
-     ac_configure_args="$ac_configure_args '--enable-bibtex8'";;
+  *) enable_bibtex8=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-bibtex8=$enable_bibtex8'" >&5
+$as_echo "$as_me: Assuming \`--enable-bibtex8=$enable_bibtex8'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-bibtex8=$enable_bibtex8'";;
 esac
 
 test "x$enable_bibtex8" = xno || {
@@ -2397,10 +2524,10 @@ if test "${enable_cjkutils+set}" = set; then
 fi
 case $enable_cjkutils in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-cjkutils'" >&5
-$as_echo "$as_me: Assuming \`--enable-cjkutils'" >&6;}
-     enable_cjkutils=yes
-     ac_configure_args="$ac_configure_args '--enable-cjkutils'";;
+  *) enable_cjkutils=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&5
+$as_echo "$as_me: Assuming \`--enable-cjkutils=$enable_cjkutils'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-cjkutils=$enable_cjkutils'";;
 esac
 
 test "x$enable_cjkutils" = xno || {
@@ -2416,10 +2543,10 @@ if test "${enable_detex+set}" = set; then
 fi
 case $enable_detex in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-detex'" >&5
-$as_echo "$as_me: Assuming \`--enable-detex'" >&6;}
-     enable_detex=yes
-     ac_configure_args="$ac_configure_args '--enable-detex'";;
+  *) enable_detex=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-detex=$enable_detex'" >&5
+$as_echo "$as_me: Assuming \`--enable-detex=$enable_detex'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-detex=$enable_detex'";;
 esac
 
 test "x$enable_detex" = xno || {
@@ -2435,10 +2562,10 @@ if test "${enable_devnag+set}" = set; then
 fi
 case $enable_devnag in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-devnag'" >&5
-$as_echo "$as_me: Assuming \`--enable-devnag'" >&6;}
-     enable_devnag=yes
-     ac_configure_args="$ac_configure_args '--enable-devnag'";;
+  *) enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'";;
 esac
 
 
@@ -2450,10 +2577,10 @@ if test "${enable_dtl+set}" = set; then
 fi
 case $enable_dtl in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dtl'" >&5
-$as_echo "$as_me: Assuming \`--enable-dtl'" >&6;}
-     enable_dtl=yes
-     ac_configure_args="$ac_configure_args '--enable-dtl'";;
+  *) enable_dtl=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dtl=$enable_dtl'" >&5
+$as_echo "$as_me: Assuming \`--enable-dtl=$enable_dtl'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dtl=$enable_dtl'";;
 esac
 
 test "x$enable_dtl" = xno || {
@@ -2469,10 +2596,10 @@ if test "${enable_dvi2tty+set}" = set; then
 fi
 case $enable_dvi2tty in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvi2tty'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvi2tty'" >&6;}
-     enable_dvi2tty=yes
-     ac_configure_args="$ac_configure_args '--enable-dvi2tty'";;
+  *) enable_dvi2tty=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvi2tty=$enable_dvi2tty'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvi2tty=$enable_dvi2tty'";;
 esac
 
 test "x$enable_dvi2tty" = xno || {
@@ -2488,10 +2615,10 @@ if test "${enable_dvidvi+set}" = set; then
 fi
 case $enable_dvidvi in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvidvi'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvidvi'" >&6;}
-     enable_dvidvi=yes
-     ac_configure_args="$ac_configure_args '--enable-dvidvi'";;
+  *) enable_dvidvi=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvidvi=$enable_dvidvi'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvidvi=$enable_dvidvi'";;
 esac
 
 test "x$enable_dvidvi" = xno || {
@@ -2507,10 +2634,10 @@ if test "${enable_dviljk+set}" = set; then
 fi
 case $enable_dviljk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dviljk'" >&5
-$as_echo "$as_me: Assuming \`--enable-dviljk'" >&6;}
-     enable_dviljk=yes
-     ac_configure_args="$ac_configure_args '--enable-dviljk'";;
+  *) enable_dviljk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dviljk=$enable_dviljk'" >&5
+$as_echo "$as_me: Assuming \`--enable-dviljk=$enable_dviljk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dviljk=$enable_dviljk'";;
 esac
 
 test "x$enable_dviljk" = xno || {
@@ -2526,10 +2653,10 @@ if test "${enable_dvipdfm+set}" = set; then
 fi
 case $enable_dvipdfm in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfm'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipdfm'" >&6;}
-     enable_dvipdfm=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipdfm'";;
+  *) enable_dvipdfm=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfm=$enable_dvipdfm'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipdfm=$enable_dvipdfm'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipdfm=$enable_dvipdfm'";;
 esac
 
 test "x$enable_dvipdfm" = xno || {
@@ -2546,10 +2673,10 @@ if test "${enable_dvipdfmx+set}" = set; then
 fi
 case $enable_dvipdfmx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfmx'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipdfmx'" >&6;}
-     enable_dvipdfmx=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipdfmx'";;
+  *) enable_dvipdfmx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfmx=$enable_dvipdfmx'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipdfmx=$enable_dvipdfmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipdfmx=$enable_dvipdfmx'";;
 esac
 
 test "x$enable_dvipdfmx" = xno || {
@@ -2566,10 +2693,10 @@ if test "${enable_dvipng+set}" = set; then
 fi
 case $enable_dvipng in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipng'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipng'" >&6;}
-     enable_dvipng=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipng'";;
+  *) enable_dvipng=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipng=$enable_dvipng'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipng=$enable_dvipng'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipng=$enable_dvipng'";;
 esac
 
 test "x$enable_dvipng" = xno || {
@@ -2607,10 +2734,10 @@ if test "${enable_dvipos+set}" = set; then
 fi
 case $enable_dvipos in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipos'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipos'" >&6;}
-     enable_dvipos=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipos'";;
+  *) enable_dvipos=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipos=$enable_dvipos'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipos=$enable_dvipos'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipos=$enable_dvipos'";;
 esac
 
 test "x$enable_dvipos" = xno || {
@@ -2626,10 +2753,10 @@ if test "${enable_dvipsk+set}" = set; then
 fi
 case $enable_dvipsk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipsk'" >&5
-$as_echo "$as_me: Assuming \`--enable-dvipsk'" >&6;}
-     enable_dvipsk=yes
-     ac_configure_args="$ac_configure_args '--enable-dvipsk'";;
+  *) enable_dvipsk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&5
+$as_echo "$as_me: Assuming \`--enable-dvipsk=$enable_dvipsk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-dvipsk=$enable_dvipsk'";;
 esac
 
 test "x$enable_dvipsk" = xno || {
@@ -2645,10 +2772,10 @@ if test "${enable_gsftopk+set}" = set; then
 fi
 case $enable_gsftopk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-gsftopk'" >&5
-$as_echo "$as_me: Assuming \`--enable-gsftopk'" >&6;}
-     enable_gsftopk=yes
-     ac_configure_args="$ac_configure_args '--enable-gsftopk'";;
+  *) enable_gsftopk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&5
+$as_echo "$as_me: Assuming \`--enable-gsftopk=$enable_gsftopk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-gsftopk=$enable_gsftopk'";;
 esac
 
 test "x$enable_gsftopk" = xno || {
@@ -2664,10 +2791,10 @@ if test "${enable_lacheck+set}" = set; then
 fi
 case $enable_lacheck in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-lacheck'" >&5
-$as_echo "$as_me: Assuming \`--enable-lacheck'" >&6;}
-     enable_lacheck=yes
-     ac_configure_args="$ac_configure_args '--enable-lacheck'";;
+  *) enable_lacheck=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-lacheck=$enable_lacheck'" >&5
+$as_echo "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lacheck=$enable_lacheck'";;
 esac
 
 test "x$enable_lacheck" = xno || {
@@ -2683,10 +2810,10 @@ if test "${enable_lcdf_typetools+set}" = set; then
 fi
 case $enable_lcdf_typetools in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-lcdf-typetools'" >&5
-$as_echo "$as_me: Assuming \`--enable-lcdf-typetools'" >&6;}
-     enable_lcdf_typetools=yes
-     ac_configure_args="$ac_configure_args '--enable-lcdf-typetools'";;
+  *) enable_lcdf_typetools=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&5
+$as_echo "$as_me: Assuming \`--enable-lcdf-typetools=$enable_lcdf_typetools'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-lcdf-typetools=$enable_lcdf_typetools'";;
 esac
 
 test "x$enable_lcdf_typetools" = xno || {
@@ -2763,10 +2890,10 @@ if test "${enable_makeindexk+set}" = set; then
 fi
 case $enable_makeindexk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-makeindexk'" >&5
-$as_echo "$as_me: Assuming \`--enable-makeindexk'" >&6;}
-     enable_makeindexk=yes
-     ac_configure_args="$ac_configure_args '--enable-makeindexk'";;
+  *) enable_makeindexk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&5
+$as_echo "$as_me: Assuming \`--enable-makeindexk=$enable_makeindexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-makeindexk=$enable_makeindexk'";;
 esac
 
 test "x$enable_makeindexk" = xno || {
@@ -2782,10 +2909,10 @@ if test "${enable_musixflx+set}" = set; then
 fi
 case $enable_musixflx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-musixflx'" >&5
-$as_echo "$as_me: Assuming \`--enable-musixflx'" >&6;}
-     enable_musixflx=yes
-     ac_configure_args="$ac_configure_args '--enable-musixflx'";;
+  *) enable_musixflx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-musixflx=$enable_musixflx'" >&5
+$as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-musixflx=$enable_musixflx'";;
 esac
 
 
@@ -2797,10 +2924,10 @@ if test "${enable_ps2pkm+set}" = set; then
 fi
 case $enable_ps2pkm in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2pkm'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2pkm'" >&6;}
-     enable_ps2pkm=yes
-     ac_configure_args="$ac_configure_args '--enable-ps2pkm'";;
+  *) enable_ps2pkm=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ps2pkm=$enable_ps2pkm'";;
 esac
 
 test "x$enable_ps2pkm" = xno || {
@@ -2816,10 +2943,10 @@ if test "${enable_seetexk+set}" = set; then
 fi
 case $enable_seetexk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-seetexk'" >&5
-$as_echo "$as_me: Assuming \`--enable-seetexk'" >&6;}
-     enable_seetexk=yes
-     ac_configure_args="$ac_configure_args '--enable-seetexk'";;
+  *) enable_seetexk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-seetexk=$enable_seetexk'" >&5
+$as_echo "$as_me: Assuming \`--enable-seetexk=$enable_seetexk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-seetexk=$enable_seetexk'";;
 esac
 
 test "x$enable_seetexk" = xno || {
@@ -2835,10 +2962,10 @@ if test "${enable_tex4htk+set}" = set; then
 fi
 case $enable_tex4htk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-tex4htk'" >&5
-$as_echo "$as_me: Assuming \`--enable-tex4htk'" >&6;}
-     enable_tex4htk=yes
-     ac_configure_args="$ac_configure_args '--enable-tex4htk'";;
+  *) enable_tex4htk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&5
+$as_echo "$as_me: Assuming \`--enable-tex4htk=$enable_tex4htk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-tex4htk=$enable_tex4htk'";;
 esac
 
 test "x$enable_tex4htk" = xno || {
@@ -2854,10 +2981,10 @@ if test "${enable_ttf2pk+set}" = set; then
 fi
 case $enable_ttf2pk in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttf2pk'" >&5
-$as_echo "$as_me: Assuming \`--enable-ttf2pk'" >&6;}
-     enable_ttf2pk=yes
-     ac_configure_args="$ac_configure_args '--enable-ttf2pk'";;
+  *) enable_ttf2pk=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&5
+$as_echo "$as_me: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttf2pk=$enable_ttf2pk'";;
 esac
 
 test "x$enable_ttf2pk" = xno || {
@@ -2874,10 +3001,10 @@ if test "${enable_ttfdump+set}" = set; then
 fi
 case $enable_ttfdump in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttfdump'" >&5
-$as_echo "$as_me: Assuming \`--enable-ttfdump'" >&6;}
-     enable_ttfdump=yes
-     ac_configure_args="$ac_configure_args '--enable-ttfdump'";;
+  *) enable_ttfdump=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&5
+$as_echo "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttfdump=$enable_ttfdump'";;
 esac
 
 test "x$enable_ttfdump" = xno || {
@@ -2893,10 +3020,10 @@ if test "${enable_xdv2pdf+set}" = set; then
 fi
 case $enable_xdv2pdf in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdv2pdf'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdv2pdf'" >&6;}
-     enable_xdv2pdf=yes
-     ac_configure_args="$ac_configure_args '--enable-xdv2pdf'";;
+  *) enable_xdv2pdf=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdv2pdf=$enable_xdv2pdf'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdv2pdf=$enable_xdv2pdf'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdv2pdf=$enable_xdv2pdf'";;
 esac
 
 test "x$enable_xdv2pdf" = xno || {
@@ -2912,10 +3039,10 @@ if test "${enable_xdvik+set}" = set; then
 fi
 case $enable_xdvik in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvik'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdvik'" >&6;}
-     enable_xdvik=yes
-     ac_configure_args="$ac_configure_args '--enable-xdvik'";;
+  *) enable_xdvik=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvik=$enable_xdvik'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdvik=$enable_xdvik'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdvik=$enable_xdvik'";;
 esac
 
 test "x$enable_xdvik" = xno || {
@@ -2932,10 +3059,10 @@ if test "${enable_xdvipdfmx+set}" = set; then
 fi
 case $enable_xdvipdfmx in #(
   yes|no);; #(
-  *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvipdfmx'" >&5
-$as_echo "$as_me: Assuming \`--enable-xdvipdfmx'" >&6;}
-     enable_xdvipdfmx=yes
-     ac_configure_args="$ac_configure_args '--enable-xdvipdfmx'";;
+  *) enable_xdvipdfmx=$enable_all_pkgs
+     { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvipdfmx=$enable_xdvipdfmx'" >&5
+$as_echo "$as_me: Assuming \`--enable-xdvipdfmx=$enable_xdvipdfmx'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-xdvipdfmx=$enable_xdvipdfmx'";;
 esac
 
 test "x$enable_xdvipdfmx" = xno || {
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2009-03-29 16:03:30 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2009-03-29 16:03:30 +0000
commit	1de70c5fe1e18157efb4a592390ce08534139aa0 (patch)
tree	e95068190830febe15dfaab6f0600fb769492706 /Build
parent	5b8dcec4983808da1a0b25a4f41435b03370a79f (diff)