build system: various small fixes for mingw32 cross compilation

still incomplete git-svn-id: svn://tug.org/texlive/trunk@17141 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2010-02-22 12:09:38 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2010-02-22 12:09:38 +0000
commit: b287d7f6a13823ea17e0bd415981d3a5953ca703 (patch)
tree: a420b28a35f7761f064d50bb610dbb2b46c71486 /Build/source/texk/web2c
parent: 5fd6fd3479fcbbda52ebca7b5e80a5aaa1add69f (diff)
34 files changed, 1041 insertions, 411 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 273efd89b76..2fe43bf253e 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,6 +1,10 @@
 2010-02-22  Karl Berry  <karl@tug.org>
 
-	* configure.ac: (web2_version): move to 2010dev.
+	* configure.ac: (web2_version): move to 2010/dev.
+
+2010-02-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/texmf.am (mf_x_libs): Use libgdi32 for WIN32.
 
 2010-02-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 31dda0d8452..feed9312c97 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -568,9 +568,10 @@ md5main_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	$(LDFLAGS) -o $@
 nodist_mf_OBJECTS = mf-mfextra.$(OBJEXT)
 mf_OBJECTS = $(nodist_mf_OBJECTS)
-am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@WIN32_FALSE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) \
+@WIN32_FALSE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@WIN32_FALSE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@WIN32_FALSE@	$(am__DEPENDENCIES_1)
 mf_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) \
 	$(am__DEPENDENCIES_5)
 mf_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -892,6 +893,7 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -911,6 +913,7 @@ CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -1457,7 +1460,8 @@ windowlib = window/libwindow.a
 # All the x_... and X_... variables will be empty if we aren't supporting X.
 # Follow the library order used in X11R6 itself:
 #   -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
-mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXTRA_LIBS)
+@WIN32_FALSE@mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXTRA_LIBS)
+@WIN32_TRUE@mf_x_libs = -lgdi32
 
 # Metafont C sources
 mf_c_h = mfini.c mf0.c mfcoerce.h mfd.h
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index 999f5221a9d..1eda64046ea 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -104,6 +104,9 @@ mf_nowin_LDADD = libmf.a $(LDADD) $(windowlib)
 windowlib = window/libwindow.a
 $(windowlib): mfd.h $(srcdir)/window/*.c
 	cd window && $(MAKE) $(AM_MAKEFLAGS) libwindow.a
+if WIN32
+mf_x_libs = -lgdi32
+else !WIN32
 # Make `#include <X11/...>' and `-lX...' work.
 # This matches xdvik.
 # wlibs is substituted by web2c's configure, LIBS by general configure
@@ -112,6 +115,7 @@ $(windowlib): mfd.h $(srcdir)/window/*.c
 # Follow the library order used in X11R6 itself:
 #   -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
 mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXTRA_LIBS)
+endif !WIN32
 
 ## mf and mf-nowin compile mfextra.c with different CPPFLAGS.
 ## Automake, however, does not support CPPFLAGS for individual source files.
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index a2cb6793739..8da471bb500 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for Web2C 2010dev.
+# Generated by GNU Autoconf 2.65 for Web2C 2010/dev.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Web2C'
 PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2010dev'
-PACKAGE_STRING='Web2C 2010dev'
+PACKAGE_VERSION='2010/dev'
+PACKAGE_STRING='Web2C 2010/dev'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -886,7 +886,6 @@ DSYMUTIL
 lt_ECHO
 RANLIB
 AR
-OBJDUMP
 LN_S
 NM
 ac_ct_DUMPBIN
@@ -921,6 +920,9 @@ build_vendor
 build_cpu
 build
 LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -1606,7 +1608,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 Web2C 2010dev to adapt to many kinds of systems.
+\`configure' configures Web2C 2010/dev to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1680,7 +1682,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Web2C 2010dev:";;
+     short | recursive ) echo "Configuration of Web2C 2010/dev:";;
    esac
   cat <<\_ACEOF
 
@@ -1858,7 +1860,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Web2C configure 2010dev
+Web2C configure 2010/dev
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2716,7 +2718,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 Web2C $as_me 2010dev, which was
+It was created by Web2C $as_me 2010/dev, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -3090,7 +3092,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-WEB2CVERSION=2010dev
+WEB2CVERSION=2010/dev
 
 
 am__api_version='1.11'
@@ -5169,13 +5171,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:5172: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5174: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5175: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5177: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5178: output\"" >&5)
+  (eval echo "\"\$as_me:5180: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5521,9 +5523,6 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then :
@@ -6381,7 +6380,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6384 "configure"' > conftest.$ac_ext
+  echo '#line 6383 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7447,7 +7446,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='web2c'
- VERSION='2010dev'
+ VERSION='2010/dev'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7514,13 +7513,311 @@ fi
 
 
 # Set options
+enable_win32_dll=yes
 
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-        enable_dlopen=no
 
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AS="as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+        enable_dlopen=no
 
-  enable_win32_dll=no
 
 
             # Check whether --enable-shared was given.
@@ -8013,11 +8310,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:8016: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8313: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8020: \$? = $ac_status" >&5
+   echo "$as_me:8317: \$? = $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.
@@ -8352,11 +8649,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:8355: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8652: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8359: \$? = $ac_status" >&5
+   echo "$as_me:8656: \$? = $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.
@@ -8457,11 +8754,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:8460: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8757: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8464: \$? = $ac_status" >&5
+   echo "$as_me:8761: \$? = $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
@@ -8512,11 +8809,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:8515: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8812: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8519: \$? = $ac_status" >&5
+   echo "$as_me:8816: \$? = $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
@@ -10879,7 +11176,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10882 "configure"
+#line 11179 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10975,7 +11272,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10978 "configure"
+#line 11275 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14765,11 +15062,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:14768: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15065: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14772: \$? = $ac_status" >&5
+   echo "$as_me:15069: \$? = $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.
@@ -14864,11 +15161,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:14867: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15164: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14871: \$? = $ac_status" >&5
+   echo "$as_me:15168: \$? = $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
@@ -14916,11 +15213,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:14919: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15216: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14923: \$? = $ac_status" >&5
+   echo "$as_me:15220: \$? = $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
@@ -19409,7 +19706,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Web2C config.lt 2010dev
+Web2C config.lt 2010/dev
 configured by $0, generated by GNU Autoconf 2.65.
 
 Copyright (C) 2008 Free Software Foundation, Inc.
@@ -19454,6 +19751,9 @@ double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
 macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
 enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
@@ -19480,7 +19780,6 @@ lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
 AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
@@ -19639,7 +19938,6 @@ LN_S \
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
-OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
 AR \
@@ -19857,6 +20155,15 @@ available_tags="CXX "
 macro_version=$macro_version
 macro_revision=$macro_revision
 
+# Assembler program.
+AS=$AS
+
+# DLL creation program.
+DLLTOOL=$DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$OBJDUMP
+
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
@@ -19922,9 +20229,6 @@ NL2SP=$lt_lt_NL2SP
 reload_flag=$lt_reload_flag
 reload_cmds=$lt_reload_cmds
 
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
@@ -22180,7 +22484,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Web2C $as_me 2010dev, which was
+This file was extended by Web2C $as_me 2010/dev, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22246,7 +22550,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Web2C config.status 2010dev
+Web2C config.status 2010/dev
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
@@ -22371,6 +22675,9 @@ double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
 macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
 enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
@@ -22397,7 +22704,6 @@ lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
 AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
@@ -22556,7 +22862,6 @@ LN_S \
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
-OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
 AR \
@@ -23474,6 +23779,15 @@ available_tags="CXX "
 macro_version=$macro_version
 macro_revision=$macro_revision
 
+# Assembler program.
+AS=$AS
+
+# DLL creation program.
+DLLTOOL=$DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$OBJDUMP
+
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
@@ -23539,9 +23853,6 @@ NL2SP=$lt_lt_NL2SP
 reload_flag=$lt_reload_flag
 reload_cmds=$lt_reload_cmds
 
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index e50f75b8264..472e0e64b22 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -19,7 +19,7 @@ dnl get these features if you are willing to hack the sources. If not,
 dnl it'll take a good argument to convince me to invest the time to make
 dnl them configurable.
 dnl
-m4_define([web2_version], [2010dev])
+m4_define([web2_version], [2010/dev])
 AC_INIT([Web2C], web2_version(), [tex-k@tug.org])
 AC_PREREQ([2.65])
 dnl 
diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index 069cea30a89..24e22f59310 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -113,6 +113,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -132,6 +133,7 @@ CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index ce94b027977..318a2b8f16b 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* texmfmp.c: #include <window/mfdisplay.h> instead of externs.
+
+2010-02-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* texmfmp.c (calledit): Use win32_system() with two args only
+	for MinGW32, native WIN32 uses only one arg.
+	(catch_interrupt) [WIN32]: Declare as static.
+
 2010-02-01  Karl Berry  <karl@tug.org>
 
 	* openclose.c (open_input): do not try prepending TEXMFOUTPUT for
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index 4f473047db6..f2ed27b07d1 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -104,6 +104,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -123,6 +124,7 @@ CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 5b2468ead76..8cd5d18834f 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -1791,7 +1791,7 @@ close_file_or_pipe (FILE *f)
    variable `interrupt'; then they will do everything needed.  */
 #ifdef WIN32
 /* Win32 doesn't set SIGINT ... */
-BOOL WINAPI
+static BOOL WINAPI
 catch_interrupt (DWORD arg)
 {
   switch (arg) {
@@ -2048,7 +2048,7 @@ calledit (packedASCIIcode *filename,
   *temp = 0;
 
   /* Execute the command.  */
-#ifdef WIN32
+#ifdef __MINGW32__
   /* Win32 reimplementation of the system() command
      provides opportunity to call it asynchronously */
   if (win32_system(command, true) != 0 )
@@ -2645,77 +2645,9 @@ zmakescaled (integer p, integer q)		/* Approximate 2^16*p/q */
 #undef X11WIN
 #endif
 
-#ifdef AMIGAWIN
-extern int mf_amiga_initscreen (void);
-extern void mf_amiga_updatescreen (void);
-extern void mf_amiga_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_amiga_paintrow (screenrow, pixelcolor, transspec, screencol);
-#endif
-#ifdef EPSFWIN
-extern int mf_epsf_initscreen (void);
-extern void mf_epsf_updatescreen (void);
-extern void mf_epsf_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_epsf_paintrow (screenrow, pixelcolor, transspec, screencol);
-#endif
-#ifdef HP2627WIN
-extern int mf_hp2627_initscreen (void);
-extern void mf_hp2627_updatescreen (void);
-extern void mf_hp2627_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_hp2627_paintrow (screenrow, pixelcolor, transspec, screencol);
-#endif
-#ifdef MFTALKWIN
-extern int mf_mftalk_initscreen (void);
-extern void mf_mftalk_updatescreen (void);
-extern void mf_mftalk_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_mftalk_paintrow (screenrow, pixelcolor, transspec, screencol);
-#endif
-#ifdef NEXTWIN
-extern int mf_next_initscreen (void);
-extern void mf_next_updatescreen (void);
-extern void mf_next_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_next_paintrow (screenrow, pixelcolor, transspec, screencol);
-#endif
-#ifdef REGISWIN
-extern int mf_regis_initscreen (void);
-extern void mf_regis_updatescreen (void);
-extern void mf_regis_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_regis_paintrow (screenrow, pixelcolor, transspec, screencol);
-#endif
-#ifdef SUNWIN
-extern int mf_sun_initscreen (void);
-extern void mf_sun_updatescreen (void);
-extern void mf_sun_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_sun_paintrow (screenrow, pixelcolor, transspec, screencol);
-#endif
-#ifdef TEKTRONIXWIN
-extern int mf_tektronix_initscreen (void);
-extern void mf_tektronix_updatescreen (void);
-extern void mf_tektronix_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_tektronix_paintrow (screenrow, pixelcolor, transspec, screencol);
-#endif
-#ifdef UNITERMWIN
-extern int mf_uniterm_initscreen (void);
-extern void mf_uniterm_updatescreen (void);
-extern void mf_uniterm_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_uniterm_paintrow (screenrow, pixelcolor, transspec, screencol);
-#endif
-#ifdef WIN32WIN
-extern int mf_win32_initscreen (void);
-extern void mf_win32_updatescreen (void);
-extern void mf_win32_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_win32_paintrow (screenrow, pixelcolor, transspec, screencol);
-#endif
-#ifdef X11WIN
-extern int mf_x11_initscreen (void);
-extern void mf_x11_updatescreen (void);
-extern void mf_x11_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_x11_paintrow (screenrow, pixelcolor, transspec, screencol);
-#endif
-extern int mf_trap_initscreen (void);
-extern void mf_trap_updatescreen (void);
-extern void mf_trap_blankrectangle (screencol, screencol, screenrow, screenrow);
-extern void mf_trap_paintrow (screenrow, pixelcolor, transspec, screencol);
-
+/* Prototypes for Metafont display routines: mf_XXX_initscreen,
+   mf_XXX_updatescreen, mf_XXX_blankrectangle, and mf_XXX_paintrow.  */
+#include <window/mfdisplay.h>
 
 /* This variable, `mfwsw', contains the dispatch tables for each
    terminal.  We map the Pascal calls to the routines `init_screen',
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 27f56f40481..ad76c3d71e2 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -118,6 +118,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -137,6 +138,7 @@ CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog
index 623d6cb2d06..8a5d88ec040 100644
--- a/Build/source/texk/web2c/omegafonts/ChangeLog
+++ b/Build/source/texk/web2c/omegafonts/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pl-lexer.l: #include <kpathsea/c-proto.h> for KPSEDLL used
+	by <kpathsea/mingw32.h>.
+
 2010-01-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* omfonts.[ch] (read_in_whole, name_ofm, name_opl, name_ovp,
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index 92a51ee79cd..e81adbf20ab 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -122,6 +122,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -141,6 +142,7 @@ CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
diff --git a/Build/source/texk/web2c/omegafonts/pl-lexer.c b/Build/source/texk/web2c/omegafonts/pl-lexer.c
index b5031c2019e..5a12a6a942c 100644
--- a/Build/source/texk/web2c/omegafonts/pl-lexer.c
+++ b/Build/source/texk/web2c/omegafonts/pl-lexer.c
@@ -1013,6 +1013,7 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include <string.h>
+#include <kpathsea/c-proto.h>
 #ifdef WIN32
 #if defined __MINGW32__
 #include <kpathsea/mingw32.h>
@@ -1056,7 +1057,7 @@ extern char *xstrdup (const char *);
 
 /* For Solaris's lex, to increase tables sizes --RP */
 /* Space before number keeps ancient flex happy. */
-#line 1060 "pl-lexer.c"
+#line 1061 "pl-lexer.c"
 
 #define INITIAL 0
 
@@ -1238,10 +1239,10 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 83 "pl-lexer.l"
+#line 84 "pl-lexer.l"
 
 
-#line 1245 "pl-lexer.c"
+#line 1246 "pl-lexer.c"
 
 	if ( !(yy_init) )
 		{
@@ -1345,1041 +1346,1041 @@ do_action:	/* This label is used only to access EOF actions. */
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 85 "pl-lexer.l"
+#line 86 "pl-lexer.l"
 {}
 	YY_BREAK
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 86 "pl-lexer.l"
+#line 87 "pl-lexer.l"
 {line_number++; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 88 "pl-lexer.l"
+#line 89 "pl-lexer.l"
 return(LEFT);
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 89 "pl-lexer.l"
+#line 90 "pl-lexer.l"
 return(RIGHT);
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 91 "pl-lexer.l"
+#line 92 "pl-lexer.l"
 {scan_int(8);  return(NUMBER); }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 92 "pl-lexer.l"
+#line 93 "pl-lexer.l"
 {scan_int(10); return(NUMBER); }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 93 "pl-lexer.l"
+#line 94 "pl-lexer.l"
 {scan_int(16); return(NUMBER); }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 94 "pl-lexer.l"
+#line 95 "pl-lexer.l"
 {scan_char();  return(NUMBER); }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 95 "pl-lexer.l"
+#line 96 "pl-lexer.l"
 {scan_fix();   return(FIX);    }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 97 "pl-lexer.l"
+#line 98 "pl-lexer.l"
 {scan_string("CODINGSCHEME", KEEP_CONVERT, LEN_CODING_SCHEME);
                  return(CODINGSCHEME); }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 99 "pl-lexer.l"
+#line 100 "pl-lexer.l"
 {scan_string("FAMILY", KEEP_CONVERT, LEN_FAMILY);
                  return(FAMILY); }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 101 "pl-lexer.l"
+#line 102 "pl-lexer.l"
 {scan_string("VTITLE", KEEP_ALL, LEN_VTITLE);
                  return(VTITLE); }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 103 "pl-lexer.l"
+#line 104 "pl-lexer.l"
 {scan_string("FONTNAME", KEEP_ALL, LEN_FONT_NAME);
                  return(FONTNAME); }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 105 "pl-lexer.l"
+#line 106 "pl-lexer.l"
 {scan_string("FONTAREA", KEEP_ALL, LEN_FONT_AREA);
                  return(FONTAREA); }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 107 "pl-lexer.l"
+#line 108 "pl-lexer.l"
 {scan_string("SPECIAL", KEEP_ALL, 0);
                  return(SPECIAL); }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 109 "pl-lexer.l"
+#line 110 "pl-lexer.l"
 {scan_string("COMMENT", KEEP_NONE, 0);
                  return(COMMENT); }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 112 "pl-lexer.l"
+#line 113 "pl-lexer.l"
 {scan_hex_string(); return(SPECIALHEX); }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 115 "pl-lexer.l"
+#line 116 "pl-lexer.l"
 {yylval.yint=1; return(SEVENBITSAFEFLAG); }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 116 "pl-lexer.l"
+#line 117 "pl-lexer.l"
 {yylval.yint=0; return(SEVENBITSAFEFLAG); }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 118 "pl-lexer.l"
+#line 119 "pl-lexer.l"
 return(CHECKSUM);
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 119 "pl-lexer.l"
+#line 120 "pl-lexer.l"
 return(DESIGNSIZE);
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 120 "pl-lexer.l"
+#line 121 "pl-lexer.l"
 return(DESIGNUNITS);
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 121 "pl-lexer.l"
+#line 122 "pl-lexer.l"
 return(FACE);
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 122 "pl-lexer.l"
+#line 123 "pl-lexer.l"
 return(HEADER);
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 123 "pl-lexer.l"
+#line 124 "pl-lexer.l"
 return(BOUNDARYCHAR);
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 124 "pl-lexer.l"
+#line 125 "pl-lexer.l"
 return(FONTDIMEN);
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 125 "pl-lexer.l"
+#line 126 "pl-lexer.l"
 return(LIGTABLE);
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 126 "pl-lexer.l"
+#line 127 "pl-lexer.l"
 return(CHARACTER);
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 128 "pl-lexer.l"
+#line 129 "pl-lexer.l"
 return(PARAMETER);
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 129 "pl-lexer.l"
+#line 130 "pl-lexer.l"
 return(LABEL);
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 130 "pl-lexer.l"
+#line 131 "pl-lexer.l"
 return(KRN);
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 131 "pl-lexer.l"
+#line 132 "pl-lexer.l"
 return(STOP);
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 132 "pl-lexer.l"
+#line 133 "pl-lexer.l"
 return(SKIP);
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 133 "pl-lexer.l"
+#line 134 "pl-lexer.l"
 return(NEXTLARGER);
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 134 "pl-lexer.l"
+#line 135 "pl-lexer.l"
 return(VARCHAR);
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 136 "pl-lexer.l"
+#line 137 "pl-lexer.l"
 {yylval.yint = C_WD; return(CHARMEASURE); }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 137 "pl-lexer.l"
+#line 138 "pl-lexer.l"
 {yylval.yint = C_HT; return(CHARMEASURE); }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 138 "pl-lexer.l"
+#line 139 "pl-lexer.l"
 {yylval.yint = C_DP; return(CHARMEASURE); }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 139 "pl-lexer.l"
+#line 140 "pl-lexer.l"
 {yylval.yint = C_IC; return(CHARMEASURE); }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 141 "pl-lexer.l"
+#line 142 "pl-lexer.l"
 {yylval.yint = E_TOP; return(EXTEN); }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 142 "pl-lexer.l"
+#line 143 "pl-lexer.l"
 {yylval.yint = E_MID; return(EXTEN); }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 143 "pl-lexer.l"
+#line 144 "pl-lexer.l"
 {yylval.yint = E_BOT; return(EXTEN); }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 144 "pl-lexer.l"
+#line 145 "pl-lexer.l"
 {yylval.yint = E_REP; return(EXTEN); }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 146 "pl-lexer.l"
+#line 147 "pl-lexer.l"
 {yylval.yint = L_0;    return(LIG); }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 147 "pl-lexer.l"
+#line 148 "pl-lexer.l"
 {yylval.yint = L_B;    return(LIG); }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 148 "pl-lexer.l"
+#line 149 "pl-lexer.l"
 {yylval.yint = L_A;    return(LIG); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 149 "pl-lexer.l"
+#line 150 "pl-lexer.l"
 {yylval.yint = L_AB;   return(LIG); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 150 "pl-lexer.l"
+#line 151 "pl-lexer.l"
 {yylval.yint = L_Bx;   return(LIG); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 151 "pl-lexer.l"
+#line 152 "pl-lexer.l"
 {yylval.yint = L_Ax;   return(LIG); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 152 "pl-lexer.l"
+#line 153 "pl-lexer.l"
 {yylval.yint = L_ABx;  return(LIG); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 153 "pl-lexer.l"
+#line 154 "pl-lexer.l"
 {yylval.yint = L_ABxx; return(LIG); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 155 "pl-lexer.l"
+#line 156 "pl-lexer.l"
 {yylval.yint = F_MRR; return(NUMBER); }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 156 "pl-lexer.l"
+#line 157 "pl-lexer.l"
 {yylval.yint = F_MIR; return(NUMBER); }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 157 "pl-lexer.l"
+#line 158 "pl-lexer.l"
 {yylval.yint = F_BRR; return(NUMBER); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 158 "pl-lexer.l"
+#line 159 "pl-lexer.l"
 {yylval.yint = F_BIR; return(NUMBER); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 159 "pl-lexer.l"
+#line 160 "pl-lexer.l"
 {yylval.yint = F_LRR; return(NUMBER); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 160 "pl-lexer.l"
+#line 161 "pl-lexer.l"
 {yylval.yint = F_LIR; return(NUMBER); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 161 "pl-lexer.l"
+#line 162 "pl-lexer.l"
 {yylval.yint = F_MRC; return(NUMBER); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 162 "pl-lexer.l"
+#line 163 "pl-lexer.l"
 {yylval.yint = F_MIC; return(NUMBER); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 163 "pl-lexer.l"
+#line 164 "pl-lexer.l"
 {yylval.yint = F_BRC; return(NUMBER); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 164 "pl-lexer.l"
+#line 165 "pl-lexer.l"
 {yylval.yint = F_BIC; return(NUMBER); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 165 "pl-lexer.l"
+#line 166 "pl-lexer.l"
 {yylval.yint = F_LRC; return(NUMBER); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 166 "pl-lexer.l"
+#line 167 "pl-lexer.l"
 {yylval.yint = F_LIC; return(NUMBER); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 167 "pl-lexer.l"
+#line 168 "pl-lexer.l"
 {yylval.yint = F_MRE; return(NUMBER); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 168 "pl-lexer.l"
+#line 169 "pl-lexer.l"
 {yylval.yint = F_MIE; return(NUMBER); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 169 "pl-lexer.l"
+#line 170 "pl-lexer.l"
 {yylval.yint = F_BRE; return(NUMBER); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 170 "pl-lexer.l"
+#line 171 "pl-lexer.l"
 {yylval.yint = F_BIE; return(NUMBER); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 171 "pl-lexer.l"
+#line 172 "pl-lexer.l"
 {yylval.yint = F_LRE; return(NUMBER); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 172 "pl-lexer.l"
+#line 173 "pl-lexer.l"
 {yylval.yint = F_LIE; return(NUMBER); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 174 "pl-lexer.l"
+#line 175 "pl-lexer.l"
 {yylval.yint = P_SLANT;      return(NAMEDPARAMETER); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 175 "pl-lexer.l"
+#line 176 "pl-lexer.l"
 {yylval.yint = P_SPACE;      return(NAMEDPARAMETER); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 176 "pl-lexer.l"
+#line 177 "pl-lexer.l"
 {yylval.yint = P_STRETCH;    return(NAMEDPARAMETER); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 177 "pl-lexer.l"
+#line 178 "pl-lexer.l"
 {yylval.yint = P_SHRINK;     return(NAMEDPARAMETER); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 178 "pl-lexer.l"
+#line 179 "pl-lexer.l"
 {yylval.yint = P_XHEIGHT;    return(NAMEDPARAMETER); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 179 "pl-lexer.l"
+#line 180 "pl-lexer.l"
 {yylval.yint = P_QUAD;       return(NAMEDPARAMETER); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 180 "pl-lexer.l"
+#line 181 "pl-lexer.l"
 {yylval.yint = P_EXTRASPACE; return(NAMEDPARAMETER); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 181 "pl-lexer.l"
+#line 182 "pl-lexer.l"
 {yylval.yint = P_NUM1;       return(NAMEDPARAMETER); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 182 "pl-lexer.l"
+#line 183 "pl-lexer.l"
 {yylval.yint = P_NUM2;       return(NAMEDPARAMETER); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 183 "pl-lexer.l"
+#line 184 "pl-lexer.l"
 {yylval.yint = P_NUM3;       return(NAMEDPARAMETER); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 184 "pl-lexer.l"
+#line 185 "pl-lexer.l"
 {yylval.yint = P_DENOM1;     return(NAMEDPARAMETER); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 185 "pl-lexer.l"
+#line 186 "pl-lexer.l"
 {yylval.yint = P_DENOM2;     return(NAMEDPARAMETER); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 186 "pl-lexer.l"
+#line 187 "pl-lexer.l"
 {yylval.yint = P_SUP1;       return(NAMEDPARAMETER); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 187 "pl-lexer.l"
+#line 188 "pl-lexer.l"
 {yylval.yint = P_SUP2;       return(NAMEDPARAMETER); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 188 "pl-lexer.l"
+#line 189 "pl-lexer.l"
 {yylval.yint = P_SUP3;       return(NAMEDPARAMETER); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 189 "pl-lexer.l"
+#line 190 "pl-lexer.l"
 {yylval.yint = P_SUB1;       return(NAMEDPARAMETER); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 190 "pl-lexer.l"
+#line 191 "pl-lexer.l"
 {yylval.yint = P_SUB2;       return(NAMEDPARAMETER); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 191 "pl-lexer.l"
+#line 192 "pl-lexer.l"
 {yylval.yint = P_SUPDROP;    return(NAMEDPARAMETER); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 192 "pl-lexer.l"
+#line 193 "pl-lexer.l"
 {yylval.yint = P_SUBDROP;    return(NAMEDPARAMETER); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 193 "pl-lexer.l"
+#line 194 "pl-lexer.l"
 {yylval.yint = P_DELIM1;     return(NAMEDPARAMETER); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 194 "pl-lexer.l"
+#line 195 "pl-lexer.l"
 {yylval.yint = P_DELIM2;     return(NAMEDPARAMETER); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 195 "pl-lexer.l"
+#line 196 "pl-lexer.l"
 {yylval.yint = P_AXISHEIGHT; return(NAMEDPARAMETER); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 197 "pl-lexer.l"
+#line 198 "pl-lexer.l"
 {yylval.yint = P_DEFAULTRULETHICKNESS;
 			 return(NAMEDPARAMETER); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 199 "pl-lexer.l"
+#line 200 "pl-lexer.l"
 {yylval.yint = P_BIGOPSPACING1; return(NAMEDPARAMETER); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 200 "pl-lexer.l"
+#line 201 "pl-lexer.l"
 {yylval.yint = P_BIGOPSPACING2; return(NAMEDPARAMETER); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 201 "pl-lexer.l"
+#line 202 "pl-lexer.l"
 {yylval.yint = P_BIGOPSPACING3; return(NAMEDPARAMETER); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 202 "pl-lexer.l"
+#line 203 "pl-lexer.l"
 {yylval.yint = P_BIGOPSPACING4; return(NAMEDPARAMETER); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 203 "pl-lexer.l"
+#line 204 "pl-lexer.l"
 {yylval.yint = P_BIGOPSPACING5; return(NAMEDPARAMETER); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 205 "pl-lexer.l"
+#line 206 "pl-lexer.l"
 {return(MAPFONT); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 206 "pl-lexer.l"
+#line 207 "pl-lexer.l"
 {return(FONTCHECKSUM); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 207 "pl-lexer.l"
+#line 208 "pl-lexer.l"
 {return(FONTAT); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 208 "pl-lexer.l"
+#line 209 "pl-lexer.l"
 {return(FONTDSIZE); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 209 "pl-lexer.l"
+#line 210 "pl-lexer.l"
 {return(MAP); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 210 "pl-lexer.l"
+#line 211 "pl-lexer.l"
 {return(SELECTFONT); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 211 "pl-lexer.l"
+#line 212 "pl-lexer.l"
 {return(SETCHAR); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 212 "pl-lexer.l"
+#line 213 "pl-lexer.l"
 {return(SETRULE); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 213 "pl-lexer.l"
+#line 214 "pl-lexer.l"
 {return(PUSH); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 214 "pl-lexer.l"
+#line 215 "pl-lexer.l"
 {return(POP); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 216 "pl-lexer.l"
+#line 217 "pl-lexer.l"
 {yylval.yint = M_RIGHT; return(MOVE); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 217 "pl-lexer.l"
+#line 218 "pl-lexer.l"
 {yylval.yint = M_LEFT;  return(MOVE); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 218 "pl-lexer.l"
+#line 219 "pl-lexer.l"
 {yylval.yint = M_UP;    return(MOVE); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 219 "pl-lexer.l"
+#line 220 "pl-lexer.l"
 {yylval.yint = M_DOWN;  return(MOVE); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 221 "pl-lexer.l"
+#line 222 "pl-lexer.l"
 return(OFMLEVEL);
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 222 "pl-lexer.l"
+#line 223 "pl-lexer.l"
 {yylval.yint = ACC_TOP; return(ACCENT); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 223 "pl-lexer.l"
+#line 224 "pl-lexer.l"
 {yylval.yint = ACC_MID; return(ACCENT); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 224 "pl-lexer.l"
+#line 225 "pl-lexer.l"
 {yylval.yint = ACC_BOT; return(ACCENT); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 226 "pl-lexer.l"
+#line 227 "pl-lexer.l"
 {yylval.yint = DIR_ORD+DIR_TL; return(FONTDIR);}
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 227 "pl-lexer.l"
+#line 228 "pl-lexer.l"
 {yylval.yint = DIR_ORD+DIR_LT; return(FONTDIR);}
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 228 "pl-lexer.l"
+#line 229 "pl-lexer.l"
 {yylval.yint = DIR_ORD+DIR_TR; return(FONTDIR);}
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 229 "pl-lexer.l"
+#line 230 "pl-lexer.l"
 {yylval.yint = DIR_ORD+DIR_LB; return(FONTDIR);}
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 230 "pl-lexer.l"
+#line 231 "pl-lexer.l"
 {yylval.yint = DIR_ORD+DIR_BL; return(FONTDIR);}
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 231 "pl-lexer.l"
+#line 232 "pl-lexer.l"
 {yylval.yint = DIR_ORD+DIR_RT; return(FONTDIR);}
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 232 "pl-lexer.l"
+#line 233 "pl-lexer.l"
 {yylval.yint = DIR_ORD+DIR_BR; return(FONTDIR);}
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 233 "pl-lexer.l"
+#line 234 "pl-lexer.l"
 {yylval.yint = DIR_ORD+DIR_RB; return(FONTDIR);}
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 234 "pl-lexer.l"
+#line 235 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_TL; return(FONTDIR);}
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 235 "pl-lexer.l"
+#line 236 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_LT; return(FONTDIR);}
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 236 "pl-lexer.l"
+#line 237 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_TR; return(FONTDIR);}
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 237 "pl-lexer.l"
+#line 238 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_LB; return(FONTDIR);}
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 238 "pl-lexer.l"
+#line 239 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_BL; return(FONTDIR);}
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 239 "pl-lexer.l"
+#line 240 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_RT; return(FONTDIR);}
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 240 "pl-lexer.l"
+#line 241 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_BR; return(FONTDIR);}
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 241 "pl-lexer.l"
+#line 242 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_RB; return(FONTDIR);}
 	YY_BREAK
 /* for compatibility with the omegaware versions */
 case 132:
 YY_RULE_SETUP
-#line 243 "pl-lexer.l"
+#line 244 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_TL; return(FONTDIR);}
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 244 "pl-lexer.l"
+#line 245 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_LT; return(FONTDIR);}
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 245 "pl-lexer.l"
+#line 246 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_TR; return(FONTDIR);}
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 246 "pl-lexer.l"
+#line 247 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_LB; return(FONTDIR);}
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 247 "pl-lexer.l"
+#line 248 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_BL; return(FONTDIR);}
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 248 "pl-lexer.l"
+#line 249 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_RT; return(FONTDIR);}
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 249 "pl-lexer.l"
+#line 250 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_BR; return(FONTDIR);}
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 250 "pl-lexer.l"
+#line 251 "pl-lexer.l"
 {yylval.yint = DIR_NAT+DIR_RB; return(FONTDIR);}
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 252 "pl-lexer.l"
+#line 253 "pl-lexer.l"
 return(FONTIVALUE);
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 253 "pl-lexer.l"
+#line 254 "pl-lexer.l"
 return(FONTFVALUE);
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 254 "pl-lexer.l"
+#line 255 "pl-lexer.l"
 return(FONTMVALUE);
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 255 "pl-lexer.l"
+#line 256 "pl-lexer.l"
 return(FONTPENALTY);
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 256 "pl-lexer.l"
+#line 257 "pl-lexer.l"
 return(FONTRULE);
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 257 "pl-lexer.l"
+#line 258 "pl-lexer.l"
 return(FONTGLUE);
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 259 "pl-lexer.l"
+#line 260 "pl-lexer.l"
 return(IVALUE);
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 260 "pl-lexer.l"
+#line 261 "pl-lexer.l"
 return(FVALUE);
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 261 "pl-lexer.l"
+#line 262 "pl-lexer.l"
 return(MVALUE);
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 262 "pl-lexer.l"
+#line 263 "pl-lexer.l"
 return(PENALTY);
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 263 "pl-lexer.l"
+#line 264 "pl-lexer.l"
 return(RULE);
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 264 "pl-lexer.l"
+#line 265 "pl-lexer.l"
 return(GLUE);
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 266 "pl-lexer.l"
+#line 267 "pl-lexer.l"
 return(IVALUEVAL);
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 267 "pl-lexer.l"
+#line 268 "pl-lexer.l"
 return(FVALUEVAL);
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 268 "pl-lexer.l"
+#line 269 "pl-lexer.l"
 return(MVALUEVAL);
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 269 "pl-lexer.l"
+#line 270 "pl-lexer.l"
 return(PENALTYVAL);
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 271 "pl-lexer.l"
+#line 272 "pl-lexer.l"
 { yylval.yint = RULE_WD; return(RULEMEASURE); }
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 272 "pl-lexer.l"
+#line 273 "pl-lexer.l"
 { yylval.yint = RULE_HT; return(RULEMEASURE); }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 273 "pl-lexer.l"
+#line 274 "pl-lexer.l"
 { yylval.yint = RULE_DP; return(RULEMEASURE); }
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 275 "pl-lexer.l"
+#line 276 "pl-lexer.l"
 return(GLUEWD);
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 276 "pl-lexer.l"
+#line 277 "pl-lexer.l"
 { yylval.yint = GLUE_STRETCH; return(GLUESHRINKSTRETCH); }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 277 "pl-lexer.l"
+#line 278 "pl-lexer.l"
 { yylval.yint = GLUE_SHRINK; return(GLUESHRINKSTRETCH); }
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 279 "pl-lexer.l"
+#line 280 "pl-lexer.l"
 return(GLUETYPE);
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 280 "pl-lexer.l"
+#line 281 "pl-lexer.l"
 return(GLUERULE);
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 281 "pl-lexer.l"
+#line 282 "pl-lexer.l"
 return(GLUECHAR);
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 283 "pl-lexer.l"
+#line 284 "pl-lexer.l"
 return(CHARIVALUE);
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 284 "pl-lexer.l"
+#line 285 "pl-lexer.l"
 return(CHARFVALUE);
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
-#line 285 "pl-lexer.l"
+#line 286 "pl-lexer.l"
 return(CHARMVALUE);
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
-#line 286 "pl-lexer.l"
+#line 287 "pl-lexer.l"
 return(CHARPENALTY);
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 287 "pl-lexer.l"
+#line 288 "pl-lexer.l"
 return(CHARRULE);
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 288 "pl-lexer.l"
+#line 289 "pl-lexer.l"
 return(CHARGLUE);
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
-#line 290 "pl-lexer.l"
+#line 291 "pl-lexer.l"
 return(CKRN);
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 291 "pl-lexer.l"
+#line 292 "pl-lexer.l"
 return(CGLUE);
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
-#line 292 "pl-lexer.l"
+#line 293 "pl-lexer.l"
 return(CPENALTY);
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
-#line 293 "pl-lexer.l"
+#line 294 "pl-lexer.l"
 return(CPENGLUE);
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 294 "pl-lexer.l"
+#line 295 "pl-lexer.l"
 return(CLABEL);
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
-#line 296 "pl-lexer.l"
+#line 297 "pl-lexer.l"
 return(CHARREPEAT);
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
-#line 299 "pl-lexer.l"
+#line 300 "pl-lexer.l"
 {yylval.yint = O_FILLL; return(GLUEORDER); }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
-#line 300 "pl-lexer.l"
+#line 301 "pl-lexer.l"
 {yylval.yint = O_FILL;  return(GLUEORDER); }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
-#line 301 "pl-lexer.l"
+#line 302 "pl-lexer.l"
 {yylval.yint = O_FIL;   return(GLUEORDER); }
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
-#line 302 "pl-lexer.l"
+#line 303 "pl-lexer.l"
 {yylval.yint = O_FI;    return(GLUEORDER); }
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
-#line 303 "pl-lexer.l"
+#line 304 "pl-lexer.l"
 {yylval.yint = O_UNIT;  return(GLUEORDER); }
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
-#line 305 "pl-lexer.l"
+#line 306 "pl-lexer.l"
 {yylval.yint = K_NORMAL;   return(GLUEKIND); }
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
-#line 306 "pl-lexer.l"
+#line 307 "pl-lexer.l"
 {yylval.yint = K_ALEADERS; return(GLUEKIND); }
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
-#line 307 "pl-lexer.l"
+#line 308 "pl-lexer.l"
 {yylval.yint = K_CLEADERS; return(GLUEKIND); }
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
-#line 308 "pl-lexer.l"
+#line 309 "pl-lexer.l"
 {yylval.yint = K_XLEADERS; return(GLUEKIND); }
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
-#line 310 "pl-lexer.l"
+#line 311 "pl-lexer.l"
 {yylval.yint = C_SECWD;        return(CHARMEASURE); }
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
-#line 311 "pl-lexer.l"
+#line 312 "pl-lexer.l"
 {yylval.yint = C_SECHT;        return(CHARMEASURE); }
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
-#line 312 "pl-lexer.l"
+#line 313 "pl-lexer.l"
 {yylval.yint = C_SECDP;        return(CHARMEASURE); }
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
-#line 313 "pl-lexer.l"
+#line 314 "pl-lexer.l"
 {yylval.yint = C_SECIC;        return(CHARMEASURE); }
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
-#line 315 "pl-lexer.l"
+#line 316 "pl-lexer.l"
 {yylval.yint = C_P_TOPAXIS;    return(CHARMEASURE); }
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
-#line 316 "pl-lexer.l"
+#line 317 "pl-lexer.l"
 {yylval.yint = C_P_TOPAXISBIs; return(CHARMEASURE); }
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
-#line 317 "pl-lexer.l"
+#line 318 "pl-lexer.l"
 {yylval.yint = C_P_BOTAXIS;    return(CHARMEASURE); }
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
-#line 318 "pl-lexer.l"
+#line 319 "pl-lexer.l"
 {yylval.yint = C_P_BOTAXISBIS; return(CHARMEASURE); }
 	YY_BREAK
 case 194:
 YY_RULE_SETUP
-#line 319 "pl-lexer.l"
+#line 320 "pl-lexer.l"
 {yylval.yint = C_P_MIDHOR;     return(CHARMEASURE); }
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
-#line 320 "pl-lexer.l"
+#line 321 "pl-lexer.l"
 {yylval.yint = C_P_MIDVERT;    return(CHARMEASURE); }
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
-#line 321 "pl-lexer.l"
+#line 322 "pl-lexer.l"
 {yylval.yint = C_P_BASESLANT;  return(CHARMEASURE); }
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
-#line 323 "pl-lexer.l"
+#line 324 "pl-lexer.l"
 {yylval.yint = C_S_TOPAXIS;    return(CHARMEASURE); }
 	YY_BREAK
 case 198:
 YY_RULE_SETUP
-#line 324 "pl-lexer.l"
+#line 325 "pl-lexer.l"
 {yylval.yint = C_S_TOPAXISBIs; return(CHARMEASURE); }
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
-#line 325 "pl-lexer.l"
+#line 326 "pl-lexer.l"
 {yylval.yint = C_S_BOTAXIS;    return(CHARMEASURE); }
 	YY_BREAK
 case 200:
 YY_RULE_SETUP
-#line 326 "pl-lexer.l"
+#line 327 "pl-lexer.l"
 {yylval.yint = C_S_BOTAXISBIS; return(CHARMEASURE); }
 	YY_BREAK
 case 201:
 YY_RULE_SETUP
-#line 327 "pl-lexer.l"
+#line 328 "pl-lexer.l"
 {yylval.yint = C_S_MIDHOR;     return(CHARMEASURE); }
 	YY_BREAK
 case 202:
 YY_RULE_SETUP
-#line 328 "pl-lexer.l"
+#line 329 "pl-lexer.l"
 {yylval.yint = C_S_MIDVERT;    return(CHARMEASURE); }
 	YY_BREAK
 case 203:
 YY_RULE_SETUP
-#line 329 "pl-lexer.l"
+#line 330 "pl-lexer.l"
 {yylval.yint = C_S_BASESLANT;  return(CHARMEASURE); }
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
-#line 331 "pl-lexer.l"
+#line 332 "pl-lexer.l"
 {lex_error_1("unexpected character (%x); ignored",
                              yytext[0]);}
 	YY_BREAK
 case 205:
 YY_RULE_SETUP
-#line 333 "pl-lexer.l"
+#line 334 "pl-lexer.l"
 ECHO;
 	YY_BREAK
-#line 2383 "pl-lexer.c"
+#line 2384 "pl-lexer.c"
 			case YY_STATE_EOF(INITIAL):
 				yyterminate();
 
@@ -3363,7 +3364,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 333 "pl-lexer.l"
+#line 334 "pl-lexer.l"
 
 
 
diff --git a/Build/source/texk/web2c/omegafonts/pl-lexer.l b/Build/source/texk/web2c/omegafonts/pl-lexer.l
index cfd63bfaf32..a2fb448e23c 100644
--- a/Build/source/texk/web2c/omegafonts/pl-lexer.l
+++ b/Build/source/texk/web2c/omegafonts/pl-lexer.l
@@ -24,6 +24,7 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include <string.h>
+#include <kpathsea/c-proto.h>
 #ifdef WIN32
 #if defined __MINGW32__
 #include <kpathsea/mingw32.h>
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 23ae68789ae..93a8c936c28 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -148,6 +148,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -167,6 +168,7 @@ CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in
index 143131b50cd..3f45a76ae1b 100644
--- a/Build/source/texk/web2c/web2c/Makefile.in
+++ b/Build/source/texk/web2c/web2c/Makefile.in
@@ -133,6 +133,7 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -145,6 +146,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
diff --git a/Build/source/texk/web2c/web2c/configure b/Build/source/texk/web2c/web2c/configure
index c99ec55d3c9..8e684bf8604 100755
--- a/Build/source/texk/web2c/web2c/configure
+++ b/Build/source/texk/web2c/web2c/configure
@@ -762,7 +762,6 @@ DSYMUTIL
 lt_ECHO
 RANLIB
 AR
-OBJDUMP
 LN_S
 NM
 ac_ct_DUMPBIN
@@ -797,6 +796,9 @@ build_vendor
 build_cpu
 build
 LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -4663,13 +4665,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:4666: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4668: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4669: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4671: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4672: output\"" >&5)
+  (eval echo "\"\$as_me:4674: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5015,9 +5017,6 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then :
@@ -5875,7 +5874,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5878 "configure"' > conftest.$ac_ext
+  echo '#line 5877 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7008,13 +7007,311 @@ fi
 
 
 # Set options
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AS="as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
-        enable_dlopen=no
 
 
-  enable_win32_dll=no
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+        enable_dlopen=no
+
 
 
             # Check whether --enable-shared was given.
@@ -7507,11 +7804,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:7510: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7807: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7514: \$? = $ac_status" >&5
+   echo "$as_me:7811: \$? = $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.
@@ -7846,11 +8143,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:7849: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8146: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7853: \$? = $ac_status" >&5
+   echo "$as_me:8150: \$? = $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.
@@ -7951,11 +8248,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:7954: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8251: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7958: \$? = $ac_status" >&5
+   echo "$as_me:8255: \$? = $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
@@ -8006,11 +8303,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:8009: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8306: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8013: \$? = $ac_status" >&5
+   echo "$as_me:8310: \$? = $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
@@ -10373,7 +10670,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10376 "configure"
+#line 10673 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10469,7 +10766,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10472 "configure"
+#line 10769 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12552,6 +12849,9 @@ double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
 macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
 enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
@@ -12578,7 +12878,6 @@ lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
 AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
@@ -12684,7 +12983,6 @@ LN_S \
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
-OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
 AR \
@@ -13545,6 +13843,15 @@ available_tags=""
 macro_version=$macro_version
 macro_revision=$macro_revision
 
+# Assembler program.
+AS=$AS
+
+# DLL creation program.
+DLLTOOL=$DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$OBJDUMP
+
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
@@ -13610,9 +13917,6 @@ NL2SP=$lt_lt_NL2SP
 reload_flag=$lt_reload_flag
 reload_cmds=$lt_reload_cmds
 
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
diff --git a/Build/source/texk/web2c/window/ChangeLog b/Build/source/texk/web2c/window/ChangeLog
index 6d9788db385..feab3a70fea 100644
--- a/Build/source/texk/web2c/window/ChangeLog
+++ b/Build/source/texk/web2c/window/ChangeLog
@@ -1,3 +1,23 @@
+2010-02-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* mfdisplay.h: New file with protos for display routines.
+	* Makefile.am: Add the new file.
+
+	* amiga.c, epsf.c, mftalk.c
+	#include <mfdisplay.h>, mf_*_initscreen returns int.
+
+	* hp2627.c, next.c, regis.c, suntools.c, tek.c, uniterm.c
+	#include <mfdisplay.h>.
+
+	* trap.c: mf_trap_initscreen() returns int.
+	#include <mfdisplay.h> and drop externs.
+
+	* win32.c: #include <mfdisplay.h>.
+	Do not skip Win32Error() for MinGW32, add static forward decl.
+	Drop unused variables szAppName, black, and white.
+
+	* x11-Xlib.c, x11-Xt.c: #include <mfdisplay.h> and drop externs.
+
 2010-01-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* amiga.c, win32.c: Current METAFONT Version is 2.718281.
diff --git a/Build/source/texk/web2c/window/Makefile.am b/Build/source/texk/web2c/window/Makefile.am
index 81312a73693..605e300c3d0 100644
--- a/Build/source/texk/web2c/window/Makefile.am
+++ b/Build/source/texk/web2c/window/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/web2c/window/
 ##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 INCLUDES = -I$(top_srcdir) $(KPATHSEA_INCLUDES)
@@ -18,6 +18,7 @@ libwindow_a_SOURCES = \
 	amiga.c \
 	epsf.c \
 	hp2627.c \
+	mfdisplay.h \
 	mftalk.c \
 	next.c \
 	regis.c \
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index 7baaacba326..0e133d95e39 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -77,9 +77,9 @@ CONFIG_CLEAN_VPATH_FILES =
 ARFLAGS = cru
 libwindow_a_AR = $(AR) $(ARFLAGS)
 libwindow_a_LIBADD =
-am__libwindow_a_SOURCES_DIST = amiga.c epsf.c hp2627.c mftalk.c next.c \
-	regis.c suntools.c tek.c trap.c uniterm.c win32.c x11-Xt.c \
-	x11-Xlib.c
+am__libwindow_a_SOURCES_DIST = amiga.c epsf.c hp2627.c mfdisplay.h \
+	mftalk.c next.c regis.c suntools.c tek.c trap.c uniterm.c \
+	win32.c x11-Xt.c x11-Xlib.c
 @MFXT_TRUE@am__objects_1 = x11-Xt.$(OBJEXT)
 @MFXT_FALSE@am__objects_2 = x11-Xlib.$(OBJEXT)
 am_libwindow_a_OBJECTS = amiga.$(OBJEXT) epsf.$(OBJEXT) \
@@ -109,6 +109,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -128,6 +129,7 @@ CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -294,9 +296,9 @@ INCLUDES = -I$(top_srcdir) $(KPATHSEA_INCLUDES)
 AM_CPPFLAGS = $(X_CFLAGS)
 AM_CFLAGS = $(WARNING_CFLAGS)
 EXTRA_LIBRARIES = libwindow.a
-libwindow_a_SOURCES = amiga.c epsf.c hp2627.c mftalk.c next.c regis.c \
-	suntools.c tek.c trap.c uniterm.c win32.c $(am__append_1) \
-	$(am__append_2)
+libwindow_a_SOURCES = amiga.c epsf.c hp2627.c mfdisplay.h mftalk.c \
+	next.c regis.c suntools.c tek.c trap.c uniterm.c win32.c \
+	$(am__append_1) $(am__append_2)
 DISTCLEANFILES = libwindow.a
 all: all-am
 
diff --git a/Build/source/texk/web2c/window/amiga.c b/Build/source/texk/web2c/window/amiga.c
index c5b231abe91..e975cb39bd5 100644
--- a/Build/source/texk/web2c/window/amiga.c
+++ b/Build/source/texk/web2c/window/amiga.c
@@ -153,6 +153,8 @@ void close_all(void)
 
 } /* close_all() */
 
+#include <mfdisplay.h>
+
 /*
  * INITSCREEN: Initialize the physical display window on the WorkBench
  * screen of the Commodore Amiga.  Open the necessary libraries and open
@@ -162,7 +164,7 @@ void close_all(void)
  * The `WFLG_SIZEGADGET' window flag has been removed; resizing the
  * window kills the picture and never triggered an `updatescreen'.
  */
-boolean mf_amiga_initscreen(void)
+int mf_amiga_initscreen(void)
 {
 #ifdef DEBUG
   printf("\ninitscreen()\n");
diff --git a/Build/source/texk/web2c/window/epsf.c b/Build/source/texk/web2c/window/epsf.c
index 238e2c2bf85..e5ed8e55c43 100644
--- a/Build/source/texk/web2c/window/epsf.c
+++ b/Build/source/texk/web2c/window/epsf.c
@@ -76,7 +76,9 @@ mf_epsf_header ()
   epsf_page++;
 }
 
-boolean
+#include <mfdisplay.h>
+
+int
 mf_epsf_initscreen (void)
 {
   if (getenv ("MFEPSF") != (char *) NULL)
diff --git a/Build/source/texk/web2c/window/hp2627.c b/Build/source/texk/web2c/window/hp2627.c
index a9505644cb6..a3526e65865 100644
--- a/Build/source/texk/web2c/window/hp2627.c
+++ b/Build/source/texk/web2c/window/hp2627.c
@@ -68,6 +68,8 @@ static	char	mf_hp2627_pencolors[2] = {
  *		sense status or something masochistic like that)
  */
 
+#include <mfdisplay.h>
+
 int mf_hp2627_initscreen(void)
 {
 	(void) fflush(stdout);	/* make sure pascal-level output flushed */
diff --git a/Build/source/texk/web2c/window/mfdisplay.h b/Build/source/texk/web2c/window/mfdisplay.h
new file mode 100644
index 00000000000..e001d2e36ec
--- /dev/null
+++ b/Build/source/texk/web2c/window/mfdisplay.h
@@ -0,0 +1,24 @@
+/* mfwinlib.h: include file for Metafont display routines.
+
+   This file is public domain.  */
+
+#define MF_DISPLAY_PROTOS(x) \
+extern int mf_ ## x ## _initscreen (void); \
+extern void mf_ ## x ## _updatescreen (void); \
+extern void mf_ ## x ## _blankrectangle (screencol, screencol, screenrow, screenrow); \
+extern void mf_ ## x ## _paintrow (screenrow, pixelcolor, transspec, screencol);
+
+MF_DISPLAY_PROTOS(amiga)
+MF_DISPLAY_PROTOS(epsf)
+MF_DISPLAY_PROTOS(hp2627)
+MF_DISPLAY_PROTOS(mftalk)
+MF_DISPLAY_PROTOS(next)
+MF_DISPLAY_PROTOS(regis)
+MF_DISPLAY_PROTOS(sun)
+MF_DISPLAY_PROTOS(tektronix)
+MF_DISPLAY_PROTOS(uniterm)
+MF_DISPLAY_PROTOS(win32)
+MF_DISPLAY_PROTOS(x11)
+MF_DISPLAY_PROTOS(trap)
+
+#undef MF_DISPLAY_PROTOS
diff --git a/Build/source/texk/web2c/window/mftalk.c b/Build/source/texk/web2c/window/mftalk.c
index 3bfd0a65ae2..880b0b8c34f 100644
--- a/Build/source/texk/web2c/window/mftalk.c
+++ b/Build/source/texk/web2c/window/mftalk.c
@@ -70,7 +70,9 @@ static int buf[8];			/* Temporary buffer. */
 static RETSIGTYPE (*old) ();		/* Old signal handler. */
 
 
-boolean
+#include <mfdisplay.h>
+
+int
 mf_mftalk_initscreen (void)
 {
   int app;				/* Client application type. */
diff --git a/Build/source/texk/web2c/window/next.c b/Build/source/texk/web2c/window/next.c
index e270d643184..abc4ba62ccb 100644
--- a/Build/source/texk/web2c/window/next.c
+++ b/Build/source/texk/web2c/window/next.c
@@ -38,6 +38,8 @@ char outstring[1024];	/* the longest string pushed though a pipe */
 #undef read
 #endif
 
+#include <mfdisplay.h>
+
 int mf_next_initscreen(void)
 {
 	int i;
diff --git a/Build/source/texk/web2c/window/regis.c b/Build/source/texk/web2c/window/regis.c
index 6d8c66d32ce..196ba946ef5 100644
--- a/Build/source/texk/web2c/window/regis.c
+++ b/Build/source/texk/web2c/window/regis.c
@@ -12,6 +12,8 @@
 on a black background; undefined is the opposite */
 #undef WRITEWHITE
 
+#include <mfdisplay.h>
+
 /* 
  *	int init_screen 
  *		Put screen in graphics mode:<ESC>Pp
diff --git a/Build/source/texk/web2c/window/suntools.c b/Build/source/texk/web2c/window/suntools.c
index b15f22c6f08..fea24dd4c16 100644
--- a/Build/source/texk/web2c/window/suntools.c
+++ b/Build/source/texk/web2c/window/suntools.c
@@ -80,6 +80,8 @@ Frame frame;
 Canvas canvas;
 Pixwin *pw;
 
+#include <mfdisplay.h>
+
 /*
  * init_screen: boolean;  return true if window operations legal
  */
diff --git a/Build/source/texk/web2c/window/tek.c b/Build/source/texk/web2c/window/tek.c
index 9b517d62319..077184e7253 100644
--- a/Build/source/texk/web2c/window/tek.c
+++ b/Build/source/texk/web2c/window/tek.c
@@ -26,6 +26,8 @@
 char	screen_pixel[WIDTHINBYTES*HEIGHT];
 char	zero_array[WIDTHINBYTES];
 
+#include <mfdisplay.h>
+
 /* 
  *	function init_screen: boolean;
  *
diff --git a/Build/source/texk/web2c/window/trap.c b/Build/source/texk/web2c/window/trap.c
index 79dda11cb3c..fa30fae6fa9 100644
--- a/Build/source/texk/web2c/window/trap.c
+++ b/Build/source/texk/web2c/window/trap.c
@@ -7,20 +7,11 @@
 
 /* No #ifdef for the whole file, because we always want to support this.  */
 
-boolean mf_trap_initscreen(void);
-void mf_trap_updatescreen(void);
-void mf_trap_blankrectangle(screencol left,
-                            screencol right,
-                            screenrow top,
-                            screenrow bottom);
-void mf_trap_paintrow(screenrow row,
-                      pixelcolor init_color,
-                      transspec transition_vector,
-                      screencol vector_size);
+#include <mfdisplay.h>
 
 /* This returns true if we can do window operations, else false.  */
 
-boolean
+int
 mf_trap_initscreen(void)
 {
   return 1;
diff --git a/Build/source/texk/web2c/window/uniterm.c b/Build/source/texk/web2c/window/uniterm.c
index dd54a892f99..d24efc1a880 100644
--- a/Build/source/texk/web2c/window/uniterm.c
+++ b/Build/source/texk/web2c/window/uniterm.c
@@ -103,6 +103,9 @@ register unsigned     x, y;
  *    ESC FF          - clear graphics&alpha screen.
  */
 #define ALPHA_CLS();  (putchar('\33'), putchar('\14'))
+
+#include <mfdisplay.h>
+
 int
 mf_uniterm_initscreen(void)
 {
diff --git a/Build/source/texk/web2c/window/win32.c b/Build/source/texk/web2c/window/win32.c
index ddfb875a4be..844e4b2e935 100644
--- a/Build/source/texk/web2c/window/win32.c
+++ b/Build/source/texk/web2c/window/win32.c
@@ -11,6 +11,10 @@
 #ifdef WIN32WIN
 #include <windows.h>
 
+#ifdef __MINGW32__
+static void Win32Error(const char *caller);
+#endif
+
 /* 
    The following constant enables some hack that should allow the
    window to process its messages. Basically, the principle is to 
@@ -23,14 +27,11 @@
 #undef  DEBUG
 /* #define DEBUG 1 */
 
-static char szAppName[] = "MF";
 static char szTitle[] = " MetaFont V2.718281 Online Display";
 static HWND my_window;
 static HDC my_dc;
 static HDC drawing_dc;
 static HBITMAP hbm;
-static RGBQUAD black = {0,0,0,0};
-static RGBQUAD white = {255,255,255,0};
 static MSG msg;
 static HANDLE hAccelTable;
 static HANDLE hMutex;
@@ -50,6 +51,8 @@ void __cdecl InitGui(void*);
 #endif
 LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam);
 
+#include <mfdisplay.h>
+
 int
 mf_win32_initscreen(void)
 {
@@ -209,8 +212,8 @@ mf_win32_paintrow (screenrow row,
     ReleaseMutex(hMutex);
 }
 
-#if 0
-void Win32Error(char *caller)
+#ifdef __MINGW32__
+static void Win32Error(const char *caller)
 {
   LPVOID lpMsgBuf;
 
@@ -233,7 +236,7 @@ void Win32Error(char *caller)
 LRESULT APIENTRY WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
   PAINTSTRUCT ps;
-  int retval;
+  int retval = 0;
 
 #ifdef DEBUG
   fprintf(stderr, "Message %x\n", iMsg);
diff --git a/Build/source/texk/web2c/window/x11-Xlib.c b/Build/source/texk/web2c/window/x11-Xlib.c
index 1d7b9f93940..01941d509af 100644
--- a/Build/source/texk/web2c/window/x11-Xlib.c
+++ b/Build/source/texk/web2c/window/x11-Xlib.c
@@ -74,18 +74,9 @@ static XWMHints wm_hints = {
 #define DEFAULT_X_POSITION 0
 #define DEFAULT_Y_POSITION 0
 
-int mf_x11_initscreen(void);
-void mf_x11_updatescreen(void);
-void mf_x11_blankrectangle(screencol left,
-                           screencol right,
-                           screenrow top,
-                           screenrow bottom);
-void mf_x11_paintrow(screenrow row,
-                     pixelcolor init_color,
-                     transspec transition_vector,
-                     screencol vector_size);
-
 
+#include <mfdisplay.h>
+
 /* Return 1 (i.e., true) if display opened successfully, else 0.  */
 
 int
diff --git a/Build/source/texk/web2c/window/x11-Xt.c b/Build/source/texk/web2c/window/x11-Xt.c
index 46c442e2828..64d4f86e639 100644
--- a/Build/source/texk/web2c/window/x11-Xt.c
+++ b/Build/source/texk/web2c/window/x11-Xt.c
@@ -78,23 +78,14 @@ static XrmOptionDescRec mf_optiondesclist[]
     { "-bg", "background", XrmoptionSepArg, (XPointer) NULL },
 };
 
-int mf_x11_initscreen(void);
-void mf_x11_updatescreen(void);
-void mf_x11_blankrectangle(screencol left,
-                           screencol right,
-                           screenrow top,
-                           screenrow bottom);
-void mf_x11_paintrow(screenrow row,
-                     pixelcolor init_color,
-                     transspec transition_vector,
-                     screencol vector_size);
-
 static void mf_events(void);
 static void mf_mapstatus(Widget w, XtPointer data, XEvent *ev);
 static void mf_newpixmap(unsigned int width, unsigned int height);
 static void mf_redraw(void);
 static void mf_repaint(Widget w, XtPointer data, XEvent *ev);
 
+#include <mfdisplay.h>
+
 /* Return 1 if display opened successfully, else 0.  */
 
 int
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2010-02-22 12:09:38 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2010-02-22 12:09:38 +0000
commit	b287d7f6a13823ea17e0bd415981d3a5953ca703 (patch)
tree	a420b28a35f7761f064d50bb610dbb2b46c71486 /Build/source/texk/web2c
parent	5fd6fd3479fcbbda52ebca7b5e80a5aaa1add69f (diff)