libs/t1lib + texk/ps2pkm: bug fix and update

git-svn-id: svn://tug.org/texlive/trunk@23187 c570f23f-e606-0410-a88d-b1316a301751

183 files changed, 3318 insertions, 1909 deletions

diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index a9ace200b98..edab8d51861 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,7 +1,19 @@
+2011-07-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am [EXTRA_DIST]: Add m4/ChangeLog.
+
+2011-07-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* version.ac: Switch 2011 => 2012/dev.
+
 2011-06-21  Karl Berry  <karl@tug.org>
 
 	* Build: report final exit status.
 
+2011-04-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* tardate.ac: Switch to 2011-06-15.
+
 2011-04-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, configure.ac: Conditional 'cross_compiling' =>
@@ -17,11 +29,6 @@
 
 	* Build (MACOSX_DEPLOYMENT_TARGET): no longer needed per koch.
 
-2011-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* m4/kpse-common.m4 (KPSE_COMMON): Remove check for
-	program_invocation_name.
-
 2011-03-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* tardate.ac: Switch to 2011-03-03.
@@ -47,18 +54,6 @@
 
 	* Build (TL_CONF_BANNER): switch ident to /pretest.
 
-2010-04-11  Karl Berry  <karl@tug.org>
-
-	* m4/kpse-pkgs.m4 (KPSE_TEXK_PKGS): add ptexenc, makejvf, mendexk.
-	From Akira and Norbert.
-	* m4/kpse-ptexenc-flags.m4: new file.
-
-2010-03-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* m4/kpse-icu-flags.m4 (KPSE_ICU_SYSTEM_FLAGS): Work around bug
-	in icu-config version 4.4.
-	* m4/kpse-common.m4 (KPSE_COMMON): Added AC_TYPE_SIZE_T.
-
 2010-03-24  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Build (TL_CONF_THREADS): Removed, now in libs/icu/configure.
@@ -82,21 +77,6 @@
 
 	* Build (TL_CONF_BANNER): 2010/dev.
 
-2010-02-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* m4/kpse-common.m4 (KPSE_COMMON): Use LT_INIT([win32-dll]).
-	* m4/kpse-gd-flags.m4 (KPSE_GD_FLAGS): Add -DNONDLL.
-
-2010-02-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* m4/kpse-kpathsea-flags.m4: Detect if libkpathsea was compiled
-	without debugging support and add '-DNODEBUG' if necessary.
-
-2010-02-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* m4/kpse-warnings.m4: Redefine compiler warning levels to
-	reduce the number of 'min' warnings.
-
 2009-12-24  Karl Berry  <karl@tug.org>
 
 	* Makefile.am (world): also run make check.
@@ -111,8 +91,7 @@
 
 2009-11-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* configure.ac, m4/kpse-setup.m4: Disable cross compilation
-	of xindy.
+	* configure.ac: Disable cross compilation of xindy.
 	* configure.ac: Report absolute build and source dir; reject
 	paths with embedded spaces.
 
@@ -122,8 +101,6 @@
 
 2009-09-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* m4/kpse-warnings.m4: Additional level 'all' of compiler
-	warnings, 'max' now without the extremely noisy -Wshadow.
 	* configure.ac: Report level of compiler warnings used.
 
 2009-08-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
@@ -132,10 +109,6 @@
 	'make distcheck': check for leftover files and symlinks.
 	This really ought to be the Automake default.
 
-2009-08-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
-
-	* m4/kpse-warnings.m4: Implement Objective C compiler warnings.
-
 2009-06-18  Karl Berry  <karl@tug.org>
 
 	* Build: eradicate -Wdecl stuff, peb has implemented something
diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am
index a044fd0a53b..85afd64867a 100644
--- a/Build/source/Makefile.am
+++ b/Build/source/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live top-level
 ##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ## Use 'aclocal --force' (for "computed m4_sinclude")
@@ -21,6 +21,7 @@ EXTRA_DIST = \
 	README.hacking \
 	README.layout \
 	build-aux/README.TL \
+	m4/ChangeLog \
 	m4/README \
 	reautoconf
 
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index 78fb434f945..020caf7a878 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \
 	$(top_srcdir)/m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/m4/kpse-libpng-flags.m4 \
 	$(top_srcdir)/m4/kpse-lt-hack.m4 \
+	$(top_srcdir)/m4/kpse-mktex.m4 \
 	$(top_srcdir)/m4/kpse-options.m4 $(top_srcdir)/m4/kpse-pkgs.m4 \
 	$(top_srcdir)/m4/kpse-poppler-flags.m4 \
 	$(top_srcdir)/m4/kpse-ptexenc-flags.m4 \
@@ -131,7 +132,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \
 	$(top_srcdir)/libs/zlib/ac/withenable.ac \
 	$(top_srcdir)/texk/ptexenc/ac/withenable.ac \
 	$(top_srcdir)/texk/kpathsea/ac/withenable.ac \
-	$(top_srcdir)/texk/kpathsea/ac/web2c.ac \
+	$(top_srcdir)/texk/kpathsea/ac/mktex.ac \
 	$(top_srcdir)/texk/kpathsea/ac/kpathsea.ac \
 	$(top_srcdir)/texk/ptexenc/ac/ptexenc.ac \
 	$(top_srcdir)/libs/zlib/ac/zlib.ac \
@@ -348,6 +349,7 @@ EXTRA_DIST = \
 	README.hacking \
 	README.layout \
 	build-aux/README.TL \
+	m4/ChangeLog \
 	m4/README \
 	reautoconf
 
diff --git a/Build/source/README.config b/Build/source/README.config
index a2dea8cf9bf..81fb3a87831 100644
--- a/Build/source/README.config
+++ b/Build/source/README.config
@@ -1,4 +1,4 @@
-Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 You may freely use, modify and/or distribute this file.
 
 	Configure options for the  TeX Live (TL) build system
@@ -136,22 +136,29 @@ If enabled (by default) allow TeX's '--ipc' option.
 2.3.6. --disable-tex, --enable-etex, --disable-aleph, --disable-pdftex,
        --disable-luatex, --disable-xetex, --disable-ptex, --disable-eptex,
        --disable-mf, --disable-mp
-Do or do not build the various TeX, METAFONT, and MetaPost engines.
+Do or do not build the various TeX, METAFONT, and MetaPost engines
+(defaults for the TeX engines are defined in texk/web2c/ac/web2c.ac).
 
-2.3.7. --with-mf-x-toolkit
+2.3.7. --enable-tex-synctex, --disable-etex-synctex,
+       --disable-ptex-synctex, --disable-eptex-synctex
+       --disable-pdftex-synctex, --disable-xetex-synctex
+Build the various TeX engines with or without SyncTeX support (ignored for a
+native TeX Live build, defaults are defined in texk/web2c/ac/web2c.ac).
+
+2.3.8. --with-mf-x-toolkit
 Use the X toolkit (libXt) for METAFONT (default is yes).
 
-2.3.8. --enable-*win
+2.3.9. --enable-*win
 Include various types of other window support for METAFONT.
 
-2.3.9. --disable-mf-nowin
+2.3.10. --disable-mf-nowin
 Do not build a separate non-graphically-capable METAFONT.
 
-2.3.10. --disable-web-progs
+2.3.11. --disable-web-progs
 Do not build the WEB programs bibtex ... weave, e.g., if you just
 want to rebuild engines.
 
-2.3.11. --disable-omfonts
+2.3.12. --disable-omfonts
 Build the Web versions of the omega font utilies (ofm2opl, opl2ofm, ovf2ovp,
 and ovp2ovf) instead of the C version, omfonts.  The Web and C versions
 should now be roughly equivalent.
@@ -226,12 +233,12 @@ The flags for a system freetype2 library are determined via freetype-config.
 3.4. Configure options for libpoppler
 -------------------------------------
 3.4.1. --with-system-xpdf
-Use an installed (system) version of libpoppler instead of xpdf (and
-pkg-config to obtain the required flags).
+Use an installed (system) version >=0.12 of libpoppler instead of xpdf
+(and pkg-config to obtain the required flags).
 
-3.4.1. --with-system-poppler
-Use an installed (system) version of libpoppler (and pkg-config to obtain
-the required flags).
+3.4.2. --with-system-poppler
+Use an installed (system) version >=0.12 of libpoppler (and pkg-config
+to obtain the required flags).
 
 3.5. Configure options for libgraphite
 --------------------------------------
diff --git a/Build/source/aclocal.m4 b/Build/source/aclocal.m4
index 3cc8c1b8c91..d0e6b782a31 100644
--- a/Build/source/aclocal.m4
+++ b/Build/source/aclocal.m4
@@ -999,6 +999,7 @@ m4_include([m4/kpse-icu-flags.m4])
 m4_include([m4/kpse-kpathsea-flags.m4])
 m4_include([m4/kpse-libpng-flags.m4])
 m4_include([m4/kpse-lt-hack.m4])
+m4_include([m4/kpse-mktex.m4])
 m4_include([m4/kpse-options.m4])
 m4_include([m4/kpse-pkgs.m4])
 m4_include([m4/kpse-poppler-flags.m4])
diff --git a/Build/source/configure b/Build/source/configure
index e15811df63d..34b126e990e 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for TeX Live 2011-04-12.
+# Generated by GNU Autoconf 2.68 for TeX Live 2011-06-15.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TeX Live'
 PACKAGE_TARNAME='tex-live'
-PACKAGE_VERSION='2011-04-12'
-PACKAGE_STRING='TeX Live 2011-04-12'
+PACKAGE_VERSION='2011-06-15'
+PACKAGE_STRING='TeX Live 2011-06-15'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -781,13 +781,19 @@ enable_dump_share
 enable_ipc
 enable_omfonts
 enable_tex
+enable_tex_synctex
 enable_etex
+enable_etex_synctex
 enable_ptex
+enable_ptex_synctex
 enable_eptex
+enable_eptex_synctex
 enable_aleph
 enable_pdftex
+enable_pdftex_synctex
 enable_luatex
 enable_xetex
+enable_xetex_synctex
 enable_mf
 enable_mf_nowin
 with_mf_x_toolkit
@@ -1460,7 +1466,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live 2011-04-12 to adapt to many kinds of systems.
+\`configure' configures TeX Live 2011-06-15 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1534,7 +1540,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live 2011-04-12:";;
+     short | recursive ) echo "Configuration of TeX Live 2011-06-15:";;
    esac
   cat <<\_ACEOF
 
@@ -1572,13 +1578,19 @@ Optional Features:
   --disable-omfonts         do not compile and install omfonts (use Web2C
                             versions)
   --disable-tex             do not compile and install TeX
+  --enable-tex-synctex        build TeX with SyncTeX support
   --enable-etex             compile and install e-TeX
+  --disable-etex-synctex      build e-TeX without SyncTeX support
   --disable-ptex            do not compile and install pTeX
+  --disable-ptex-synctex      build pTeX without SyncTeX support
   --disable-eptex           do not compile and install e-pTeX
+  --disable-eptex-synctex     build e-pTeX without SyncTeX support
   --disable-aleph           do not compile and install Aleph
   --disable-pdftex          do not compile and install pdfTeX
+  --disable-pdftex-synctex    build pdfTeX without SyncTeX support
   --disable-luatex          do not compile and install luaTeX
   --disable-xetex           do not compile and install XeTeX
+  --disable-xetex-synctex     build XeTeX without SyncTeX support
   --disable-mf              do not build METAFONT
   --disable-mf-nowin          do not build a separate non-windows-capable
                               METAFONT
@@ -1820,7 +1832,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live configure 2011-04-12
+TeX Live configure 2011-06-15
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2421,7 +2433,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live $as_me 2011-04-12, which was
+It was created by TeX Live $as_me 2011-06-15, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3761,6 +3773,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
 $as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
 if ${kpse_cv_have_win32+:} false; then :
@@ -4138,32 +4151,47 @@ if test "${enable_tex+set}" = set; then :
   enableval=$enable_tex;
 fi
 case $enable_tex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_tex=yes ;;
 esac
+
+# Check whether --enable-tex-synctex was given.
+if test "${enable_tex_synctex+set}" = set; then :
+  enableval=$enable_tex_synctex;
+fi
 # Check whether --enable-etex was given.
 if test "${enable_etex+set}" = set; then :
   enableval=$enable_etex;
 fi
 case $enable_etex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_etex=no ;;
 esac
+
+# Check whether --enable-etex-synctex was given.
+if test "${enable_etex_synctex+set}" = set; then :
+  enableval=$enable_etex_synctex;
+fi
 # Check whether --enable-ptex was given.
 if test "${enable_ptex+set}" = set; then :
   enableval=$enable_ptex;
 fi
 case $enable_ptex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_ptex=yes ;;
 esac
 
+# Check whether --enable-ptex-synctex was given.
+if test "${enable_ptex_synctex+set}" = set; then :
+  enableval=$enable_ptex_synctex;
+fi
+
 test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
 }
@@ -4172,12 +4200,17 @@ if test "${enable_eptex+set}" = set; then :
   enableval=$enable_eptex;
 fi
 case $enable_eptex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_eptex=yes ;;
 esac
 
+# Check whether --enable-eptex-synctex was given.
+if test "${enable_eptex_synctex+set}" = set; then :
+  enableval=$enable_eptex_synctex;
+fi
+
 test "x$enable_web2c:$enable_eptex" = xyes:yes && {
   need_ptexenc=yes
 }
@@ -4186,7 +4219,7 @@ if test "${enable_aleph+set}" = set; then :
   enableval=$enable_aleph;
 fi
 case $enable_aleph in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_aleph=yes ;;
@@ -4196,12 +4229,17 @@ if test "${enable_pdftex+set}" = set; then :
   enableval=$enable_pdftex;
 fi
 case $enable_pdftex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_pdftex=yes ;;
 esac
 
+# Check whether --enable-pdftex-synctex was given.
+if test "${enable_pdftex_synctex+set}" = set; then :
+  enableval=$enable_pdftex_synctex;
+fi
+
 test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
@@ -4212,7 +4250,7 @@ if test "${enable_luatex+set}" = set; then :
   enableval=$enable_luatex;
 fi
 case $enable_luatex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_luatex=yes ;;
@@ -4229,14 +4267,19 @@ if test "${enable_xetex+set}" = set; then :
   enableval=$enable_xetex;
 fi
 case $enable_xetex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_xetex=yes ;;
 esac
 
+# Check whether --enable-xetex-synctex was given.
+if test "${enable_xetex_synctex+set}" = set; then :
+  enableval=$enable_xetex_synctex;
+fi
+
 test "x$enable_web2c:$enable_xetex" = xyes:yes && {
-  need_xpdf=yes
+  need_poppler=yes
   need_libpng=yes
   need_freetype2=yes
   need_icu_xetex=yes
@@ -5786,79 +5829,37 @@ $as_echo "$as_me: Using \`kpathsea' headers and library from TL tree" >&6;}
   fi
 fi
 
-## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live
+## texk/kpathsea/ac/mktex.ac: configure.ac fragment for the TeX Live
 ## subdirectory texk/kpathsea.
 ## configure defaults for mktexfmt & Co.
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then :
   enableval=$enable_mktexmf_default;
 fi
-case $enable_mktexmf_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexmf_default=yes ;;
-esac
 # Check whether --enable-mktexpk-default was given.
 if test "${enable_mktexpk_default+set}" = set; then :
   enableval=$enable_mktexpk_default;
 fi
-case $enable_mktexpk_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexpk_default=yes ;;
-esac
 # Check whether --enable-mktextfm-default was given.
 if test "${enable_mktextfm_default+set}" = set; then :
   enableval=$enable_mktextfm_default;
 fi
-case $enable_mktextfm_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktextfm_default=yes ;;
-esac
 # Check whether --enable-mkocp-default was given.
 if test "${enable_mkocp_default+set}" = set; then :
   enableval=$enable_mkocp_default;
 fi
-case $enable_mkocp_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mkocp_default=yes ;;
-esac
 # Check whether --enable-mkofm-default was given.
 if test "${enable_mkofm_default+set}" = set; then :
   enableval=$enable_mkofm_default;
 fi
-case $enable_mkofm_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mkofm_default=yes ;;
-esac
 # Check whether --enable-mktexfmt-default was given.
 if test "${enable_mktexfmt_default+set}" = set; then :
   enableval=$enable_mktexfmt_default;
 fi
-case $enable_mktexfmt_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexfmt_default=yes ;;
-esac
 # Check whether --enable-mktextex-default was given.
 if test "${enable_mktextex_default+set}" = set; then :
   enableval=$enable_mktextex_default;
 fi
-case $enable_mktextex_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktextex_default=no ;;
-esac
 
 
 
@@ -9847,7 +9848,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live'
- VERSION='2011-04-12'
+ VERSION='2011-06-15'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15112,39 +15113,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -19440,26 +19444,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
 if ${kpse_cv_warning_cxxflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GXX" = xyes; then
   kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
-case `$CXX -dumpversion` in #(
+  case `$CXX -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+      fi
     fi
+  fi
 fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
 else
   kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
 fi
@@ -19811,12 +19821,12 @@ if test "x$with_gd_libdir" != x && test "x$with_gd_libdir" != xyes; then
   GD_LIBS="-L$with_gd_libdir $GD_LIBS"
 fi
 
-if $PKG_CONFIG poppler --atleast-version=0.10; then
+if $PKG_CONFIG poppler --atleast-version=0.12; then
   POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
   XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
   XPDF_LIBS=`$PKG_CONFIG poppler --libs`
 elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
-  as_fn_error $? "did not find poppler-0.10 or better" "$LINENO" 5
+  as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5
 fi
 
 if $PKG_CONFIG poppler --atleast-version=0.12; then
@@ -19824,7 +19834,7 @@ if $PKG_CONFIG poppler --atleast-version=0.12; then
   POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
   POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
 elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
-  as_fn_error $? "did not find poppler-0.10 or better" "$LINENO" 5
+  as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5
 fi
 
 if $PKG_CONFIG zziplib --atleast-version=0.12; then
@@ -21041,7 +21051,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 TeX Live $as_me 2011-04-12, which was
+This file was extended by TeX Live $as_me 2011-06-15, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21098,7 +21108,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="\\
-TeX Live config.status 2011-04-12
+TeX Live config.status 2011-06-15
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -23143,11 +23153,11 @@ msg_compiling="$msg_compiling
 test "x$srcdir" = x. || msg_compiling="$msg_compiling
       from sources in $kpse_src"
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:
-** Configuration summary for $PACKAGE_STRING (2011$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2012/dev$with_banner_add):
 
    $msg_compiling" >&5
 $as_echo "
-** Configuration summary for $PACKAGE_STRING (2011$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2012/dev$with_banner_add):
 
    $msg_compiling" >&6; }
 case $kpse_src$kpse_bld in
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index 4b51a742f0d..16f1d9e192b 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../m4/kpse-libpng-flags.m4 \
 	$(top_srcdir)/../m4/kpse-lt-hack.m4 \
+	$(top_srcdir)/../m4/kpse-mktex.m4 \
 	$(top_srcdir)/../m4/kpse-options.m4 \
 	$(top_srcdir)/../m4/kpse-pkgs.m4 \
 	$(top_srcdir)/../m4/kpse-poppler-flags.m4 \
@@ -133,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../libs/zlib/ac/withenable.ac \
 	$(top_srcdir)/../texk/ptexenc/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/withenable.ac \
-	$(top_srcdir)/../texk/kpathsea/ac/web2c.ac \
+	$(top_srcdir)/../texk/kpathsea/ac/mktex.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
diff --git a/Build/source/libs/aclocal.m4 b/Build/source/libs/aclocal.m4
index 86d2a2ce443..d784586c558 100644
--- a/Build/source/libs/aclocal.m4
+++ b/Build/source/libs/aclocal.m4
@@ -999,6 +999,7 @@ m4_include([../m4/kpse-icu-flags.m4])
 m4_include([../m4/kpse-kpathsea-flags.m4])
 m4_include([../m4/kpse-libpng-flags.m4])
 m4_include([../m4/kpse-lt-hack.m4])
+m4_include([../m4/kpse-mktex.m4])
 m4_include([../m4/kpse-options.m4])
 m4_include([../m4/kpse-pkgs.m4])
 m4_include([../m4/kpse-poppler-flags.m4])
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index b764e001f02..110566bbd54 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -692,13 +692,19 @@ enable_dump_share
 enable_ipc
 enable_omfonts
 enable_tex
+enable_tex_synctex
 enable_etex
+enable_etex_synctex
 enable_ptex
+enable_ptex_synctex
 enable_eptex
+enable_eptex_synctex
 enable_aleph
 enable_pdftex
+enable_pdftex_synctex
 enable_luatex
 enable_xetex
+enable_xetex_synctex
 enable_mf
 enable_mf_nowin
 with_mf_x_toolkit
@@ -1472,13 +1478,19 @@ Optional Features:
   --disable-omfonts         do not compile and install omfonts (use Web2C
                             versions)
   --disable-tex             do not compile and install TeX
+  --enable-tex-synctex        build TeX with SyncTeX support
   --enable-etex             compile and install e-TeX
+  --disable-etex-synctex      build e-TeX without SyncTeX support
   --disable-ptex            do not compile and install pTeX
+  --disable-ptex-synctex      build pTeX without SyncTeX support
   --disable-eptex           do not compile and install e-pTeX
+  --disable-eptex-synctex     build e-pTeX without SyncTeX support
   --disable-aleph           do not compile and install Aleph
   --disable-pdftex          do not compile and install pdfTeX
+  --disable-pdftex-synctex    build pdfTeX without SyncTeX support
   --disable-luatex          do not compile and install luaTeX
   --disable-xetex           do not compile and install XeTeX
+  --disable-xetex-synctex     build XeTeX without SyncTeX support
   --disable-mf              do not build METAFONT
   --disable-mf-nowin          do not build a separate non-windows-capable
                               METAFONT
@@ -3094,6 +3106,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
 $as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
 if ${kpse_cv_have_win32+:} false; then :
@@ -3471,32 +3484,47 @@ if test "${enable_tex+set}" = set; then :
   enableval=$enable_tex;
 fi
 case $enable_tex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_tex=yes ;;
 esac
+
+# Check whether --enable-tex-synctex was given.
+if test "${enable_tex_synctex+set}" = set; then :
+  enableval=$enable_tex_synctex;
+fi
 # Check whether --enable-etex was given.
 if test "${enable_etex+set}" = set; then :
   enableval=$enable_etex;
 fi
 case $enable_etex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_etex=no ;;
 esac
+
+# Check whether --enable-etex-synctex was given.
+if test "${enable_etex_synctex+set}" = set; then :
+  enableval=$enable_etex_synctex;
+fi
 # Check whether --enable-ptex was given.
 if test "${enable_ptex+set}" = set; then :
   enableval=$enable_ptex;
 fi
 case $enable_ptex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_ptex=yes ;;
 esac
 
+# Check whether --enable-ptex-synctex was given.
+if test "${enable_ptex_synctex+set}" = set; then :
+  enableval=$enable_ptex_synctex;
+fi
+
 test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
 }
@@ -3505,12 +3533,17 @@ if test "${enable_eptex+set}" = set; then :
   enableval=$enable_eptex;
 fi
 case $enable_eptex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_eptex=yes ;;
 esac
 
+# Check whether --enable-eptex-synctex was given.
+if test "${enable_eptex_synctex+set}" = set; then :
+  enableval=$enable_eptex_synctex;
+fi
+
 test "x$enable_web2c:$enable_eptex" = xyes:yes && {
   need_ptexenc=yes
 }
@@ -3519,7 +3552,7 @@ if test "${enable_aleph+set}" = set; then :
   enableval=$enable_aleph;
 fi
 case $enable_aleph in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_aleph=yes ;;
@@ -3529,12 +3562,17 @@ if test "${enable_pdftex+set}" = set; then :
   enableval=$enable_pdftex;
 fi
 case $enable_pdftex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_pdftex=yes ;;
 esac
 
+# Check whether --enable-pdftex-synctex was given.
+if test "${enable_pdftex_synctex+set}" = set; then :
+  enableval=$enable_pdftex_synctex;
+fi
+
 test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
@@ -3545,7 +3583,7 @@ if test "${enable_luatex+set}" = set; then :
   enableval=$enable_luatex;
 fi
 case $enable_luatex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_luatex=yes ;;
@@ -3562,14 +3600,19 @@ if test "${enable_xetex+set}" = set; then :
   enableval=$enable_xetex;
 fi
 case $enable_xetex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_xetex=yes ;;
 esac
 
+# Check whether --enable-xetex-synctex was given.
+if test "${enable_xetex_synctex+set}" = set; then :
+  enableval=$enable_xetex_synctex;
+fi
+
 test "x$enable_web2c:$enable_xetex" = xyes:yes && {
-  need_xpdf=yes
+  need_poppler=yes
   need_libpng=yes
   need_freetype2=yes
   need_icu_xetex=yes
@@ -4979,79 +5022,37 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'"
 fi
 
-## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live
+## texk/kpathsea/ac/mktex.ac: configure.ac fragment for the TeX Live
 ## subdirectory texk/kpathsea.
 ## configure defaults for mktexfmt & Co.
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then :
   enableval=$enable_mktexmf_default;
 fi
-case $enable_mktexmf_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexmf_default=yes ;;
-esac
 # Check whether --enable-mktexpk-default was given.
 if test "${enable_mktexpk_default+set}" = set; then :
   enableval=$enable_mktexpk_default;
 fi
-case $enable_mktexpk_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexpk_default=yes ;;
-esac
 # Check whether --enable-mktextfm-default was given.
 if test "${enable_mktextfm_default+set}" = set; then :
   enableval=$enable_mktextfm_default;
 fi
-case $enable_mktextfm_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktextfm_default=yes ;;
-esac
 # Check whether --enable-mkocp-default was given.
 if test "${enable_mkocp_default+set}" = set; then :
   enableval=$enable_mkocp_default;
 fi
-case $enable_mkocp_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mkocp_default=yes ;;
-esac
 # Check whether --enable-mkofm-default was given.
 if test "${enable_mkofm_default+set}" = set; then :
   enableval=$enable_mkofm_default;
 fi
-case $enable_mkofm_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mkofm_default=yes ;;
-esac
 # Check whether --enable-mktexfmt-default was given.
 if test "${enable_mktexfmt_default+set}" = set; then :
   enableval=$enable_mktexfmt_default;
 fi
-case $enable_mktexfmt_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexfmt_default=yes ;;
-esac
 # Check whether --enable-mktextex-default was given.
 if test "${enable_mktextex_default+set}" = set; then :
   enableval=$enable_mktextex_default;
 fi
-case $enable_mktextex_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktextex_default=no ;;
-esac
 
 
 
diff --git a/Build/source/libs/graphite/configure b/Build/source/libs/graphite/configure
index 8e1f1f643e8..4a395c1a8d4 100755
--- a/Build/source/libs/graphite/configure
+++ b/Build/source/libs/graphite/configure
@@ -729,11 +729,7 @@ CPPFLAGS
 CCC
 CC
 CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -4423,39 +4419,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -4470,26 +4469,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
 if ${kpse_cv_warning_cxxflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GXX" = xyes; then
   kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
-case `$CXX -dumpversion` in #(
+  case `$CXX -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+      fi
     fi
+  fi
 fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
 else
   kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
 fi
diff --git a/Build/source/libs/libpng/configure b/Build/source/libs/libpng/configure
index 9fd7081b79a..976573ee59b 100755
--- a/Build/source/libs/libpng/configure
+++ b/Build/source/libs/libpng/configure
@@ -3838,39 +3838,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index ff66c944ef5..7dfcf974cde 100755
--- a/Build/source/libs/poppler/configure
+++ b/Build/source/libs/poppler/configure
@@ -4219,39 +4219,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -4266,26 +4269,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
 if ${kpse_cv_warning_cxxflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GXX" = xyes; then
   kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
-case `$CXX -dumpversion` in #(
+  case `$CXX -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+      fi
     fi
+  fi
 fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
 else
   kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
 fi
diff --git a/Build/source/libs/t1lib/ChangeLog b/Build/source/libs/t1lib/ChangeLog
index fcedc725b41..ef39712f28f 100644
--- a/Build/source/libs/t1lib/ChangeLog
+++ b/Build/source/libs/t1lib/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Use KPSE_COMPILER_WARNINGS.
+	* Makefile.am [AM_CFLAGS]: Prepare for WARNING_CFLAGS.
+
+2011-07-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* version.ac: New file defining the t1lib version.
+	* configure.ac: Adapt. Drom useless AC_HEADER_STAT.
+
 2010-05-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Do not compile lib/type1/bstring.c.
diff --git a/Build/source/libs/t1lib/Makefile.am b/Build/source/libs/t1lib/Makefile.am
index e1c720bcdb0..4da83c2894b 100644
--- a/Build/source/libs/t1lib/Makefile.am
+++ b/Build/source/libs/t1lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Proxy Makefile.am to build t1lib for TeX Live.
 ##
-##   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
@@ -38,7 +38,7 @@ AM_CPPFLAGS = $(T1LIB_DEFINES)
 AM_CPPFLAGS += -DT1LIB_IDENT=\"@T1LIB_VERSIONSTRING@\"
 AM_CPPFLAGS += -DGLOBAL_CONFIG_DIR=\"@T1LIB_DATA_DIR@\"
 
-AM_CFLAGS = $(T1LIB_CFLAGS)
+AM_CFLAGS = $(T1LIB_CFLAGS) # $(WARNING_CFLAGS)
 
 LDADD = libt1.a
 
diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in
index 1413c9a1e1b..5d4cf84ab29 100644
--- a/Build/source/libs/t1lib/Makefile.in
+++ b/Build/source/libs/t1lib/Makefile.in
@@ -46,7 +46,9 @@ DIST_COMMON = README $(am__configure_deps) \
 	../../build-aux/ltmain.sh ../../build-aux/missing \
 	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-lib-version.m4 \
+	$(top_srcdir)/../../m4/kpse-warnings.m4 \
+	$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -159,6 +161,7 @@ T1LIB_VERSIONSTRING = @T1LIB_VERSIONSTRING@
 T1_INT16 = @T1_INT16@
 T1_INT32 = @T1_INT32@
 VERSION = @VERSION@
+WARNING_CFLAGS = @WARNING_CFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -207,7 +210,7 @@ EXTRA_DIST = $(T1LIB_TREE) $(T1LIB_TREE)-PATCHES l047016t.pfa \
 INCLUDES = -Ilib -I$(top_srcdir)/$(T1LIB_TREE)
 AM_CPPFLAGS = $(T1LIB_DEFINES) -DT1LIB_IDENT=\"@T1LIB_VERSIONSTRING@\" \
 	-DGLOBAL_CONFIG_DIR=\"@T1LIB_DATA_DIR@\"
-AM_CFLAGS = $(T1LIB_CFLAGS)
+AM_CFLAGS = $(T1LIB_CFLAGS) # $(WARNING_CFLAGS)
 LDADD = libt1.a
 noinst_LIBRARIES = libt1.a
 nodist_libt1_a_SOURCES = $(lib_t1lib_sources) $(lib_type1_sources)
diff --git a/Build/source/libs/t1lib/aclocal.m4 b/Build/source/libs/t1lib/aclocal.m4
index 76a153698ad..2388a607fe9 100644
--- a/Build/source/libs/t1lib/aclocal.m4
+++ b/Build/source/libs/t1lib/aclocal.m4
@@ -989,3 +989,5 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../../m4/kpse-lib-version.m4])
+m4_include([../../m4/kpse-warnings.m4])
diff --git a/Build/source/libs/t1lib/configure b/Build/source/libs/t1lib/configure
index 4d34ff7c879..f4ccb0014c4 100755
--- a/Build/source/libs/t1lib/configure
+++ b/Build/source/libs/t1lib/configure
@@ -615,6 +615,7 @@ T1_INT16
 EGREP
 GREP
 CPP
+WARNING_CFLAGS
 RANLIB
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
@@ -707,6 +708,7 @@ ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
 enable_dependency_tracking
+enable_compiler_warnings
 '
       ac_precious_vars='build_alias
 host_alias
@@ -716,8 +718,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -1339,6 +1340,9 @@ Optional Features:
 			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-compiler-warnings=[no|min|yes|max|all]
+                          Turn on compiler warnings [default: yes if
+                          maintainer-mode, min otherwise]
 
 Some influential environment variables:
   CC          C compiler command
@@ -2739,9 +2743,6 @@ T1LIB_PATCHLEVEL=2
 T1LIB_VERSIONSTRING='"5.1.2"'
 
 
-
-
-
 ac_config_headers="$ac_config_headers lib/t1lib/sysconf.h"
 
 
@@ -3827,6 +3828,76 @@ else
 fi
 
 
+# Check whether --enable-compiler-warnings was given.
+if test "${enable_compiler_warnings+set}" = set; then :
+  enableval=$enable_compiler_warnings;
+fi
+case $enable_compiler_warnings in #(
+  no | min | yes | max | all) :
+     ;; #(
+  *) :
+    if test "x$enable_maintainer_mode" = xyes; then :
+  enable_compiler_warnings=yes
+else
+  enable_compiler_warnings=min
+fi ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
+$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
+if ${kpse_cv_warning_cflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$GCC" = xyes; then
+  kpse_cv_warning_cflags=
+if test "x$enable_compiler_warnings" != xno; then
+  kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
+  case `$CC -dumpversion` in #(
+  3.4.* | 4.*) :
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
+  *) :
+     ;;
+esac
+  case `$CC -dumpversion` in #(
+  3.[234].* | 4.*) :
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
+  *) :
+     ;;
+esac
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
+  3.4.* | 4.*) :
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
+  *) :
+     ;;
+esac
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
+    fi
+  fi
+fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
+else
+  kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_warning_cflags" >&5
+$as_echo "$kpse_cv_warning_cflags" >&6; }
+WARNING_CFLAGS=$kpse_cv_warning_cflags
+
+
+
+
+
+
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5
 $as_echo_n "checking for library containing sqrt... " >&6; }
@@ -4693,48 +4764,6 @@ T1LIB_DATA_DIR="${datadir}/t1lib"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
-$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
-if ${ac_cv_header_stat_broken+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined S_ISBLK && defined S_IFDIR
-extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
-#endif
-
-#if defined S_ISBLK && defined S_IFCHR
-extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
-#endif
-
-#if defined S_ISLNK && defined S_IFREG
-extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
-#endif
-
-#if defined S_ISSOCK && defined S_IFREG
-extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stat_broken=no
-else
-  ac_cv_header_stat_broken=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-$as_echo "$ac_cv_header_stat_broken" >&6; }
-if test $ac_cv_header_stat_broken = yes; then
-
-$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
-
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if ${ac_cv_c_const+:} false; then :
diff --git a/Build/source/libs/t1lib/configure.ac b/Build/source/libs/t1lib/configure.ac
index 35e7d6c40fd..d67ce3cba3e 100644
--- a/Build/source/libs/t1lib/configure.ac
+++ b/Build/source/libs/t1lib/configure.ac
@@ -1,15 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([t1lib_major], [5])[]dnl
-m4_define([t1lib_minor], [1])[]dnl
-m4_define([t1lib_micro], [2])[]dnl using unmodified t1lib-5.1.2 source tree
-m4_define([t1lib_version], t1lib_major.t1lib_minor.t1lib_micro)[]dnl
+m4_include([version.ac])[] dnl define t1lib_version
 AC_INIT([T1lib for TeX Live], t1lib_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([t1lib-]t1lib_version[/lib/t1lib/t1base.c])
@@ -19,16 +16,12 @@ AC_CONFIG_MACRO_DIR([../../m4])
 AM_INIT_AUTOMAKE([foreign no-define])
 AM_MAINTAINER_MODE
 
-T1LIB_VERSION=t1lib_major()
-T1LIB_REVISION=t1lib_minor()
-T1LIB_PATCHLEVEL=t1lib_micro()
-T1LIB_VERSIONSTRING='"t1lib_major.t1lib_minor.t1lib_micro"'
-AC_SUBST([T1LIB_VERSION])
-AC_SUBST([T1LIB_REVISION])
-AC_SUBST([T1LIB_PATCHLEVEL])
-AC_SUBST([T1LIB_VERSIONSTRING])
+KPSE_LIB_VERSION([t1lib])[]dnl
+AC_SUBST([T1LIB_VERSION], [t1lib_major])[]dnl
+AC_SUBST([T1LIB_REVISION], [t1lib_minor])[]dnl
+AC_SUBST([T1LIB_PATCHLEVEL], [t1lib_micro])[]dnl
+AC_SUBST([T1LIB_VERSIONSTRING], '"t1lib_version"')
 
-dnl AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_HEADERS([lib/t1lib/sysconf.h])
 
 AM_CONDITIONAL([build], [test "x$enable_build" != xno])
@@ -38,6 +31,8 @@ dnl **** Check for some programs and libraries ****
 AC_PROG_CC
 AC_PROG_RANLIB
 
+KPSE_COMPILER_WARNINGS
+
 AC_SEARCH_LIBS([sqrt], [m])
 
 dnl **** Check for some compiler/system characteristics
@@ -115,7 +110,6 @@ AC_SUBST([T1LIB_DATA_DIR])
 
 dnl **** Check for functions and header files ****
 
-AC_HEADER_STAT()
 AC_C_CONST()
 AC_TYPE_SIZE_T()
 
diff --git a/Build/source/libs/t1lib/lib/t1lib/sysconf.h.in b/Build/source/libs/t1lib/lib/t1lib/sysconf.h.in
index e5face53a28..940ada381ed 100644
--- a/Build/source/libs/t1lib/lib/t1lib/sysconf.h.in
+++ b/Build/source/libs/t1lib/lib/t1lib/sysconf.h.in
@@ -72,9 +72,6 @@
 /* The size of `void *', as computed by sizeof. */
 #undef SIZEOF_VOID_P
 
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-#undef STAT_MACROS_BROKEN
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
diff --git a/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/ChangeLog b/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/ChangeLog
index fef1131b818..943aff3f445 100644
--- a/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/ChangeLog
+++ b/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-02-ambiguous (new): Fix braces added to avoid
+	`ambiguous else' warning (compare libXfont 1.3.x from XOrg-7.4).
+
 2011-04-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-01-buffer-limit (new): Avoid buffer overflow in
diff --git a/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/patch-02-ambiguous b/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/patch-02-ambiguous
new file mode 100644
index 00000000000..473a2716f9e
--- /dev/null
+++ b/Build/source/libs/t1lib/t1lib-5.1.2-PATCHES/patch-02-ambiguous
@@ -0,0 +1,16 @@
+diff -ur t1lib-5.1.2.orig/lib/type1/type1.c t1lib-5.1.2/lib/type1/type1.c
+--- t1lib-5.1.2.orig/lib/type1/type1.c	2007-12-23 16:49:42.000000000 +0100
++++ t1lib-5.1.2/lib/type1/type1.c	2011-07-19 21:34:40.000000000 +0200
+@@ -843,11 +843,11 @@
+           if (stemtop >= alignmentzones[i].bottomy + blues->BlueShift){
+             enforceovershoot = TRUE;
+ 	  }
++	}
+         else
+           if (stembottom <= alignmentzones[i].topy - blues->BlueShift){
+             enforceovershoot = TRUE;
+ 	  }
+-	}
+       }
+       
+       
diff --git a/Build/source/libs/t1lib/t1lib-5.1.2/lib/type1/type1.c b/Build/source/libs/t1lib/t1lib-5.1.2/lib/type1/type1.c
index 392016c690e..78e842bb2ee 100644
--- a/Build/source/libs/t1lib/t1lib-5.1.2/lib/type1/type1.c
+++ b/Build/source/libs/t1lib/t1lib-5.1.2/lib/type1/type1.c
@@ -843,11 +843,11 @@ int stemno;
           if (stemtop >= alignmentzones[i].bottomy + blues->BlueShift){
             enforceovershoot = TRUE;
 	  }
+	}
         else
           if (stembottom <= alignmentzones[i].topy - blues->BlueShift){
             enforceovershoot = TRUE;
 	  }
-	}
       }
       
       
diff --git a/Build/source/libs/t1lib/version.ac b/Build/source/libs/t1lib/version.ac
new file mode 100644
index 00000000000..b7337e9d011
--- /dev/null
+++ b/Build/source/libs/t1lib/version.ac
@@ -0,0 +1,11 @@
+dnl
+dnl   Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl   This file is free software; the copyright holder
+dnl   gives unlimited permission to copy and/or distribute it,
+dnl   with or without modifications, as long as this notice is preserved.
+dnl
+dnl --------------------------------------------------------
+dnl
+dnl  m4-include this file to define the current t1lib version
+m4_define([t1lib_version], [5.1.2])
diff --git a/Build/source/libs/teckit/configure b/Build/source/libs/teckit/configure
index 57d81f2ea5b..d544f2f3518 100755
--- a/Build/source/libs/teckit/configure
+++ b/Build/source/libs/teckit/configure
@@ -738,13 +738,8 @@ CPPFLAGS
 CCC
 CC
 CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
 CXXCPP
-CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -4456,39 +4451,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -4503,26 +4501,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
 if ${kpse_cv_warning_cxxflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GXX" = xyes; then
   kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
-case `$CXX -dumpversion` in #(
+  case `$CXX -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+      fi
     fi
+  fi
 fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
 else
   kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
 fi
diff --git a/Build/source/libs/xpdf/configure b/Build/source/libs/xpdf/configure
index 8b3033207b2..b55ac9ca23f 100755
--- a/Build/source/libs/xpdf/configure
+++ b/Build/source/libs/xpdf/configure
@@ -4200,39 +4200,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -4247,26 +4250,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
 if ${kpse_cv_warning_cxxflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GXX" = xyes; then
   kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
-case `$CXX -dumpversion` in #(
+  case `$CXX -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+      fi
     fi
+  fi
 fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
 else
   kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
 fi
diff --git a/Build/source/libs/zziplib/configure b/Build/source/libs/zziplib/configure
index b5024233441..03b3cb0d981 100755
--- a/Build/source/libs/zziplib/configure
+++ b/Build/source/libs/zziplib/configure
@@ -727,8 +727,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -4103,39 +4102,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
new file mode 100644
index 00000000000..4e75791f332
--- /dev/null
+++ b/Build/source/m4/ChangeLog
@@ -0,0 +1,66 @@
+2011-07-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-lib-version.m4 (new): Split FOO_version into FOO_major,
+	FOO_minor, and FOO_micro; build FOO_LT_VERSINFO.
+
+2011-07-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-xpdf-flags.m4: Require system (poppler) version >= 0.12.
+	* kpse-poppler-flags.m4: Fixed a typo.
+	* README: Updated.
+
+	* kpse-warnings.m4 [WARNING_CXXFLAGS, WARNING_OBJCXXFLAGS]:
+	For g++ always use either -Wno-write-strings or -Wwrite-strings
+	because the default for C++ has changed with gcc-4.4.
+
+	* kpse-web2c.m4: Added configure options `--enable-*-synctex',
+	moved handling of `--enable-mktex*-default' from here ...
+	* kpse-mktex.m4: ... to this new file.
+	* kpse-setup.m4: Added KPSE_MKTEX_PREPARE.
+
+2011-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-common.m4 (KPSE_COMMON): Remove check for
+	program_invocation_name.
+
+2010-04-11  Karl Berry  <karl@tug.org>
+
+	* kpse-pkgs.m4 (KPSE_TEXK_PKGS): add ptexenc, makejvf, mendexk.
+	From Akira and Norbert.
+	* kpse-ptexenc-flags.m4: new file.
+
+2010-03-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-icu-flags.m4 (KPSE_ICU_SYSTEM_FLAGS): Work around bug
+	in icu-config version 4.4.
+	* kpse-common.m4 (KPSE_COMMON): Added AC_TYPE_SIZE_T.
+
+2010-02-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-common.m4 (KPSE_COMMON): Use LT_INIT([win32-dll]).
+	* kpse-gd-flags.m4 (KPSE_GD_FLAGS): Add -DNONDLL.
+
+2010-02-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-kpathsea-flags.m4: Detect if libkpathsea was compiled
+	without debugging support and add '-DNODEBUG' if necessary.
+
+2010-02-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-warnings.m4: Redefine compiler warning levels to
+	reduce the number of 'min' warnings.
+
+2009-11-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-setup.m4: Disable cross compilation of xindy.
+	* configure.ac: Report absolute build and source dir; reject
+	paths with embedded spaces.
+
+2009-09-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-warnings.m4: Additional level 'all' of compiler
+	warnings, 'max' now without the extremely noisy -Wshadow.
+
+2009-08-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-warnings.m4: Implement Objective C compiler warnings.
diff --git a/Build/source/m4/README b/Build/source/m4/README
index b439dae75af..8a79cf44fa2 100644
--- a/Build/source/m4/README
+++ b/Build/source/m4/README
@@ -1,4 +1,4 @@
-Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 You may freely use, modify and/or distribute this file.
 
 This directory is the central repository for Autoconf macros needed to build
@@ -13,11 +13,11 @@ original build system.
 Note: the files libtool.m4 and ../build-aux/ltmain.sh must match.
 
 (2) `Public' macros for the TL build system and for the TL libraries in the
-subdirectories libs/*/ and texk/kpathsea/, used to configure programs and
-other libraries requiring these TL libraries.  The macros are designed with
-the aim that programs maintained independently can be built as part of the
-TL tree or without TL (using installed versions of the required libraries),
-ideally using the same unmodified sources.
+subdirectories libs/*/, texk/kpathsea/, and texk/ptexenc, used to configure
+programs and other libraries requiring these TL libraries.  The macros are
+designed with the aim that programs maintained independently can be built as
+part of the TL tree or without TL (using installed versions of the required
+libraries), ideally using the same unmodified sources.
 
 (3) `Private' macros for the TL infrastructure, only used in directories
 owned by the TL tree.
diff --git a/Build/source/m4/kpse-lib-version.m4 b/Build/source/m4/kpse-lib-version.m4
new file mode 100644
index 00000000000..b6fa4ce9908
--- /dev/null
+++ b/Build/source/m4/kpse-lib-version.m4
@@ -0,0 +1,25 @@
+# Private macros for the TeX Live (TL) tree.
+# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# KPSE_LIB_VERSION(NAME)
+# ----------------------
+# Split NAME_version into NAME_major, NAME_minor, and NAME_micro
+# (ignoring lowercase letters forming an optional suffix).
+AC_DEFUN([KPSE_LIB_VERSION],
+[m4_bpatsubst($1_version, [^\([0-9]+\).\([0-9]+\).\([0-9]+\)[a-z]*$],
+              [m4_define([$1_major], [\1])m4_define([$1_minor], [\2])m4_define([$1_micro], [\3])])[]dnl
+]) # KPSE_LIB_VERSION
+
+# KPSE_LT_VERSION(NAME)
+# ---------------------
+# Split NAME_version as above and define _LT_VERSINFO.
+AC_DEFUN([KPSE_LT_VERSION],
+[KPSE_LIB_VERSION([$1])
+AC_SUBST(AS_TR_CPP($1)[_LT_VERSINFO],
+         [m4_eval($1_major+$1_minor):$1_micro:$1_minor])[]dnl
+]) # KPSE_LT_VERSION
+
diff --git a/Build/source/m4/kpse-mktex.m4 b/Build/source/m4/kpse-mktex.m4
new file mode 100644
index 00000000000..eeb0e0970f6
--- /dev/null
+++ b/Build/source/m4/kpse-mktex.m4
@@ -0,0 +1,36 @@
+# Private macros for the TeX Live (TL) tree.
+# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# KPSE_MKTEX_PREPARE
+# ------------------
+# AC_DEFUN'ed so it can enforce inclusion of this file.
+AC_DEFUN([KPSE_MKTEX_PREPARE], [])
+
+# KPSE_WITH_MKTEX(PROG, YES-OR-NO, TEXT, STEM)
+# --------------------------------------------
+# Provide configure options --enable-mktex*-default and normalize result.
+m4_define([KPSE_WITH_MKTEX],
+[AC_ARG_ENABLE([$1-default],
+               AS_HELP_STRING([--]m4_if([$2], [yes], [dis], [en])[able-$1-default],
+                              m4_if([$2], [yes],
+                                    [do not ])[run $1 if $3 missing],
+                              m4_eval(kpse_indent_26+2)))[]dnl
+]) # KPSE_WITH_MKTEX
+
+# KPSE_MKTEX_DEFINE(PROG, YES-OR-NO, TEXT, STEM)
+# ----------------------------------------------
+# Normalize --enable-mktex*-default configure option and build defines.
+m4_define([KPSE_MKTEX_DEFINE],
+[AS_CASE([$enable_$1_default],
+         [yes | no], ,
+         [enable_$1_default=$2])
+AS_IF([test "x$enable_$1_default" = xyes],
+      [AC_DEFINE([MAKE_$4_BY_DEFAULT], 1,
+                 [Define to 1 if you want to run $1 if $3 is missing,
+                  and to 0 if you don't])],
+      [AC_DEFINE([MAKE_$4_BY_DEFAULT], 0)])
+]) # KPSE_MKTEX_DEFINE
diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4
index eee3c8b55cd..e2a01e172d8 100644
--- a/Build/source/m4/kpse-poppler-flags.m4
+++ b/Build/source/m4/kpse-poppler-flags.m4
@@ -5,8 +5,6 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 0
-
 # KPSE_POPPLER_FLAGS
 # ---------------
 # Provide the configure option '--with-system-poppler' (if in the TL tree).
@@ -38,6 +36,6 @@ if $PKG_CONFIG poppler --atleast-version=0.12; then
   POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
   POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
 elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
-  AC_MSG_ERROR([did not find poppler-0.10 or better])
+  AC_MSG_ERROR([did not find poppler-0.12 or better])
 fi
 ]) # KPSE_POPPLER_SYSTEM_FLAGS
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index 8116b410f68..0992b48832b 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -1,12 +1,10 @@
 # Private macros for the TeX Live (TL) tree.
-# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 0
-
 # KPSE_SETUP(TOP-LEVEL)
 # ---------------------
 # Initialize path prefix kpse_TL to top-level TeX Live (TL) directory.
@@ -62,6 +60,7 @@ KPSE_OPTIONS
 KPSE_ENABLE_CXX_HACK
 KPSE_ENABLE_LT_HACK
 KPSE_LIBS_PREPARE
+KPSE_MKTEX_PREPARE
 KPSE_WEB2C_PREPARE
 KPSE_CHECK_WIN32
 AS_CASE([$with_x:$kpse_cv_have_win32],
diff --git a/Build/source/m4/kpse-warnings.m4 b/Build/source/m4/kpse-warnings.m4
index 6ff4d9547ef..21127cb5466 100644
--- a/Build/source/m4/kpse-warnings.m4
+++ b/Build/source/m4/kpse-warnings.m4
@@ -1,12 +1,10 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holders
 # give unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 0
-
 # KPSE_COMPILER_WARNINGS
 # ----------------------
 # Set up compiler warnings for C and C++.
@@ -61,10 +59,10 @@ AC_REQUIRE([AC_PROG_CC])[]dnl
 AC_CACHE_CHECK([what warning flags to pass to the C compiler],
                [kpse_cv_warning_cflags],
                [dnl
-if test "x$enable_compiler_warnings" = xno; then
-  kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$GCC" = xyes; then
   _KPSE_WARNING_GNU_CFLAGS([CC], [cflags])[]dnl
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi])
@@ -81,10 +79,10 @@ m4_define([_KPSE_WARNING_CXXFLAGS],
 [AC_CACHE_CHECK([what warning flags to pass to the C++ compiler],
                 [kpse_cv_warning_cxxflags],
                 [dnl
-if test "x$enable_compiler_warnings" = xno; then
-  kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+if test "x$GXX" = xyes; then
   _KPSE_WARNING_GNU_CXXFLAGS([CXX], [cxxflags])[]dnl
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
 else
   kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
 fi])
@@ -103,10 +101,10 @@ AC_REQUIRE([AC_PROG_OBJC])[]dnl
 AC_CACHE_CHECK([what warning flags to pass to the Objective C compiler],
                [kpse_cv_warning_objcflags],
                [dnl
-if test "x$enable_compiler_warnings" = xno; then
-  kpse_cv_warning_objcflags=
-elif test "x$GOBJC" = xyes; then
+if test "x$GOBJC" = xyes; then
   _KPSE_WARNING_GNU_CFLAGS([OBJC], [objcflags])[]dnl
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_objcflags=
 else
   kpse_cv_warning_objcflags= # FIXME: warning flags for non-GNU Objective C compilers
 fi])
@@ -125,10 +123,10 @@ AC_REQUIRE([AC_PROG_OBJCXX])[]dnl
 AC_CACHE_CHECK([what warning flags to pass to the Objective C++ compiler],
                [kpse_cv_warning_objcxxflags],
                [dnl
-if test "x$enable_compiler_warnings" = xno; then
-  kpse_cv_warning_objcxxflags=
-elif test "x$GOBJCXX" = xyes; then
+if test "x$GOBJCXX" = xyes; then
   _KPSE_WARNING_GNU_CXXFLAGS([OBJCXX], [objcxxflags])[]dnl
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_objcxxflags=
 else
   kpse_cv_warning_objcxxflags= # FIXME: warning flags for non-GNU Objective C++ compilers
 fi])
@@ -142,47 +140,56 @@ m4_define([_KPSE_WARNING_OBJCXXFLAGS], [])[]dnl
 # Internal subroutine.
 # Determine warning flags for GNU (Objective) C compiler.
 m4_define([_KPSE_WARNING_GNU_CFLAGS],
-[kpse_cv_warning_$2="-Wimplicit -Wreturn-type"
-AS_CASE([`$[]$1 -dumpversion`],
-        [3.4.* | 4.*],
-        [kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wdeclaration-after-statement"])
-AS_CASE([`$[]$1 -dumpversion`],
-        [3.@<:@234@:>@.* | 4.*],
-        [kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wno-unknown-pragmas"])
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_$2="-Wall -Wunused $kpse_cv_warning_$2"
-  kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wcast-qual -Wcast-align -Wwrite-strings"
-    AS_CASE([`$[]$1 -dumpversion`],
-            [3.4.* | 4.*],
-            [kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wold-style-definition"])
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wshadow"
+[kpse_cv_warning_$2=
+if test "x$enable_compiler_warnings" != xno; then
+  kpse_cv_warning_$2="-Wimplicit -Wreturn-type"
+  AS_CASE([`$[]$1 -dumpversion`],
+          [3.4.* | 4.*],
+          [kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wdeclaration-after-statement"])
+  AS_CASE([`$[]$1 -dumpversion`],
+          [3.@<:@234@:>@.* | 4.*],
+          [kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wno-unknown-pragmas"])
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_$2="-Wall -Wunused $kpse_cv_warning_$2"
+    kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wcast-qual -Wcast-align -Wwrite-strings"
+      AS_CASE([`$[]$1 -dumpversion`],
+              [3.4.* | 4.*],
+              [kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wold-style-definition"])
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wshadow"
+      fi
     fi
   fi
 fi
-]) # _KPSE_WARNING_GNU_CFLAGS
+]) # _KPSE_WARNING_GNU_CFLAGS
 
 # _KPSE_WARNING_GNU_CXXFLAGS(COMPILER, TAG)
 # -----------------------------------------
 # Internal subroutine.
 # Determine warning flags for GNU (Objective) C++ compiler.
 m4_define([_KPSE_WARNING_GNU_CXXFLAGS],
-[kpse_cv_warning_$2="-Wimplicit -Wreturn-type"
-AS_CASE([`$[]$1 -dumpversion`],
-        [3.@<:@234@:>@.* | 4.*],
-        [kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wno-unknown-pragmas"])
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_$2="-Wall -Wunused $kpse_cv_warning_$2"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wshadow"
+[kpse_cv_warning_$2=
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
+  kpse_cv_warning_$2="-Wimplicit -Wreturn-type"
+  AS_CASE([`$[]$1 -dumpversion`],
+          [3.@<:@234@:>@.* | 4.*],
+          [kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wno-unknown-pragmas"])
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_$2="-Wall -Wunused $kpse_cv_warning_$2"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_$2="$kpse_cv_warning_$2 -Wshadow"
+      fi
     fi
+  fi
 fi
-]) # _KPSE_WARNING_GNU_CXXFLAGS
+kpse_cv_warning_$2="$kpse_cv_warning_$2 $kpse_warn_strings"
+]) # _KPSE_WARNING_GNU_CXXFLAGS
 
diff --git a/Build/source/m4/kpse-web2c.m4 b/Build/source/m4/kpse-web2c.m4
index 0f30a2a270a..2a108f8b0ff 100644
--- a/Build/source/m4/kpse-web2c.m4
+++ b/Build/source/m4/kpse-web2c.m4
@@ -1,52 +1,33 @@
 # Private macros for the TeX Live (TL) tree.
-# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 0
-
 # KPSE_WEB2C_PREPARE
 # ------------------
 # AC_DEFUN'ed so it can enforce inclusion of this file.
 AC_DEFUN([KPSE_WEB2C_PREPARE], [])
 
-# KPSE_WITH_MKTEX(PROG, YES-OR-NO, TEXT, STEM)
-# --------------------------------------------
-# Provide configure options --enable-mktex*-default and normalize result.
-m4_define([KPSE_WITH_MKTEX],
-[AC_ARG_ENABLE([$1-default],
-               AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1-default],
-                              m4_if($2, [yes],
-                                    [do not ])[run $1 if $3 missing],
-                              m4_eval(kpse_indent_26+2)))[]dnl
-AS_CASE([$enable_$1_default], [yes|no], ,
-                            [enable_$1_default=$2])
-]) # KPSE_WITH_MKTEX
-
-# KPSE_MKTEX_DEFINE(PROG, YES-OR-NO, TEXT, STEM)
-# ----------------------------------------------
-# Defines for enable-mktex*-default
-m4_define([KPSE_MKTEX_DEFINE],
-[AS_IF([test "x$enable_$1_default" = xyes],
-       [AC_DEFINE([MAKE_$4_BY_DEFAULT], 1,
-                  [Define to 1 if you want to run $1 if $3 is missing,
-                   and to 0 if you don't])],
-       [AC_DEFINE([MAKE_$4_BY_DEFAULT], 0)])
-]) # KPSE_MKTEX_DEFINE
-
 # KPSE_WITH_XTEX(PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS)
 # ------------------------------------------------------------------
-# Provide configure options --enable-*tex and normalize result.
+# Provide and normalize the configure options --enable-*tex.
 m4_define([KPSE_WITH_XTEX],
 [AC_ARG_ENABLE([$1],
-               AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1],
-                              m4_if($2, [yes],
+               AS_HELP_STRING([--]m4_if([$2], [yes], [dis], [en])[able-$1],
+                              m4_if([$2], [yes],
                                     [do not ])[compile and install $4],
                               kpse_indent_26))[]dnl
-AS_CASE([$enable_$1], [yes|no], ,
-                    [enable_$1=$2])
+AS_CASE([$enable_$1],
+        [yes | no], ,
+        [enable_$1=$2])
+m4_ifval([$3], [
+AC_ARG_ENABLE([$1-synctex],
+              AS_HELP_STRING([--]m4_if([$3], [yes], [dis], [en])[able-$1-synctex],
+                             [build $4 with]m4_if([$3], [yes], [out])[ SyncTeX support],
+                             m4_eval(kpse_indent_26+2)))[]dnl
+])[]dnl m4_ifval
 m4_ifval([$5], [
 test "x$enable_web2c:$enable_$1" = xyes:yes && {
 AC_FOREACH([Kpse_Lib], [$5], [  need_[]AS_TR_SH(Kpse_Lib)=yes
@@ -56,10 +37,16 @@ AC_FOREACH([Kpse_Lib], [$5], [  need_[]AS_TR_SH(Kpse_Lib)=yes
 
 # KPSE_XTEX_COND(PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS)
 # ------------------------------------------------------------------
-# Conditionals for --with-*tex
+# Normalize --enable-*tex-synctex configure option and build conditionals.
 m4_define([KPSE_XTEX_COND],
 [AM_CONDITIONAL(AS_TR_CPP($1), [test "x$enable_$1" = xyes])[]dnl
-AM_CONDITIONAL(AS_TR_CPP($1)[_SYNCTEX], m4_if([$3], [yes], [true], [false]))[]dnl
+m4_ifval([$3], [
+AS_CASE([$enable_native_texlive_build:$enable_$1_synctex],
+        [yes:$3 | no:yes | no:no], ,
+        [enable_$1_synctex=$3
+         AC_MSG_WARN([Enforcing `--enable-$1-synctex=$3' (native TeX Live build)])])
+AM_CONDITIONAL(AS_TR_CPP($1)[_SYNCTEX], [test "x$enable_$1_synctex" = xyes])[]dnl
+])[]dnl m4_ifval
 ]) # KPSE_XTEX_COND
 
 # KPSE_WITH_MFWIN(WINDOW, DEFINE, TEXT)
diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4
index 993bd792f16..2ab194181ea 100644
--- a/Build/source/m4/kpse-xpdf-flags.m4
+++ b/Build/source/m4/kpse-xpdf-flags.m4
@@ -1,12 +1,10 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 0
-
 # KPSE_XPDF_FLAGS
 # ---------------
 # Provide the configure option '--with-system-xpdf' (if in the TL tree).
@@ -34,11 +32,11 @@ AC_DEFUN([KPSE_XPDF_OPTIONS],
 # ----------------------
 AC_DEFUN([KPSE_XPDF_SYSTEM_FLAGS],
 [AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
-if $PKG_CONFIG poppler --atleast-version=0.10; then
+if $PKG_CONFIG poppler --atleast-version=0.12; then
   POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
   XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
   XPDF_LIBS=`$PKG_CONFIG poppler --libs`
 elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
-  AC_MSG_ERROR([did not find poppler-0.10 or better])
+  AC_MSG_ERROR([did not find poppler-0.12 or better])
 fi
 ]) # KPSE_XPDF_SYSTEM_FLAGS
diff --git a/Build/source/tardate.ac b/Build/source/tardate.ac
index d14b8338639..2ca25b72118 100644
--- a/Build/source/tardate.ac
+++ b/Build/source/tardate.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current TeX Live tarball version
-m4_define([tex_live_tardate], [2011-04-12])
+m4_define([tex_live_tardate], [2011-06-15])
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 801e17e3356..512f29f759d 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../m4/kpse-libpng-flags.m4 \
 	$(top_srcdir)/../m4/kpse-lt-hack.m4 \
+	$(top_srcdir)/../m4/kpse-mktex.m4 \
 	$(top_srcdir)/../m4/kpse-options.m4 \
 	$(top_srcdir)/../m4/kpse-pkgs.m4 \
 	$(top_srcdir)/../m4/kpse-poppler-flags.m4 \
@@ -133,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../libs/zlib/ac/withenable.ac \
 	$(top_srcdir)/../texk/ptexenc/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/withenable.ac \
-	$(top_srcdir)/../texk/kpathsea/ac/web2c.ac \
+	$(top_srcdir)/../texk/kpathsea/ac/mktex.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4
index 86d2a2ce443..d784586c558 100644
--- a/Build/source/texk/aclocal.m4
+++ b/Build/source/texk/aclocal.m4
@@ -999,6 +999,7 @@ m4_include([../m4/kpse-icu-flags.m4])
 m4_include([../m4/kpse-kpathsea-flags.m4])
 m4_include([../m4/kpse-libpng-flags.m4])
 m4_include([../m4/kpse-lt-hack.m4])
+m4_include([../m4/kpse-mktex.m4])
 m4_include([../m4/kpse-options.m4])
 m4_include([../m4/kpse-pkgs.m4])
 m4_include([../m4/kpse-poppler-flags.m4])
diff --git a/Build/source/texk/afm2pl/ChangeLog b/Build/source/texk/afm2pl/ChangeLog
index 6274127a598..dde61398f94 100644
--- a/Build/source/texk/afm2pl/ChangeLog
+++ b/Build/source/texk/afm2pl/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* afm2pl.c (find_suffix, !KPATHSEA): Declare result as const.
+	(openout, writepl, conspsfonts): Allow find_suffix() to return
+	a const string.
+
 2010-12-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Version 0.7.1 (since 2009-06-21).
diff --git a/Build/source/texk/afm2pl/afm2pl.c b/Build/source/texk/afm2pl/afm2pl.c
index 7820119195a..2ab70f5e704 100644
--- a/Build/source/texk/afm2pl/afm2pl.c
+++ b/Build/source/texk/afm2pl/afm2pl.c
@@ -386,11 +386,11 @@ concat(const char *s1, const char *s2)
 /* Return pointer to first character after `.' in last directory element
  * of NAME.  If the name is `foo' or `/foo.bar/baz', we have no extension.
  */
-static char *
+static const char *
 find_suffix(const char *name)
 {
   const char *slash_pos;
-  char *dot_pos = (char *) strrchr (name, '.');
+  const char *dot_pos = (char *) strrchr (name, '.');
 
   if (dot_pos == NULL)
     return NULL;
@@ -501,15 +501,14 @@ openout(const char *fname, int based_on, const char *outext)
   const char *inext = ".afm";
   /* use inext+1 and outext+1 when the leading dot is not desired */
   const char *realfname;
-  char *suf;
+  const char *suf;
 
   if (based_on) {  /* compute output filename */
     suf = find_suffix (fname);
     if (suf && !strcmp ((inext + 1), suf)) {    /* replace afm suffix */
       char * q;
       q = newstring (fname);
-      suf = find_suffix (q);
-      suf[0] = 0;
+      q[suf - fname] = 0;
       strcat (q, (outext + 1));
       realfname = q;
       /* no allocation required: new suffix not longer than old one */
@@ -1787,7 +1786,8 @@ writepl(void)
   register struct kern *nkern;
   struct adobeinfo *asucc, *asub;
   int ht, dt;
-  char labeled, *pp;
+  char labeled;
+  const char *pp;
 
   outname = openout (outname, based_on, ".pl");
 
@@ -1795,7 +1795,8 @@ writepl(void)
   {
     char *outbase = newstring (xbasename (outname));
     pp = find_suffix (outbase);
-    if (pp) { pp--; *pp = 0; }
+    if (pp)
+      outbase[pp - outbase - 1] = 0;
     (void) sprintf (obuffer, "%s%s%s", outbase,
                     (efactor == 1.0 ? "" : "-E"),
                     (slant == 0.0 ? "" : "-S"));
@@ -2260,15 +2261,14 @@ readargs(int argc, char **argv)
 static void
 conspsfonts(void)
 {
-  char *p, *q;
+  char *p;
+  const char *q;
 
   /* TeX fontname is file basename without path or extension */
   p = newstring (xbasename (outname));
   q = find_suffix (p);
-  if (q > p) {
-    q--;
-    *q = 0;
-  }
+  if (q)
+    p[q - p - 1] = 0;
   openout (p, 0, ".map");
   (void) fprintf (outfile, "%s %s", p, fontname);
   free (p);
@@ -2288,10 +2288,8 @@ conspsfonts(void)
   }
   p = newstring (xbasename (afmname));
   q = find_suffix (p);
-  if (q > p) {
-    q--;
-    *q = 0;
-  }
+  if (q)
+    p[q - p - 1] = 0;
   (void) fprintf (outfile, " <%s.pfb", p);
   free (p);
   (void) fprintf (outfile, "\n");
diff --git a/Build/source/texk/afm2pl/configure b/Build/source/texk/afm2pl/configure
index 663714ce27a..724a91291cd 100755
--- a/Build/source/texk/afm2pl/configure
+++ b/Build/source/texk/afm2pl/configure
@@ -758,8 +758,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12456,39 +12455,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/bibtex8/configure b/Build/source/texk/bibtex8/configure
index a62cc898b86..d7433bfece8 100755
--- a/Build/source/texk/bibtex8/configure
+++ b/Build/source/texk/bibtex8/configure
@@ -758,8 +758,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12447,39 +12446,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/bibtexu/configure b/Build/source/texk/bibtexu/configure
index bf008dd1857..21ee7331c12 100755
--- a/Build/source/texk/bibtexu/configure
+++ b/Build/source/texk/bibtexu/configure
@@ -12684,39 +12684,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -16324,26 +16327,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
 if ${kpse_cv_warning_cxxflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GXX" = xyes; then
   kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
-case `$CXX -dumpversion` in #(
+  case `$CXX -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+      fi
     fi
+  fi
 fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
 else
   kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
 fi
diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure
index 2e9f68243dc..96424bafd11 100755
--- a/Build/source/texk/cjkutils/configure
+++ b/Build/source/texk/cjkutils/configure
@@ -768,8 +768,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12457,39 +12456,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 725f2a3a755..cc9acb1f888 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -692,13 +692,19 @@ enable_dump_share
 enable_ipc
 enable_omfonts
 enable_tex
+enable_tex_synctex
 enable_etex
+enable_etex_synctex
 enable_ptex
+enable_ptex_synctex
 enable_eptex
+enable_eptex_synctex
 enable_aleph
 enable_pdftex
+enable_pdftex_synctex
 enable_luatex
 enable_xetex
+enable_xetex_synctex
 enable_mf
 enable_mf_nowin
 with_mf_x_toolkit
@@ -1492,13 +1498,19 @@ Optional Features:
   --disable-omfonts         do not compile and install omfonts (use Web2C
                             versions)
   --disable-tex             do not compile and install TeX
+  --enable-tex-synctex        build TeX with SyncTeX support
   --enable-etex             compile and install e-TeX
+  --disable-etex-synctex      build e-TeX without SyncTeX support
   --disable-ptex            do not compile and install pTeX
+  --disable-ptex-synctex      build pTeX without SyncTeX support
   --disable-eptex           do not compile and install e-pTeX
+  --disable-eptex-synctex     build e-pTeX without SyncTeX support
   --disable-aleph           do not compile and install Aleph
   --disable-pdftex          do not compile and install pdfTeX
+  --disable-pdftex-synctex    build pdfTeX without SyncTeX support
   --disable-luatex          do not compile and install luaTeX
   --disable-xetex           do not compile and install XeTeX
+  --disable-xetex-synctex     build XeTeX without SyncTeX support
   --disable-mf              do not build METAFONT
   --disable-mf-nowin          do not build a separate non-windows-capable
                               METAFONT
@@ -3114,6 +3126,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
 $as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
 if ${kpse_cv_have_win32+:} false; then :
@@ -3491,32 +3504,47 @@ if test "${enable_tex+set}" = set; then :
   enableval=$enable_tex;
 fi
 case $enable_tex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_tex=yes ;;
 esac
+
+# Check whether --enable-tex-synctex was given.
+if test "${enable_tex_synctex+set}" = set; then :
+  enableval=$enable_tex_synctex;
+fi
 # Check whether --enable-etex was given.
 if test "${enable_etex+set}" = set; then :
   enableval=$enable_etex;
 fi
 case $enable_etex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_etex=no ;;
 esac
+
+# Check whether --enable-etex-synctex was given.
+if test "${enable_etex_synctex+set}" = set; then :
+  enableval=$enable_etex_synctex;
+fi
 # Check whether --enable-ptex was given.
 if test "${enable_ptex+set}" = set; then :
   enableval=$enable_ptex;
 fi
 case $enable_ptex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_ptex=yes ;;
 esac
 
+# Check whether --enable-ptex-synctex was given.
+if test "${enable_ptex_synctex+set}" = set; then :
+  enableval=$enable_ptex_synctex;
+fi
+
 test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
 }
@@ -3525,12 +3553,17 @@ if test "${enable_eptex+set}" = set; then :
   enableval=$enable_eptex;
 fi
 case $enable_eptex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_eptex=yes ;;
 esac
 
+# Check whether --enable-eptex-synctex was given.
+if test "${enable_eptex_synctex+set}" = set; then :
+  enableval=$enable_eptex_synctex;
+fi
+
 test "x$enable_web2c:$enable_eptex" = xyes:yes && {
   need_ptexenc=yes
 }
@@ -3539,7 +3572,7 @@ if test "${enable_aleph+set}" = set; then :
   enableval=$enable_aleph;
 fi
 case $enable_aleph in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_aleph=yes ;;
@@ -3549,12 +3582,17 @@ if test "${enable_pdftex+set}" = set; then :
   enableval=$enable_pdftex;
 fi
 case $enable_pdftex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_pdftex=yes ;;
 esac
 
+# Check whether --enable-pdftex-synctex was given.
+if test "${enable_pdftex_synctex+set}" = set; then :
+  enableval=$enable_pdftex_synctex;
+fi
+
 test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
@@ -3565,7 +3603,7 @@ if test "${enable_luatex+set}" = set; then :
   enableval=$enable_luatex;
 fi
 case $enable_luatex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_luatex=yes ;;
@@ -3582,14 +3620,19 @@ if test "${enable_xetex+set}" = set; then :
   enableval=$enable_xetex;
 fi
 case $enable_xetex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_xetex=yes ;;
 esac
 
+# Check whether --enable-xetex-synctex was given.
+if test "${enable_xetex_synctex+set}" = set; then :
+  enableval=$enable_xetex_synctex;
+fi
+
 test "x$enable_web2c:$enable_xetex" = xyes:yes && {
-  need_xpdf=yes
+  need_poppler=yes
   need_libpng=yes
   need_freetype2=yes
   need_icu_xetex=yes
@@ -4999,79 +5042,37 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'"
 fi
 
-## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live
+## texk/kpathsea/ac/mktex.ac: configure.ac fragment for the TeX Live
 ## subdirectory texk/kpathsea.
 ## configure defaults for mktexfmt & Co.
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then :
   enableval=$enable_mktexmf_default;
 fi
-case $enable_mktexmf_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexmf_default=yes ;;
-esac
 # Check whether --enable-mktexpk-default was given.
 if test "${enable_mktexpk_default+set}" = set; then :
   enableval=$enable_mktexpk_default;
 fi
-case $enable_mktexpk_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexpk_default=yes ;;
-esac
 # Check whether --enable-mktextfm-default was given.
 if test "${enable_mktextfm_default+set}" = set; then :
   enableval=$enable_mktextfm_default;
 fi
-case $enable_mktextfm_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktextfm_default=yes ;;
-esac
 # Check whether --enable-mkocp-default was given.
 if test "${enable_mkocp_default+set}" = set; then :
   enableval=$enable_mkocp_default;
 fi
-case $enable_mkocp_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mkocp_default=yes ;;
-esac
 # Check whether --enable-mkofm-default was given.
 if test "${enable_mkofm_default+set}" = set; then :
   enableval=$enable_mkofm_default;
 fi
-case $enable_mkofm_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mkofm_default=yes ;;
-esac
 # Check whether --enable-mktexfmt-default was given.
 if test "${enable_mktexfmt_default+set}" = set; then :
   enableval=$enable_mktexfmt_default;
 fi
-case $enable_mktexfmt_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexfmt_default=yes ;;
-esac
 # Check whether --enable-mktextex-default was given.
 if test "${enable_mktextex_default+set}" = set; then :
   enableval=$enable_mktextex_default;
 fi
-case $enable_mktextex_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktextex_default=no ;;
-esac
 
 
 
diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure
index 022bb190729..3a96bea9d93 100755
--- a/Build/source/texk/detex/configure
+++ b/Build/source/texk/detex/configure
@@ -762,8 +762,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12460,39 +12459,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/devnag/configure b/Build/source/texk/devnag/configure
index fd861e69d92..c58bb944b92 100755
--- a/Build/source/texk/devnag/configure
+++ b/Build/source/texk/devnag/configure
@@ -669,8 +669,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -3506,39 +3505,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/dtl/configure b/Build/source/texk/dtl/configure
index 5a3989313e4..8a2748e9c31 100755
--- a/Build/source/texk/dtl/configure
+++ b/Build/source/texk/dtl/configure
@@ -758,8 +758,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12634,39 +12633,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure
index 161d2a490ef..8b3ad1edc13 100755
--- a/Build/source/texk/dvi2tty/configure
+++ b/Build/source/texk/dvi2tty/configure
@@ -759,8 +759,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12457,39 +12456,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/dvidvi/configure b/Build/source/texk/dvidvi/configure
index 818dea113db..48ed9f54215 100755
--- a/Build/source/texk/dvidvi/configure
+++ b/Build/source/texk/dvidvi/configure
@@ -758,8 +758,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12456,39 +12455,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/dviljk/configure b/Build/source/texk/dviljk/configure
index 3f2adfbf7ea..020f5fafc53 100755
--- a/Build/source/texk/dviljk/configure
+++ b/Build/source/texk/dviljk/configure
@@ -12626,39 +12626,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog
index 3092a4de721..1c7656257fe 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog
+++ b/Build/source/texk/dvipdfmx/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* version.ac: New file defining the dvipdfmx version.
+	* configure.ac: Adapt. (AC_TYPE_UINT32_T) Portability fix for AIX.
+	* dpxcrypt.c: Use headers as in configure test for uint32_t.
+
 2011-06-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* dpxfile.c (exec_spawn): Do not quote execvp() arguments.
diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in
index 30ba81bad8d..a172349f1d2 100644
--- a/Build/source/texk/dvipdfmx/Makefile.in
+++ b/Build/source/texk/dvipdfmx/Makefile.in
@@ -65,7 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-libs.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
 	$(top_srcdir)/../../m4/ltsugar.m4 \
 	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
+	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
diff --git a/Build/source/texk/dvipdfmx/config.h.in b/Build/source/texk/dvipdfmx/config.h.in
index 04308cf405c..0a7d84f2ff1 100644
--- a/Build/source/texk/dvipdfmx/config.h.in
+++ b/Build/source/texk/dvipdfmx/config.h.in
@@ -244,6 +244,11 @@
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+#undef _UINT32_T
+
 /* Define to 0x200406L if your libkpathsea supports enc formats. */
 #undef __TDS_VERSION__
 
@@ -258,3 +263,7 @@
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint32_t
diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure
index 0e902573f26..d18b2ae8f08 100755
--- a/Build/source/texk/dvipdfmx/configure
+++ b/Build/source/texk/dvipdfmx/configure
@@ -2028,6 +2028,59 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_decl
 
+# ac_fn_c_find_uintX_t LINENO BITS VAR
+# ------------------------------------
+# Finds an unsigned integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_uintX_t ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+$as_echo_n "checking for uint$2_t... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
+	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  case $ac_type in #(
+  uint$2_t) :
+    eval "$3=yes" ;; #(
+  *) :
+    eval "$3=\$ac_type" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       if eval test \"x\$"$3"\" = x"no"; then :
+
+else
+  break
+fi
+     done
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_find_uintX_t
+
 # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
 # --------------------------------------------
 # Tries to find the compile-time value of EXPR in a program that includes
@@ -12700,39 +12753,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -13278,6 +13334,20 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
+ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
+case $ac_cv_c_uint32_t in #(
+  no|yes) ;; #(
+  *)
+
+$as_echo "#define _UINT32_T 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define uint32_t $ac_cv_c_uint32_t
+_ACEOF
+;;
+  esac
+
 
 ac_fn_c_check_decl "$LINENO" "timezone" "ac_cv_have_decl_timezone" "#include <time.h>
 "
diff --git a/Build/source/texk/dvipdfmx/configure.ac b/Build/source/texk/dvipdfmx/configure.ac
index 296d81c4e23..52e0374ca95 100644
--- a/Build/source/texk/dvipdfmx/configure.ac
+++ b/Build/source/texk/dvipdfmx/configure.ac
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([dvipdfmx_version], [20110311])[]dnl using unmodified dvipdfmx source tree
+m4_include([version.ac])[] dnl define dvipdfmx_version
 AC_INIT([dvipdfmx], dvipdfmx_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([dvipdfmx-]dvipdfmx_version[/src/dvipdfmx.c])
@@ -30,6 +30,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 AC_STRUCT_TM
 AC_STRUCT_TIMEZONE
 AC_C_BIGENDIAN
+AC_TYPE_UINT32_T
 
 AC_CHECK_DECL([timezone],
               [AC_DEFINE([HAVE_TIMEZONE], 1,
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
index 837aa9d0cc8..63c9fbefd97 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-02-exec_spawn (new): Bug fix for exec_spawn() from
+	Akira Kakuto  <kakuto@fuk.kindai.ac.jp> and Peter Breitenlohner.
+
+	* patch-03-uint32_t (new): Portability fix (for AIX).
+
 2011-05-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-01-manpage: Adapted to modified extractbb manpage.
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-02-exec_spawn b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-02-exec_spawn
new file mode 100644
index 00000000000..e49c44b0ef4
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-02-exec_spawn
@@ -0,0 +1,129 @@
+diff -ur dvipdfmx-20110311.orig/src/dpxfile.c dvipdfmx-20110311/src/dpxfile.c
+--- dvipdfmx-20110311.orig/src/dpxfile.c	2011-03-11 04:10:51.000000000 +0100
++++ dvipdfmx-20110311/src/dpxfile.c	2011-06-06 09:50:11.000000000 +0200
+@@ -154,10 +154,14 @@
+ {
+   char **cmdv, **qv;
+   char *p, *pp;
+-  char buf[512];
+-  int  i, ret;
++  char buf[1024];
++  int  i, ret = -1;
+ 
+-  if (!cmd || !*cmd)
++  if (!cmd)
++    return -1;
++  while (*cmd == ' ' || *cmd == '\t')
++    cmd++;
++  if (*cmd == '\0')
+     return -1;
+   i = 0;
+   p = cmd;
+@@ -166,19 +170,16 @@
+       i++;
+     p++;
+   }
+-  cmdv = (char **) xmalloc (sizeof (char *) * (i+2));
++  cmdv = xcalloc (i + 2, sizeof (char *));
+   p = cmd;
+   qv = cmdv;
+-  while (*p == ' ' || *p == '\t')
+-    p++;
+   while (*p) {
+     pp = buf;
+     if (*p == '"') {
+       p++;
+       while (*p != '"') {
+         if (*p == '\0') {
+-          free (cmdv);
+-          return -1;
++          goto done;
+         }
+         *pp++ = *p++;
+       }
+@@ -187,40 +188,41 @@
+       p++;
+       while (*p != '\'') {
+         if (*p == '\0') {
+-          free (cmdv);
+-          return -1;
++          goto done;
+         }
+         *pp++ = *p++;
+       }
+       p++;
+     } else {
+-      while (*p != ' ' && *p != '\t' && *p)
+-#ifdef WIN32
++      while (*p != ' ' && *p != '\t' && *p) {
+         if (*p == '\'') {
+-          *pp++ = '\"';
++          p++;
++          while (*p != '\'') {
++             if (*p == '\0') {
++                 goto done;
++             }
++             *pp++ = *p++;
++          }
+           p++;
+         } else {
+           *pp++ = *p++;
+         }
+-#else
+-        *pp++ = *p++;
+-#endif
++      }
+     }
+     *pp = '\0';
+-    if ((pp = strchr (buf, ' ')) || (pp = strchr (buf, '\t'))) {
+ #ifdef WIN32
++    if (strchr (buf, ' ') || strchr (buf, '\t'))
+       *qv = concat3 ("\"", buf, "\"");
+-#else
+-      *qv = concat3 ("'", buf, "'");
++    else
+ #endif
+-    } else {
+-      *qv = concat (buf, "");
+-    }
++      *qv = xstrdup (buf);
++/*
++    fprintf(stderr,"\n%s", *qv);
++*/
+     while (*p == ' ' || *p == '\t')
+       p++;
+     qv++;
+   }
+-  *qv = NULL;
+ #ifdef WIN32
+   ret = spawnvp (_P_WAIT, *cmdv, (const char* const*) cmdv);
+ #else
+@@ -229,7 +231,7 @@
+     ret = -1;
+   else if (i == 0) {
+     if (execvp (*cmdv, cmdv))
+-      ret = -1;
++      _exit (-1);
+   } else {
+     if (wait (&ret) == i) {
+       ret = (WIFEXITED (ret) ? WEXITSTATUS (ret) : -1);
+@@ -238,14 +240,13 @@
+     }
+   }
+ #endif
++done:
+   qv = cmdv;
+-  if (qv) {
+-    while (*qv) {
+-      free (*qv);
+-      qv++;
+-    }
+-    free (cmdv);
++  while (*qv) {
++    free (*qv);
++    qv++;
+   }
++  free (cmdv);
+   return ret;
+ }
+ 
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-03-uint32_t b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-03-uint32_t
new file mode 100644
index 00000000000..0827d040027
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-03-uint32_t
@@ -0,0 +1,32 @@
+diff -ur dvipdfmx-20110311.orig/configure.in dvipdfmx-20110311/configure.in
+--- dvipdfmx-20110311.orig/configure.in	2011-03-11 04:14:28.000000000 +0100
++++ dvipdfmx-20110311/configure.in	2011-07-13 10:10:18.000000000 +0200
+@@ -95,6 +95,7 @@
+ AC_STRUCT_TM
+ AC_STRUCT_TIMEZONE
+ AC_C_BIGENDIAN
++AC_TYPE_UINT32_T
+ 
+ AC_CHECK_SIZEOF(char)
+ AC_CHECK_SIZEOF(short)
+diff -ur dvipdfmx-20110311.orig/src/dpxcrypt.c dvipdfmx-20110311/src/dpxcrypt.c
+--- dvipdfmx-20110311.orig/src/dpxcrypt.c	2011-03-11 04:12:23.000000000 +0100
++++ dvipdfmx-20110311/src/dpxcrypt.c	2011-06-15 19:16:14.000000000 +0200
+@@ -24,8 +24,16 @@
+ #include "config.h"
+ #endif
+ 
+-#include <stdint.h>
++#ifdef HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
+ #include <string.h>
++#ifdef HAVE_INTTYPES_H
++# include <inttypes.h>
++#endif
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
+ 
+ #include "dpxcrypt.h"
+ 
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure.in b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure.in
index 5cf4542d705..6b91ec6c025 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure.in
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/configure.in
@@ -95,6 +95,7 @@ AC_TYPE_SIZE_T
 AC_STRUCT_TM
 AC_STRUCT_TIMEZONE
 AC_C_BIGENDIAN
+AC_TYPE_UINT32_T
 
 AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(short)
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.c b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.c
index 4bad1620485..b58829db9e4 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxcrypt.c
@@ -24,8 +24,16 @@
 #include "config.h"
 #endif
 
-#include <stdint.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #include <string.h>
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 #include "dpxcrypt.h"
 
diff --git a/Build/source/texk/dvipdfmx/version.ac b/Build/source/texk/dvipdfmx/version.ac
new file mode 100644
index 00000000000..8ae01365ae5
--- /dev/null
+++ b/Build/source/texk/dvipdfmx/version.ac
@@ -0,0 +1,11 @@
+dnl
+dnl   Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl   This file is free software; the copyright holder
+dnl   gives unlimited permission to copy and/or distribute it,
+dnl   with or without modifications, as long as this notice is preserved.
+dnl
+dnl --------------------------------------------------------
+dnl
+dnl  m4-include this file to define the current dvipdfmx version
+m4_define([dvipdfmx_version], [20110311])
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 0382766c876..b4b6dc0f170 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -813,8 +813,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12659,39 +12658,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/dvipos/configure b/Build/source/texk/dvipos/configure
index d17e9007cc0..4b354678fba 100755
--- a/Build/source/texk/dvipos/configure
+++ b/Build/source/texk/dvipos/configure
@@ -758,8 +758,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12456,39 +12455,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 9e9e0cd8bf7..7c3f2a03d5c 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,13 @@
+2011-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* afm2tfm.c (openfiles), resident.c (residentfont): Allow
+	find_suffix() to return a const string.
+
+2011-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* protos.h, loadfont.c (pkopen), search.c (pksearch): Declare
+	font name as const.
+
 2011-05-06  Karl Berry  <karl@tug.org>
 
 	* writet1.c: update copyright as in pdftexdir.
diff --git a/Build/source/texk/dvipsk/afm2tfm.c b/Build/source/texk/dvipsk/afm2tfm.c
index 2147e366167..e9ef486151b 100644
--- a/Build/source/texk/dvipsk/afm2tfm.c
+++ b/Build/source/texk/dvipsk/afm2tfm.c
@@ -1567,7 +1567,7 @@ openfiles(int argc, char **argv)
    const char *q;
 #endif
    register int i;
-   char *p;
+   const char *p;
    int arginc;
 
    tfmout = (FILE *)NULL;
@@ -1699,7 +1699,7 @@ default: fprintf(stderr, "Unknown option %s %s ignored.\n", argv[2], argv[3]);
 
 #ifdef KPATHSEA
    if ((p = find_suffix(outname)) != NULL)
-      *(p-1) = 0;
+      outname[p-outname-1] = 0;
    strcat(outname, ".tfm");
    if (tfmout == NULL && (tfmout=fopen(outname, WRITEBIN))==NULL)
       error("! can't open tfm output file");
@@ -1709,7 +1709,7 @@ default: fprintf(stderr, "Unknown option %s %s ignored.\n", argv[2], argv[3]);
  */
    if (p == NULL)
      p = find_suffix(outname);
-   *(p-1) = 0;
+   outname[p-outname-1] = 0;
 
    q = xbasename(outname);
    strcpy(tmpstr, q);        /* be careful, q and outname are overlapping */
diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure
index e324cea278a..fb287974011 100755
--- a/Build/source/texk/dvipsk/configure
+++ b/Build/source/texk/dvipsk/configure
@@ -12634,39 +12634,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/dvipsk/loadfont.c b/Build/source/texk/dvipsk/loadfont.c
index ab1d7fe6c55..dee7f1f2cfc 100644
--- a/Build/source/texk/dvipsk/loadfont.c
+++ b/Build/source/texk/dvipsk/loadfont.c
@@ -109,7 +109,7 @@ static Boolean
 pkopen(register fontdesctype *fd)
 {
    register char *d, *n;
-   char *name_ret;
+   const char *name_ret;
 #ifdef KPATHSEA
    int dpi_ret;
 #else
diff --git a/Build/source/texk/dvipsk/protos.h b/Build/source/texk/dvipsk/protos.h
index 3429da3a3b3..a027b207b4a 100644
--- a/Build/source/texk/dvipsk/protos.h
+++ b/Build/source/texk/dvipsk/protos.h
@@ -194,7 +194,7 @@ extern short scanpage(void);
 /* prototypes for functions from search.c */
 #ifdef KPATHSEA
 extern FILE *search(kpse_file_format_type format, const char *file, const char *mode);
-extern FILE *pksearch(const char *file, const char *mode, halfword dpi, char **name_ret, int *dpi_ret);
+extern FILE *pksearch(const char *file, const char *mode, halfword dpi, const char **name_ret, int *dpi_ret);
 #else /* !KPATSHEA */
 extern FILE *search(char *path, const char *file, const char *mode);
 extern FILE *pksearch(char *path, const char *file, const char *mode, char *n, halfword dpi, halfword vdpi);
diff --git a/Build/source/texk/dvipsk/resident.c b/Build/source/texk/dvipsk/resident.c
index a82a801ed4e..474ef9a7e27 100644
--- a/Build/source/texk/dvipsk/resident.c
+++ b/Build/source/texk/dvipsk/resident.c
@@ -877,7 +877,7 @@ getpsinfo(const char *name)
                      out what to do; couldn't do this above since we
                      want to check the suffix.  */
                   if (hdr_name) {
-                     char *suffix = find_suffix (hdr_name);
+                     const char *suffix = find_suffix (hdr_name);
                      if (encoding_p || STREQ (suffix, "enc")) {
                         /* (SPQR) if it is a reencoding, pass on to
                            FontPart, and download as usual */
diff --git a/Build/source/texk/dvipsk/search.c b/Build/source/texk/dvipsk/search.c
index ec37f8b3e5e..7ef93ba5d36 100644
--- a/Build/source/texk/dvipsk/search.c
+++ b/Build/source/texk/dvipsk/search.c
@@ -195,7 +195,7 @@ search(kpse_file_format_type format, const char *file, const char *mode)
 
 FILE *
 pksearch(const char *file, const char *mode, halfword dpi,
-         char **name_ret, int *dpi_ret)
+         const char **name_ret, int *dpi_ret)
 {
   FILE *ret;
   kpse_glyph_file_type font_file;
diff --git a/Build/source/texk/dvipsk/squeeze/configure b/Build/source/texk/dvipsk/squeeze/configure
index 0d2597f81d1..2f64866be30 100755
--- a/Build/source/texk/dvipsk/squeeze/configure
+++ b/Build/source/texk/dvipsk/squeeze/configure
@@ -3302,39 +3302,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 080de0c6a57..6d9b73b48f3 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -12717,39 +12717,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -16379,26 +16382,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
 if ${kpse_cv_warning_cxxflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GXX" = xyes; then
   kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
-case `$CXX -dumpversion` in #(
+  case `$CXX -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+      fi
     fi
+  fi
 fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
 else
   kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
 fi
diff --git a/Build/source/texk/gsftopk/configure b/Build/source/texk/gsftopk/configure
index 234502cbe93..899faeaafff 100755
--- a/Build/source/texk/gsftopk/configure
+++ b/Build/source/texk/gsftopk/configure
@@ -758,8 +758,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12456,39 +12455,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 4e843fee649..5c5990c95ed 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,20 @@
+2011-07-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* version.ac: New file defining the kpathsea version.
+	Update version number 6.0.1 => 6.0.2dev.
+	* configure.ac: Adapt. Use KPSE_LT_VERSION.
+
+2011-07-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ac/web2c.ac renamed into ac/mktex.ac.
+	* ac/withenable.ac, configure.ac: web2c.ac => mktex.ac.
+	* configure.ac: KPSE_WEB2C_PREPARE => KPSE_MKTEX_PREPARE.
+
+2011-06-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* tex-make.c [WIN32]: Do not #include <kpathsea/win32lib.h>
+	from here (already done from config.h).
+
 2011-06-28  Karl Berry  <karl@tug.org>
 
 	* mktexlsr: need to shift when arg is not a directory.
@@ -7,6 +24,49 @@
 
 	* texmf.cnf (OPENTYPEFONTS): a duplicate entry was created :(.
 
+2011-06-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* progname.c (remove_dots): Correctly handle dir="/foo/../bar".
+	FIXME: What about dir="c:foo/../bar" and dir="c:../bar"?
+
+2011-06-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Reduce memory leaks.
+
+	* types.h (kpse_format_info_type): Declare path as non-const.
+	* tex-file.c (init_path): Free old value of path when assigning
+	a new value.
+
+	* progname.c (kpathsea_selfdir): Free strings no longer used.
+
+	* kpsewhich.c (lookup): Free string no longer used.
+
+2011-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* fontmap.c (kpathsea_fontmap_lookup), kpsewhich.c (find_dpi),
+	progname.c (kpathsea_set_program_name): Allow find_suffix() to
+	return a const string.
+
+	* find-suffix.c, lib.h: Declare find_suffix() as const.
+	* find-suffix.c: Explain that NAME+(find_suffix(NAME)-NAME) is
+	equivalent to find_suffix(NAME) but not necessarily const.
+
+	* progname.c (remove_dots): Somewhat reorganize (initialize
+	ret as `NULL' instead of `(string)""').
+
+2011-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* tex-glyph.c (try_size, try_fontmap, kpathsea_find_glyph),
+	tex-glyph.h (kpse_glyph_file_type): Declare font name as const.
+
+2011-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* xgetcwd.c: Fix #include directives (depend on GETCWD_FORKS).
+	(xgetcwd): The returned string may be long lived, so malloc()
+	only as needed.
+	Do not print path when getcwd(path, size) or getwd(path) fail,
+	the contents is undefined.
+
 2011-06-13  Manuel P\'egour\'e-Gonnard <mpg@elzevir.fr>
 
 	* db.c (match): ensure that we are at a dir separator in
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 71da2d945b2..bfeff0bc299 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -60,15 +60,16 @@ DIST_COMMON = README $(am__configure_deps) $(dist_noinst_DATA) \
 	strcasecmp.c strstr.c strtol.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-lib-version.m4 \
+	$(top_srcdir)/../../m4/kpse-mktex.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
 	$(top_srcdir)/../../m4/ltsugar.m4 \
 	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
-	$(top_srcdir)/ac/web2c.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/mktex.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/Build/source/texk/kpathsea/ac/web2c.ac b/Build/source/texk/kpathsea/ac/mktex.ac
index ccdd5c0a39d..fe8deeb9dbd 100644
--- a/Build/source/texk/kpathsea/ac/web2c.ac
+++ b/Build/source/texk/kpathsea/ac/mktex.ac
@@ -1,7 +1,7 @@
-## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live
+## texk/kpathsea/ac/mktex.ac: configure.ac fragment for the TeX Live
 ## subdirectory texk/kpathsea.
 dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
 ## configure defaults for mktexfmt & Co.
diff --git a/Build/source/texk/kpathsea/ac/withenable.ac b/Build/source/texk/kpathsea/ac/withenable.ac
index a3a2a40c87e..1dfc28533bc 100644
--- a/Build/source/texk/kpathsea/ac/withenable.ac
+++ b/Build/source/texk/kpathsea/ac/withenable.ac
@@ -1,8 +1,8 @@
 ## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 dnl
-dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
 ## configure options and TL libraries required for kpathsea
 KPSE_WITH_TEXLIB([kpathsea])
-m4_include(kpse_TL[texk/kpathsea/ac/web2c.ac])
+m4_include(kpse_TL[texk/kpathsea/ac/mktex.ac])
diff --git a/Build/source/texk/kpathsea/aclocal.m4 b/Build/source/texk/kpathsea/aclocal.m4
index 4b100918b2c..244fd62f7ed 100644
--- a/Build/source/texk/kpathsea/aclocal.m4
+++ b/Build/source/texk/kpathsea/aclocal.m4
@@ -990,8 +990,9 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([../../m4/kpse-common.m4])
+m4_include([../../m4/kpse-lib-version.m4])
+m4_include([../../m4/kpse-mktex.m4])
 m4_include([../../m4/kpse-warnings.m4])
-m4_include([../../m4/kpse-web2c.m4])
 m4_include([../../m4/kpse-win32.m4])
 m4_include([../../m4/libtool.m4])
 m4_include([../../m4/ltoptions.m4])
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index bfccd3b0ca6..07e7a6a6db0 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Kpathsea 6.0.1.
+# Generated by GNU Autoconf 2.68 for Kpathsea 6.0.2dev.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Kpathsea'
 PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.0.1'
-PACKAGE_STRING='Kpathsea 6.0.1'
+PACKAGE_VERSION='6.0.2dev'
+PACKAGE_STRING='Kpathsea 6.0.2dev'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1308,7 +1308,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 Kpathsea 6.0.1 to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.0.2dev to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1378,7 +1378,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Kpathsea 6.0.1:";;
+     short | recursive ) echo "Configuration of Kpathsea 6.0.2dev:";;
    esac
   cat <<\_ACEOF
 
@@ -1494,7 +1494,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Kpathsea configure 6.0.1
+Kpathsea configure 6.0.2dev
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2020,7 +2020,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 Kpathsea $as_me 6.0.1, which was
+It was created by Kpathsea $as_me 6.0.2dev, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2401,11 +2401,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-KPSEVERSION=6.0.1
+KPSEVERSION=6.0.2dev
 
-$as_echo "#define KPSEVERSION \"kpathsea version 6.0.1\"" >>confdefs.h
+$as_echo "#define KPSEVERSION \"kpathsea version 6.0.2dev\"" >>confdefs.h
 
-KPSE_LT_VERSINFO=6:1:0
+
+KPSE_LT_VERSINFO=6:2:0
 
 
 am__api_version='1.11'
@@ -7380,7 +7381,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='kpathsea'
- VERSION='6.0.1'
+ VERSION='6.0.2dev'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12518,39 +12519,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -12566,81 +12570,45 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 
 
-## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live
+## texk/kpathsea/ac/mktex.ac: configure.ac fragment for the TeX Live
 ## subdirectory texk/kpathsea.
 ## configure defaults for mktexfmt & Co.
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then :
   enableval=$enable_mktexmf_default;
 fi
-case $enable_mktexmf_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexmf_default=yes ;;
-esac
 # Check whether --enable-mktexpk-default was given.
 if test "${enable_mktexpk_default+set}" = set; then :
   enableval=$enable_mktexpk_default;
 fi
-case $enable_mktexpk_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexpk_default=yes ;;
-esac
 # Check whether --enable-mktextfm-default was given.
 if test "${enable_mktextfm_default+set}" = set; then :
   enableval=$enable_mktextfm_default;
 fi
-case $enable_mktextfm_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktextfm_default=yes ;;
-esac
 # Check whether --enable-mkocp-default was given.
 if test "${enable_mkocp_default+set}" = set; then :
   enableval=$enable_mkocp_default;
 fi
-case $enable_mkocp_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mkocp_default=yes ;;
-esac
 # Check whether --enable-mkofm-default was given.
 if test "${enable_mkofm_default+set}" = set; then :
   enableval=$enable_mkofm_default;
 fi
-case $enable_mkofm_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mkofm_default=yes ;;
-esac
 # Check whether --enable-mktexfmt-default was given.
 if test "${enable_mktexfmt_default+set}" = set; then :
   enableval=$enable_mktexfmt_default;
 fi
-case $enable_mktexfmt_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexfmt_default=yes ;;
-esac
 # Check whether --enable-mktextex-default was given.
 if test "${enable_mktextex_default+set}" = set; then :
   enableval=$enable_mktextex_default;
 fi
-case $enable_mktextex_default in #(
-  yes|no) :
+
+
+case $enable_mktexmf_default in #(
+  yes | no) :
      ;; #(
   *) :
-    enable_mktextex_default=no ;;
+    enable_mktexmf_default=yes ;;
 esac
-
-
 if test "x$enable_mktexmf_default" = xyes; then :
 
 $as_echo "#define MAKE_TEX_MF_BY_DEFAULT 1" >>confdefs.h
@@ -12649,6 +12617,12 @@ else
   $as_echo "#define MAKE_TEX_MF_BY_DEFAULT 0" >>confdefs.h
 
 fi
+case $enable_mktexpk_default in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mktexpk_default=yes ;;
+esac
 if test "x$enable_mktexpk_default" = xyes; then :
 
 $as_echo "#define MAKE_TEX_PK_BY_DEFAULT 1" >>confdefs.h
@@ -12657,6 +12631,12 @@ else
   $as_echo "#define MAKE_TEX_PK_BY_DEFAULT 0" >>confdefs.h
 
 fi
+case $enable_mktextfm_default in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mktextfm_default=yes ;;
+esac
 if test "x$enable_mktextfm_default" = xyes; then :
 
 $as_echo "#define MAKE_TEX_TFM_BY_DEFAULT 1" >>confdefs.h
@@ -12665,6 +12645,12 @@ else
   $as_echo "#define MAKE_TEX_TFM_BY_DEFAULT 0" >>confdefs.h
 
 fi
+case $enable_mkocp_default in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mkocp_default=yes ;;
+esac
 if test "x$enable_mkocp_default" = xyes; then :
 
 $as_echo "#define MAKE_OMEGA_OCP_BY_DEFAULT 1" >>confdefs.h
@@ -12673,6 +12659,12 @@ else
   $as_echo "#define MAKE_OMEGA_OCP_BY_DEFAULT 0" >>confdefs.h
 
 fi
+case $enable_mkofm_default in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mkofm_default=yes ;;
+esac
 if test "x$enable_mkofm_default" = xyes; then :
 
 $as_echo "#define MAKE_OMEGA_OFM_BY_DEFAULT 1" >>confdefs.h
@@ -12681,6 +12673,12 @@ else
   $as_echo "#define MAKE_OMEGA_OFM_BY_DEFAULT 0" >>confdefs.h
 
 fi
+case $enable_mktexfmt_default in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mktexfmt_default=yes ;;
+esac
 if test "x$enable_mktexfmt_default" = xyes; then :
 
 $as_echo "#define MAKE_TEX_FMT_BY_DEFAULT 1" >>confdefs.h
@@ -12689,6 +12687,12 @@ else
   $as_echo "#define MAKE_TEX_FMT_BY_DEFAULT 0" >>confdefs.h
 
 fi
+case $enable_mktextex_default in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_mktextex_default=no ;;
+esac
 if test "x$enable_mktextex_default" = xyes; then :
 
 $as_echo "#define MAKE_TEX_TEX_BY_DEFAULT 1" >>confdefs.h
@@ -13481,7 +13485,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 Kpathsea $as_me 6.0.1, which was
+This file was extended by Kpathsea $as_me 6.0.2dev, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13547,7 +13551,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="\\
-Kpathsea config.status 6.0.1
+Kpathsea config.status 6.0.2dev
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac
index df14e5abc9b..85d150031fa 100644
--- a/Build/source/texk/kpathsea/configure.ac
+++ b/Build/source/texk/kpathsea/configure.ac
@@ -1,32 +1,13 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
-dnl --------------------------------------------------------
-dnl Keep Kpathsea shared and package library versions the same:
-dnl   Only bug fixes:
-dnl     kpse_lib_micro += 1;
-dnl   Adding new interfaces (backwards compatible)
-dnl     kpse_lib_minor += 1;
-dnl     kpse_lib_micro = 0;
-dnl   Modifying or revoking interfaces (not backwards compatible)
-dnl     kpse_lib_major += 1;
-dnl     kpse_lib_minor = 0;
-dnl     kpse_lib_micro = 0;
 dnl
-dnl   After a release, set kpse_lib_dev to "dev", to distinguish
-dnl   binaries built between releases.
-
-m4_define([kpse_lib_major], [6])[]dnl
-m4_define([kpse_lib_minor], [0])[]dnl
-m4_define([kpse_lib_micro], [1])[]dnl
-m4_define([kpse_lib_devel], [])[]dnl empty or "dev"
-m4_define([kpse_version], [kpse_lib_major.kpse_lib_minor.kpse_lib_micro[]kpse_lib_devel])[]dnl
-
-AC_INIT([Kpathsea], [kpse_version], [tex-k@tug.org])
+m4_include([version.ac])[] dnl define kpse_version
+AC_INIT([Kpathsea], kpse_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([pathsearch.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
@@ -34,13 +15,13 @@ AC_CONFIG_MACRO_DIR([../../m4])
 
 AC_SUBST([KPSEVERSION], [kpse_version])
 AC_DEFINE([KPSEVERSION], ["kpathsea version kpse_version"])
-AC_SUBST([KPSE_LT_VERSINFO], [m4_eval(kpse_lib_major+kpse_lib_minor):kpse_lib_micro:kpse_lib_minor])
+KPSE_LT_VERSION([kpse])
 
 dnl Common code for all programs using libkpathsea.
 KPSE_COMMON([kpathsea])
 dnl Include additional code for kpathsea.
-KPSE_WEB2C_PREPARE
-m4_sinclude([ac/web2c.ac])
+KPSE_MKTEX_PREPARE
+m4_sinclude([ac/mktex.ac])
 
 dnl Generate MAKE_TEX_*_BY_DEFAULT and MAKE_OMEGA_*_BY_DEFAULT defines.
 m4_foreach([Kpse_Mktex], [kpse_mktex_opts],
diff --git a/Build/source/texk/kpathsea/doc/Makefile.in b/Build/source/texk/kpathsea/doc/Makefile.in
index 08c6e3179b5..92fd673df51 100644
--- a/Build/source/texk/kpathsea/doc/Makefile.in
+++ b/Build/source/texk/kpathsea/doc/Makefile.in
@@ -38,15 +38,16 @@ DIST_COMMON = $(kpathsea_TEXINFOS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-lib-version.m4 \
+	$(top_srcdir)/../../m4/kpse-mktex.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
 	$(top_srcdir)/../../m4/ltsugar.m4 \
 	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
-	$(top_srcdir)/ac/web2c.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/mktex.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/texk/kpathsea/find-suffix.c b/Build/source/texk/kpathsea/find-suffix.c
index 6fbb1f28c6b..107e1917de0 100644
--- a/Build/source/texk/kpathsea/find-suffix.c
+++ b/Build/source/texk/kpathsea/find-suffix.c
@@ -23,11 +23,23 @@
 /* Return pointer to first character after `.' in last directory element
    of NAME.  If the name is `foo' or `/foo.bar/baz', we have no extension.  */
 
-string
+/* The the result of strrchr(NAME, '.'), when not NULL, is a non-const
+   pointer into the string NAME.  However, this is cheating (motivated
+   by limitations of the C language) when the argument NAME is a
+   const string, because in that case the (technically non-const) result
+   from strrchr() is certainly not modifiable.
+
+   We do not want to repeat this kind of cheating for find_suffix() and
+   therefore declare find_suffix(NAME) as const.  When find_suffix(NAME)
+   is non-NULL and the argument NAME is modifiable (i.e., non-const)
+   then NAME+(find_suffix(NAME)-NAME) is an equivalent modifiable string
+   and the pointer arithmetic is optimized away by modern compilers.  */
+
+const_string
 find_suffix (const_string name)
 {
   const_string slash_pos;
-  string dot_pos = strrchr (name, '.');
+  const_string dot_pos = strrchr (name, '.');
 
   if (dot_pos == NULL)
     return NULL;
diff --git a/Build/source/texk/kpathsea/fontmap.c b/Build/source/texk/kpathsea/fontmap.c
index 2ed383d519e..73c7227b593 100644
--- a/Build/source/texk/kpathsea/fontmap.c
+++ b/Build/source/texk/kpathsea/fontmap.c
@@ -172,7 +172,7 @@ const_string *
 kpathsea_fontmap_lookup (kpathsea kpse, const_string key)
 {
   const_string *ret;
-  string suffix = find_suffix (key);
+  const_string suffix = find_suffix (key);
 
   if (kpse->map.size == 0) {
     read_all_maps (kpse);
diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c
index 7746bd7058d..7c453bc8eb0 100644
--- a/Build/source/texk/kpathsea/kpsewhich.c
+++ b/Build/source/texk/kpathsea/kpsewhich.c
@@ -129,7 +129,7 @@ static unsigned
 find_dpi (string s)
 {
   unsigned dpi_number = 0;
-  string extension = find_suffix (s);
+  const_string extension = find_suffix (s);
 
   if (extension != NULL)
     sscanf (extension, "%u", &dpi_number);
@@ -342,12 +342,15 @@ lookup (kpathsea kpse, string name)
       case kpse_any_glyph_format:
         {
           kpse_glyph_file_type glyph_ret;
+          string temp = remove_suffix (name);
           /* Try to extract the resolution from the name.  */
           unsigned local_dpi = find_dpi (name);
           if (!local_dpi)
             local_dpi = dpi;
-          ret = kpathsea_find_glyph (kpse, remove_suffix (name),
+          ret = kpathsea_find_glyph (kpse, temp,
                                      local_dpi, fmt, &glyph_ret);
+          if (temp != name)
+            free (temp);
         }
         break;
 
diff --git a/Build/source/texk/kpathsea/lib.h b/Build/source/texk/kpathsea/lib.h
index d4ded1e55fe..23ef34e3147 100644
--- a/Build/source/texk/kpathsea/lib.h
+++ b/Build/source/texk/kpathsea/lib.h
@@ -152,7 +152,7 @@ extern string strstr (const_string haystack, const_string needle);
 
 /* If NAME has a suffix, return a pointer to its first character (i.e.,
    the one after the `.'); otherwise, return NULL.  */
-extern KPSEDLL string find_suffix (const_string name);
+extern KPSEDLL const_string find_suffix (const_string name);
 
 /* Return NAME with any suffix removed.  */
 extern KPSEDLL string remove_suffix (const_string name);
diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in
index 7a14ae6e4d1..f744c256fe5 100644
--- a/Build/source/texk/kpathsea/man/Makefile.in
+++ b/Build/source/texk/kpathsea/man/Makefile.in
@@ -38,15 +38,16 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-lib-version.m4 \
+	$(top_srcdir)/../../m4/kpse-mktex.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
 	$(top_srcdir)/../../m4/ltsugar.m4 \
 	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
-	$(top_srcdir)/ac/web2c.ac $(top_srcdir)/configure.ac
+	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
+	$(top_srcdir)/ac/mktex.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/texk/kpathsea/progname.c b/Build/source/texk/kpathsea/progname.c
index b86e1348690..debae9e205e 100644
--- a/Build/source/texk/kpathsea/progname.c
+++ b/Build/source/texk/kpathsea/progname.c
@@ -270,33 +270,30 @@ remove_dots (kpathsea kpse, string dir)
 #else
   string c;
   unsigned len;
-  string ret = (string) ""; /* We always reassign.  */
+  string ret = NULL;
 
   for (c = kpathsea_filename_component (kpse, dir); c;
        c = kpathsea_filename_component (kpse, NULL)) {
     if (STREQ (c, ".")) {
       /* If leading ., replace with cwd.  Else ignore.  */
-      if (*ret == 0) {
+      if (!ret) {
         ret = xgetcwd ();
       }
 
     } else if (STREQ (c, "..")) {
       /* If leading .., start with xdirname (cwd).  Else remove last
          component from ret, if any.  */
-      if (*ret == 0) {
+      if (!ret) {
         string dot = xgetcwd ();
         ret = xdirname (dot);
         free (dot);
       } else {
         unsigned last;
-        for (last = strlen (ret);
-             last > (NAME_BEGINS_WITH_DEVICE (ret) ? 2 : 0);
-             last--) {
-          if (IS_DIR_SEP (ret[last - 1])) {
+        string p = NAME_BEGINS_WITH_DEVICE (ret) ? ret + 2 : ret;
+        for (last = strlen (p); last > 0; last--) {
+          if (IS_DIR_SEP (p[last - 1])) {
             /* If we have `/../', that's the same as `/'.  */
-            if (last > 1) {
-              ret[last - 1] = 0;
-            }
+            p[(last - 1 ? last - 1 : 1)] = 0;
             break;
           }
         }
@@ -306,17 +303,17 @@ remove_dots (kpathsea kpse, string dir)
       /* Not . or ..; just append.  Include a directory separator unless
          our string already ends with one.  This also changes all directory
          separators into the canonical DIR_SEP_STRING.  */
-      string temp;
-      len = strlen (ret);
-      temp = concat3 (ret, ((len > 0 && ret[len - 1] == DIR_SEP)
-                            || (NAME_BEGINS_WITH_DEVICE (c) && *ret == 0))
-                           ? "" : DIR_SEP_STRING,
-                      c);
-      if (*ret)
-        free (ret);
-      ret = temp;
+      if (!ret) {
+        ret = concat (NAME_BEGINS_WITH_DEVICE (c) ? "" : DIR_SEP_STRING, c);
+      } else {
+        string temp = ret;
+        len = strlen (ret);
+        ret = concat3 (ret, ret[len - 1] == DIR_SEP ? "" : DIR_SEP_STRING, c);
+        free (temp);
+      }
     }
   }
+  assert (ret);
 
   /* Remove a trailing /, just in case it snuck in.  */
   len = strlen (ret);
@@ -336,6 +333,7 @@ kpathsea_selfdir (kpathsea kpse, const_string argv0)
 {
   string ret = NULL;
   string self = NULL;
+  string name;
 
   if (kpathsea_absolute_p (kpse, argv0, true)) {
     self = xstrdup (argv0);
@@ -369,8 +367,6 @@ kpathsea_selfdir (kpathsea kpse, const_string argv0)
        want to search any ls-R's or do anything special with //'s.  */
     for (elt = kpathsea_path_element (kpse, getenv ("PATH")); !self && elt;
          elt = kpathsea_path_element (kpse, NULL)) {
-      string name;
-
       /* UNIX tradition interprets the empty path element as "." */
       if (*elt == 0) elt = ".";
 
@@ -383,11 +379,12 @@ kpathsea_selfdir (kpathsea kpse, const_string argv0)
          only executable by some classes and not others.  See the
          `file_status' function in execute_cmd.c in bash for what's
          necessary if we were to do it right.  */
-      if (stat (name, &s) == 0 && s.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) {
-        /* Do not stop at directories. */
-        if (!S_ISDIR(s.st_mode))
-          self = name;
-      }
+      if (stat (name, &s) == 0 && s.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)
+                               /* Do not stop at directories. */
+                               && !S_ISDIR(s.st_mode))
+        self = name;
+      else
+        free (name);
     }
 #endif /* not AMIGA */
   }
@@ -396,9 +393,15 @@ kpathsea_selfdir (kpathsea kpse, const_string argv0)
   if (!self)
     self = concat3 (".", DIR_SEP_STRING, argv0);
 
-  ret = xdirname (remove_dots (kpse, expand_symlinks (kpse, self)));
+  name = remove_dots (kpse, expand_symlinks (kpse, self));
 
+#ifndef AMIGA
   free (self);
+#endif
+
+  ret = xdirname (name);
+
+  free (name);
 
   return ret;
 }
@@ -470,7 +473,8 @@ void
 kpathsea_set_program_name (kpathsea kpse,  const_string argv0,
                            const_string progname)
 {
-  string ext, sdir, sdir_parent, sdir_grandparent;
+  const_string ext;
+  string sdir, sdir_parent, sdir_grandparent;
   string s = getenv ("KPATHSEA_DEBUG");
 #ifdef WIN32
   string debug_output = getenv("KPATHSEA_DEBUG_OUTPUT");
diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c
index 0dd86a603fc..da1af2ee47d 100644
--- a/Build/source/texk/kpathsea/tex-file.c
+++ b/Build/source/texk/kpathsea/tex-file.c
@@ -1,6 +1,6 @@
 /* tex-file.c: high-level file searching by format.
 
-   Copyright 1993, 1994, 1995, 1996, 1997, 2007, 2008, 2009, 2010 Karl Berry.
+   Copyright 1993, 1994, 1995, 1996, 1997, 2007, 2008, 2009, 2010, 2011 Karl Berry.
    Copyright 1998-2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -223,7 +223,9 @@ kpse_maketex_option (const_string fmtname,  boolean value)
 #define EXPAND_DEFAULT(try_path, source_string)                 \
   if (try_path) {                                               \
     info->raw_path = try_path;                                  \
+    tmp = info->path;                                           \
     info->path = kpathsea_expand_default (kpse, try_path, info->path);  \
+    free (tmp);                                                 \
     info->path_source = source_string;                          \
   }
 
@@ -240,6 +242,7 @@ init_path (kpathsea kpse, kpse_format_info_type *info,
   string env_name;
   string env_value = NULL;
   string var = NULL;
+  string tmp;
   va_list ap;
 
   info->default_path = default_path;
@@ -291,7 +294,8 @@ init_path (kpathsea kpse, kpse_format_info_type *info,
      bottom are guaranteed to exist.  */
 
   /* Assume we can reliably start with the compile-time default.  */
-  info->path = info->raw_path = info->default_path;
+  info->raw_path = info->default_path;
+  info->path = xstrdup (info->raw_path);
   info->path_source = "compile-time paths.h";
 
   EXPAND_DEFAULT (info->cnf_path, "texmf.cnf");
@@ -313,7 +317,9 @@ init_path (kpathsea kpse, kpse_format_info_type *info,
   }
 
   EXPAND_DEFAULT (info->override_path, "application override variable");
+  tmp = info->path;
   info->path = kpathsea_brace_expand (kpse, info->path);
+  free (tmp);
 }
 
 
@@ -1391,10 +1397,10 @@ kpathsea_reset_program_name (kpathsea kpse, const_string progname)
        to 100k if this function is called. */
     if (i == kpse_cnf_format || i == kpse_db_format)
       continue;
-    /* Wipe the path (it is tested) and the cnf_path and because their
+    /* Wipe the path (it is tested) and the cnf_path because their
        values may differ with the new program name.  */
     if (kpse->format_info[i].path != NULL) {
-      free ((string)kpse->format_info[i].path);
+      free (kpse->format_info[i].path);
       kpse->format_info[i].path = NULL;
     }
     /* We cannot free the cnf_path: it points into the cnf hash, which
diff --git a/Build/source/texk/kpathsea/tex-glyph.c b/Build/source/texk/kpathsea/tex-glyph.c
index b3b9174a50b..f4ca45939dc 100644
--- a/Build/source/texk/kpathsea/tex-glyph.c
+++ b/Build/source/texk/kpathsea/tex-glyph.c
@@ -1,6 +1,6 @@
 /* tex-glyph.c: search for GF/PK files.
 
-   Copyright 1993, 1994, 1995, 1996, 2008, 2009 Karl Berry.
+   Copyright 1993, 1994, 1995, 1996, 2008, 2009, 2011 Karl Berry.
    Copyright 1997, 1998, 1999, 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -101,8 +101,8 @@ try_size (kpathsea kpse, const_string fontname,  unsigned dpi,
     }
 
   if (ret != NULL && glyph_file)
-    { /* Success.  Fill in the return info.  Discard const.  */
-      glyph_file->name = (string) fontname;
+    { /* Success.  Fill in the return info.  */
+      glyph_file->name = fontname;
       glyph_file->dpi = dpi;
       glyph_file->format = format_found;
     }
@@ -145,12 +145,12 @@ try_resolution (kpathsea kpse, const_string fontname,  unsigned dpi,
    mktexpk to only deal with real names.)  */
 
 static string
-try_fontmap (kpathsea kpse, string *fontname_ptr,  unsigned dpi,
+try_fontmap (kpathsea kpse, const_string *fontname_ptr,  unsigned dpi,
              kpse_file_format_type format,
              kpse_glyph_file_type *glyph_file)
 {
   const_string *mapped_names;
-  string fontname = *fontname_ptr;
+  const_string fontname = *fontname_ptr;
   string ret = NULL;
 
   mapped_names = kpathsea_fontmap_lookup (kpse, fontname);
@@ -255,7 +255,7 @@ kpathsea_find_glyph (kpathsea kpse,
 {
   string ret;
   kpse_glyph_source_type source;
-  string fontname = (string) passed_fontname; /* discard const */
+  const_string fontname = passed_fontname;
 
   /* Start the search: try the name we're given.  */
   source = kpse_glyph_source_normal;
diff --git a/Build/source/texk/kpathsea/tex-glyph.h b/Build/source/texk/kpathsea/tex-glyph.h
index 971749c1ca4..f2a8c67f7f4 100644
--- a/Build/source/texk/kpathsea/tex-glyph.h
+++ b/Build/source/texk/kpathsea/tex-glyph.h
@@ -1,6 +1,6 @@
 /* tex-glyph.h: look for a TeX glyph font (GF or PK).
 
-   Copyright 1993, 2008, 2009 Karl Berry.
+   Copyright 1993, 2008, 2009, 2011 Karl Berry.
    Copyright 1999, 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ typedef enum
 
 typedef struct
 {
-  string name;                  /* font name found */
+  const_string name;            /* font name found */
   unsigned dpi;                 /* size found, for glyphs */
   kpse_file_format_type format; /* glyph format found */
   kpse_glyph_source_type source;        /* where we found it */
diff --git a/Build/source/texk/kpathsea/tex-make.c b/Build/source/texk/kpathsea/tex-make.c
index 16918f8c36a..e54a0d4a368 100644
--- a/Build/source/texk/kpathsea/tex-make.c
+++ b/Build/source/texk/kpathsea/tex-make.c
@@ -1,6 +1,6 @@
 /* tex-make.c: run external programs to make TeX-related files.
 
-   Copyright 1993, 1994, 1995, 1996, 1997, 2008, 2009, 2010 Karl Berry.
+   Copyright 1993, 1994, 1995, 1996, 1997, 2008, 2009, 2010, 2011 Karl Berry.
    Copyright 1997, 1998, 2001-05 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -26,9 +26,6 @@
 #include <kpathsea/readable.h>
 #include <kpathsea/tex-make.h>
 #include <kpathsea/variable.h>
-#if defined(WIN32) && !defined(__MINGW32__)
-#include <kpathsea/win32lib.h>
-#endif
 
 #if !defined (AMIGA) && !(defined (MSDOS) && !defined(__DJGPP__)) && !defined (WIN32)
 #include <sys/wait.h>
diff --git a/Build/source/texk/kpathsea/types.h b/Build/source/texk/kpathsea/types.h
index f6ac30b1444..aa8ef089320 100644
--- a/Build/source/texk/kpathsea/types.h
+++ b/Build/source/texk/kpathsea/types.h
@@ -1,6 +1,6 @@
 /* types.h: general types for kpathsea.
 
-   Copyright 1993, 1995, 1996, 2005, 2008, 2009, 2010 Karl Berry.
+   Copyright 1993, 1995, 1996, 2005, 2008, 2009, 2010, 2011 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -169,7 +169,7 @@ typedef enum
 typedef struct
 {
   const_string type;            /* Human-readable description.  */
-  const_string path;            /* The search path to use.  */
+  string path;                  /* The search path to use.  */
   const_string raw_path;        /* Pre-$~ (but post-default) expansion.  */
   const_string path_source;     /* Where the path started from.  */
   const_string override_path;   /* From client environment variable.  */
diff --git a/Build/source/texk/kpathsea/version.ac b/Build/source/texk/kpathsea/version.ac
new file mode 100644
index 00000000000..57449a852ad
--- /dev/null
+++ b/Build/source/texk/kpathsea/version.ac
@@ -0,0 +1,24 @@
+dnl
+dnl   Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl   This file is free software; the copyright holder
+dnl   gives unlimited permission to copy and/or distribute it,
+dnl   with or without modifications, as long as this notice is preserved.
+dnl
+dnl --------------------------------------------------------
+dnl Keep Kpathsea package and shared library versions the same:
+dnl   Only bug fixes:
+dnl     a.b.c => a.b.c+1
+dnl   Adding new interfaces (backwards compatible)
+dnl     a.b.c => a.b+1.0
+dnl   Modifying or revoking interfaces (not backwards compatible)
+dnl     a.b.c => a+1.b.c
+dnl     kpse_lib_minor = 0;
+dnl     kpse_lib_micro = 0;
+dnl
+dnl   After a release:
+dnl     append "dev", to distinguish binaries built between releases.
+dnl --------------------------------------------------------
+dnl
+dnl  m4-include this file to define the current kpathsea version
+m4_define([kpse_version], [6.0.2dev])
diff --git a/Build/source/texk/kpathsea/xgetcwd.c b/Build/source/texk/kpathsea/xgetcwd.c
index 905775d0fa1..bde9102d845 100644
--- a/Build/source/texk/kpathsea/xgetcwd.c
+++ b/Build/source/texk/kpathsea/xgetcwd.c
@@ -1,6 +1,6 @@
 /* xgetcwd.c: a from-scratch version of getwd.  Ideas from tcsh 5.20 source.
 
-   Copyright 1992, 1994, 1996, 2008 Karl Berry.
+   Copyright 1992, 1994, 1996, 2008, 2011 Karl Berry.
    Copyright 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -18,9 +18,9 @@
 
 #include <kpathsea/config.h>
 
-#if defined (HAVE_GETCWD) || defined (HAVE_GETWD)
+#if (defined (HAVE_GETCWD) && !defined (GETCWD_FORKS)) || defined (HAVE_GETWD)
 #include <kpathsea/c-pathmx.h>
-#else /* not HAVE_GETCWD && not HAVE_GETWD*/
+#else /* (not HAVE_GETCWD || GETCWD_FORKS) && not HAVE_GETWD */
 #include <kpathsea/c-dir.h>
 #include <kpathsea/xopendir.h>
 #include <kpathsea/xstat.h>
@@ -33,7 +33,7 @@ xchdir (string dirname)
         _PERROR(dirname);
 }
 
-#endif /* not HAVE_GETCWD && not HAVE_GETWD */
+#endif /* (not HAVE_GETCWD || GETCWD_FORKS) && not HAVE_GETWD */
 
 
 /* Return the pathname of the current directory, or give a fatal error.  */
@@ -48,24 +48,22 @@ xgetcwd (void)
        is not detected by configure, let me know.
                                        -- Olaf Weber <infovore@xs4all.nl */
 #if defined (HAVE_GETCWD) && !defined (GETCWD_FORKS)
-    string path = (string)xmalloc(PATH_MAX + 1);
+    char path[PATH_MAX + 1];
 
-    if (getcwd (path, PATH_MAX + 1) == 0) {
-        fprintf(stderr, "getcwd: %s", path);
-        exit(EXIT_FAILURE);
+    if (getcwd (path, PATH_MAX + 1) == NULL) {
+        FATAL_PERROR ("getcwd");
     }
 
-    return path;
+    return xstrdup (path);
 #elif defined (HAVE_GETWD)
-    string path = (string)xmalloc(PATH_MAX + 1);
+    char path[PATH_MAX + 1];
 
-    if (getwd (path) == 0) {
-        fprintf(stderr, "getwd: %s", path);
-        exit(EXIT_FAILURE);
+    if (getwd (path) == NULL) {
+        FATAL_PERROR ("getwd");
     }
 
-    return path;
-#else /* not HAVE_GETCWD && not HAVE_GETWD */
+    return xstrdup (path);
+#else /* (not HAVE_GETCWD || GETCWD_FORKS) && not HAVE_GETWD */
     struct stat root_stat, cwd_stat;
     string cwd_path = (string)xmalloc(2); /* In case we assign "/" below.  */
 
@@ -143,5 +141,5 @@ xgetcwd (void)
 #endif
 
     return cwd_path;
-#endif /* not HAVE_GETCWD && not HAVE_GETWD */
+#endif /* (not HAVE_GETCWD || GETCWD_FORKS) && not HAVE_GETWD */
 }
diff --git a/Build/source/texk/lacheck/configure b/Build/source/texk/lacheck/configure
index b5c8546f6f1..80012cd9e8e 100755
--- a/Build/source/texk/lacheck/configure
+++ b/Build/source/texk/lacheck/configure
@@ -755,8 +755,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12451,39 +12450,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index a2b2a1ce455..1a2bd926865 100755
--- a/Build/source/texk/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -12951,39 +12951,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -16594,26 +16597,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
 if ${kpse_cv_warning_cxxflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GXX" = xyes; then
   kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
-case `$CXX -dumpversion` in #(
+  case `$CXX -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+      fi
     fi
+  fi
 fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
 else
   kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
 fi
diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure
index 5847388b837..e99d4706483 100755
--- a/Build/source/texk/makeindexk/configure
+++ b/Build/source/texk/makeindexk/configure
@@ -12448,39 +12448,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -12501,7 +12504,7 @@ ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
 
 
 
-$as_echo "#define TEX_LIVE_VERSION \"2011\"" >>confdefs.h
+$as_echo "#define TEX_LIVE_VERSION \"2012/dev\"" >>confdefs.h
 
 
 for ac_header in ctype.h types.h locale.h
diff --git a/Build/source/texk/makejvf/configure b/Build/source/texk/makejvf/configure
index 5d3181151bf..99ad7c43668 100755
--- a/Build/source/texk/makejvf/configure
+++ b/Build/source/texk/makejvf/configure
@@ -762,8 +762,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12452,39 +12451,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/mendexk/configure b/Build/source/texk/mendexk/configure
index 084bf0413dc..d194b9392a5 100755
--- a/Build/source/texk/mendexk/configure
+++ b/Build/source/texk/mendexk/configure
@@ -12451,39 +12451,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog
index 3b590e8e3b8..2d52629781f 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pkm/ChangeLog
@@ -1,3 +1,19 @@
+2011-07-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* type1.c [FABS, CEIL, FLOOR]: Use routines from libm, the
+	evaluation order of tmpx in the original macros is undefined
+	by the C-standard!
+	(ComputeStem): Fix `ambiguous else' bug (also present in t1lib
+	5.1.2, compare libXfont 1.3.x from XOrg-7.4).
+
+2011-07-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* type1.c (PSFakePop): Non-void function should return a value.
+	Reported by Jack Howarth <howarth@bromo.med.uc.edu>
+	Patch from Akira, [tex-live] Sun, 17 Jul 2011 22:39:30.
+
+	* Makefile.am (AM_CFLAGS): Prepare for compiler warnings.
+
 2011-05-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* README: Fixed a typo.
diff --git a/Build/source/texk/ps2pkm/Makefile.am b/Build/source/texk/ps2pkm/Makefile.am
index e4c04941895..bc8d5da2cf6 100644
--- a/Build/source/texk/ps2pkm/Makefile.am
+++ b/Build/source/texk/ps2pkm/Makefile.am
@@ -1,12 +1,13 @@
 ## Makefile.am for the TeX Live subdirectory texk/ps2pkm/
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
 INCLUDES = $(KPATHSEA_INCLUDES)
 AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CFLAGS = #$(WARNING_CFLAGS)
 
 bin_PROGRAMS = mag pfb2pfa pk2bm ps2pk
 
diff --git a/Build/source/texk/ps2pkm/Makefile.in b/Build/source/texk/ps2pkm/Makefile.in
index fe99d4bf2bc..b29ae63f07c 100644
--- a/Build/source/texk/ps2pkm/Makefile.in
+++ b/Build/source/texk/ps2pkm/Makefile.in
@@ -271,6 +271,7 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 INCLUDES = $(KPATHSEA_INCLUDES)
 AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CFLAGS = #$(WARNING_CFLAGS)
 mag_SOURCES = \
 	basics.c \
 	basics.h \
diff --git a/Build/source/texk/ps2pkm/configure b/Build/source/texk/ps2pkm/configure
index a8ced9b6342..0c58dbb7928 100755
--- a/Build/source/texk/ps2pkm/configure
+++ b/Build/source/texk/ps2pkm/configure
@@ -758,8 +758,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12447,39 +12446,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/ps2pkm/type1.c b/Build/source/texk/ps2pkm/type1.c
index 409ff2dcb54..fbab1aee7bf 100644
--- a/Build/source/texk/ps2pkm/type1.c
+++ b/Build/source/texk/ps2pkm/type1.c
@@ -107,14 +107,12 @@ typedef struct xobject xobject;
 /*****************/
 /* Useful macros */
 /*****************/
-static DOUBLE tmpx;  /* Store macro argument in tmpx to avoid re-evaluation */
-static LONG tmpi;    /* Store converted value in tmpi to avoid re-evaluation */
  
-#define FABS(x) (((tmpx = (x)) < 0.0) ? -tmpx : tmpx)
+#define FABS(x) fabs(x)
  
-#define CEIL(x) (((tmpi = (LONG) (tmpx = (x))) < tmpx) ? ++tmpi : tmpi)
+#define CEIL(x) ceil(x)
  
-#define FLOOR(x) (((tmpi = (LONG) (tmpx = (x))) > tmpx) ? --tmpi : tmpi)
+#define FLOOR(x) floor(x)
  
 #define ROUND(x) FLOOR((x) + 0.5)
  
@@ -127,6 +125,8 @@ int currentchar = -1; /* for error reporting */
 #define Error {errflag = TRUE; return;}
  
 #define Error0(errmsg) { CC; IfTrace0(TRUE, errmsg); Error;}
+
+#define Error01(errmsg) { CC; IfTrace0(TRUE, errmsg); errflag = TRUE; return -1.0;}
  
 #define Error1(errmsg,arg) { CC; IfTrace1(TRUE, errmsg, arg); Error;}
  
@@ -477,10 +477,10 @@ int stemno;
       if (unitpixels < blues->BlueScale)
         suppressovershoot = TRUE;
       else
-        if (alignmentzones[i].topzone)
+        if (alignmentzones[i].topzone) {
           if (stemtop >= alignmentzones[i].bottomy + blues->BlueShift)
             enforceovershoot = TRUE;
-        else
+        } else
           if (stembottom <= alignmentzones[i].topy - blues->BlueShift)
             enforceovershoot = TRUE;
  
@@ -519,20 +519,22 @@ int stemno;
            it falls at least one pixel beyond the flat position. */
  
         if (enforceovershoot)
-          if (overshoot < onepixel)
+          if (overshoot < onepixel) {
             if (alignmentzones[i].topzone)
               stemshift += onepixel - overshoot;
             else
               stemshift -= onepixel - overshoot;
+          }
  
         /* SUPPRESS overshoot by aligning the stem to the alignment zone's
            flat position. */
  
-        if (suppressovershoot)
+        if (suppressovershoot) {
           if (alignmentzones[i].topzone)
             stemshift -= overshoot;
           else
             stemshift += overshoot;
+        }
       }
  
       /************************************************************/
@@ -780,7 +782,7 @@ static void PSFakePush(Num)
 static DOUBLE PSFakePop ()
 {
   if (PSFakeTop >= 0) return(PSFakeStack[PSFakeTop--]);
-  else Error0("PSFakePop : Stack empty\n");
+  else Error01("PSFakePop : Stack empty\n");
   /*NOTREACHED*/
 }
  
diff --git a/Build/source/texk/ptexenc/ChangeLog.TL b/Build/source/texk/ptexenc/ChangeLog.TL
index d90c91f9056..e7d3bae15fe 100644
--- a/Build/source/texk/ptexenc/ChangeLog.TL
+++ b/Build/source/texk/ptexenc/ChangeLog.TL
@@ -1,6 +1,11 @@
 ChangeLog.TL: TeX Live (TL) changes for ptexenc
 ===============================================
 
+2011-07-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* version.ac: New file defining the ptexenc version.
+	* configure.ac: Adapt. Use KPSE_LT_VERSION.
+
 2011-01-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	For e-pTeX, adapted from eptex-110102.tar.xz by Hironori Kitagawa.
diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in
index dd18b9eb89b..873e3dbe0ad 100644
--- a/Build/source/texk/ptexenc/Makefile.in
+++ b/Build/source/texk/ptexenc/Makefile.in
@@ -52,12 +52,13 @@ DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-lib-version.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
 	$(top_srcdir)/../../m4/ltsugar.m4 \
 	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
+	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
diff --git a/Build/source/texk/ptexenc/aclocal.m4 b/Build/source/texk/ptexenc/aclocal.m4
index d77f3a9c0b1..0c7daf6cb9e 100644
--- a/Build/source/texk/ptexenc/aclocal.m4
+++ b/Build/source/texk/ptexenc/aclocal.m4
@@ -991,6 +991,7 @@ AC_SUBST([am__untar])
 
 m4_include([../../m4/kpse-common.m4])
 m4_include([../../m4/kpse-kpathsea-flags.m4])
+m4_include([../../m4/kpse-lib-version.m4])
 m4_include([../../m4/kpse-warnings.m4])
 m4_include([../../m4/libtool.m4])
 m4_include([../../m4/ltoptions.m4])
diff --git a/Build/source/texk/ptexenc/configure b/Build/source/texk/ptexenc/configure
index 0033bb81d77..8f7ee188970 100755
--- a/Build/source/texk/ptexenc/configure
+++ b/Build/source/texk/ptexenc/configure
@@ -762,8 +762,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -2356,6 +2355,7 @@ PTEXENCVERSION=1.2.0
 
 $as_echo "#define PTEXENCVERSION \"ptexenc version 1.2.0\"" >>confdefs.h
 
+
 PTEXENC_LT_VERSINFO=3:0:2
 
 
@@ -12469,39 +12469,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/ptexenc/configure.ac b/Build/source/texk/ptexenc/configure.ac
index 8fb6e1b9932..5f5065f824e 100644
--- a/Build/source/texk/ptexenc/configure.ac
+++ b/Build/source/texk/ptexenc/configure.ac
@@ -5,28 +5,9 @@ dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
-dnl --------------------------------------------------------
-dnl Keep ptexenc shared and package library versions the same:
-dnl   Only bug fixes:
-dnl     ptexenc_lib_micro += 1;
-dnl   Adding new interfaces (backwards compatible)
-dnl     ptexenc_lib_minor += 1;
-dnl     ptexenc_lib_micro = 0;
-dnl   Modifying or revoking interfaces (not backwards compatible)
-dnl     ptexenc_lib_major += 1;
-dnl     ptexenc_lib_minor = 0;
-dnl     ptexenc_lib_micro = 0;
 dnl
-dnl   After a release, set ptexenc_lib_dev to "dev", to distinguish
-dnl   binaries built between releases.
-
-m4_define([ptexenc_lib_major], [1])[]dnl
-m4_define([ptexenc_lib_minor], [2])[]dnl
-m4_define([ptexenc_lib_micro], [0])[]dnl
-m4_define([ptexenc_lib_devel], [])[]dnl or "dev"
-m4_define([ptexenc_version], [ptexenc_lib_major.ptexenc_lib_minor.ptexenc_lib_micro[]ptexenc_lib_devel])[]dnl
-
-AC_INIT([ptexenc], [ptexenc_version], [tex-k@tug.org])
+m4_include([version.ac])[] dnl define ptexenc_version
+AC_INIT([ptexenc], ptexenc_version, [tex-k@tug.org])
 AC_PREREQ([2.63])
 AC_CONFIG_SRCDIR([ptexenc.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
@@ -34,8 +15,7 @@ AC_CONFIG_MACRO_DIR([../../m4])
 
 AC_SUBST([PTEXENCVERSION], [ptexenc_version])
 AC_DEFINE([PTEXENCVERSION], ["ptexenc version ptexenc_version"])
-AC_SUBST([PTEXENC_LT_VERSINFO],
-         [m4_eval(ptexenc_lib_major+ptexenc_lib_minor):ptexenc_lib_micro:ptexenc_lib_minor])
+KPSE_LT_VERSION([ptexenc])
 
 dnl Common code for all programs (or libraries) using libkpathsea.
 KPSE_COMMON([ptexenc])
diff --git a/Build/source/texk/ptexenc/version.ac b/Build/source/texk/ptexenc/version.ac
new file mode 100644
index 00000000000..848f7b9daab
--- /dev/null
+++ b/Build/source/texk/ptexenc/version.ac
@@ -0,0 +1,24 @@
+dnl
+dnl   Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl   This file is free software; the copyright holder
+dnl   gives unlimited permission to copy and/or distribute it,
+dnl   with or without modifications, as long as this notice is preserved.
+dnl
+dnl --------------------------------------------------------
+dnl Keep ptexenc package and shared library versions the same:
+dnl   Only bug fixes:
+dnl     a.b.c => a.b.c+1
+dnl   Adding new interfaces (backwards compatible)
+dnl     a.b.c => a.b+1.0
+dnl   Modifying or revoking interfaces (not backwards compatible)
+dnl     a.b.c => a+1.b.c
+dnl     kpse_lib_minor = 0;
+dnl     kpse_lib_micro = 0;
+dnl
+dnl   After a release:
+dnl     append "dev", to distinguish binaries built between releases.
+dnl --------------------------------------------------------
+dnl
+dnl  m4-include this file to define the current ptexenc version
+m4_define([ptexenc_version], [1.2.0])
diff --git a/Build/source/texk/seetexk/configure b/Build/source/texk/seetexk/configure
index 7c9d4d5c486..fad3c1b189f 100755
--- a/Build/source/texk/seetexk/configure
+++ b/Build/source/texk/seetexk/configure
@@ -758,8 +758,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12634,39 +12633,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure
index 1d132067373..1eaf1937b58 100755
--- a/Build/source/texk/tex4htk/configure
+++ b/Build/source/texk/tex4htk/configure
@@ -762,8 +762,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12638,39 +12637,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/ttf2pk/configure b/Build/source/texk/ttf2pk/configure
index d3666685613..036eebe8335 100755
--- a/Build/source/texk/ttf2pk/configure
+++ b/Build/source/texk/ttf2pk/configure
@@ -765,8 +765,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12468,39 +12467,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure
index 13fe46103f8..e9caf6f34e2 100755
--- a/Build/source/texk/ttf2pk2/configure
+++ b/Build/source/texk/ttf2pk2/configure
@@ -12474,39 +12474,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/ttfdump/configure b/Build/source/texk/ttfdump/configure
index c94c1776122..c310435eca2 100755
--- a/Build/source/texk/ttfdump/configure
+++ b/Build/source/texk/ttfdump/configure
@@ -751,8 +751,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -12622,39 +12621,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 80edd9a0498..c8cf1362498 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,24 @@
+2011-07-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: No need to test for PDFDoc::getPDFMajorVersion
+	for poppler >= 0.12.
+
+2011-07-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* enctex.ch: Fix an off-by-one bug initializing mubyte_cswrite.
+	From Roderich Schupp <roderich.schupp@googlemail.com>,
+	Debian Bug#633011, tex-k mail Fri, 8 Jul 2011 15:56:23.
+
+2011-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ac/web2c.ac: Always use poppler for XeTeX instead of xpdf.
+
+2011-07-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	SyncTeX infrastructure for pTeX and e-pTeX.
+	* ac/web2c.ac: Enable SyncTeX for pTeX and e-pTeX.
+	* texmfmp-help.h (*PTEXHELP): Document the -synctex option.
+
 2011-06-23  Karl Berry  <karl@tug.org>
 
 	* configure.ac (AC_C_CHAR_UNSIGNED): needed for test
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 862138e9701..a8134bd1287 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -56,9 +56,9 @@ check_PROGRAMS = $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
 TESTS = tangle.test $(am__EXEEXT_34) ctiedir/ctie.test \
 	cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
 	$(am__append_14) $(am__append_23) $(am__append_28) \
-	$(am__append_34) $(am__append_39) $(am__append_44) \
-	$(am__append_51) $(am__append_65) $(am__append_68) \
-	$(am__append_69) libmd5/md5.test
+	$(am__append_34) $(am__append_38) $(am__append_40) \
+	$(am__append_45) $(am__append_52) $(am__append_66) \
+	$(am__append_69) $(am__append_70) libmd5/md5.test
 DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 	$(srcdir)/../../build-aux/config.guess \
 	$(srcdir)/../../build-aux/config.sub \
@@ -126,45 +126,46 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 @ETEX_TRUE@am__append_30 = etrip.diffs
 @ETEX_TRUE@am__append_31 = etrip-clean
 @PTEX_TRUE@am__append_32 = ptex
-@PTEX_TRUE@@WEB_TRUE@am__append_33 = $(pweb_programs)
+@PWEB_TRUE@am__append_33 = $(pweb_programs)
 @PTEX_TRUE@am__append_34 = $(ptex_tests)
 @PTEX_TRUE@am__append_35 = dvitype pltotf tftopl
 @PTEX_TRUE@am__append_36 = ptrip.diffs
 @PTEX_TRUE@am__append_37 = ptrip-clean
-@EPTEX_TRUE@am__append_38 = eptex
-@EPTEX_TRUE@am__append_39 = $(eptex_tests)
-@EPTEX_TRUE@am__append_40 = dvitype pltotf tftopl
-@EPTEX_TRUE@am__append_41 = eptrip.diffs
-@EPTEX_TRUE@am__append_42 = eptrip-clean
-@PDFTEX_TRUE@am__append_43 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_44 = $(pdftex_tests)
-@MINGW32_TRUE@am__append_45 = \
+@PWEB_TRUE@am__append_38 = $(pweb_tests)
+@EPTEX_TRUE@am__append_39 = eptex
+@EPTEX_TRUE@am__append_40 = $(eptex_tests)
+@EPTEX_TRUE@am__append_41 = dvitype pltotf tftopl
+@EPTEX_TRUE@am__append_42 = eptrip.diffs
+@EPTEX_TRUE@am__append_43 = eptrip-clean
+@PDFTEX_TRUE@am__append_44 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_45 = $(pdftex_tests)
+@MINGW32_TRUE@am__append_46 = \
 @MINGW32_TRUE@	pdftexdir/regex/regex.c \
 @MINGW32_TRUE@	pdftexdir/regex/regex.h
 
-@LUATEX_TRUE@am__append_46 = luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_47 = call_luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_48 = install-luatex-links
-@LUATEX_TRUE@@WIN32_TRUE@am__append_49 = uninstall-luatex-links
-@LUATEX_TRUE@@WIN32_FALSE@am__append_50 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
-@LUATEX_TRUE@am__append_51 = $(luatex_tests)
-@MINGW32_FALSE@am__append_52 = -DLUA_USE_POSIX
-@XETEX_TRUE@am__append_53 = xetex
-@XETEX_MACOSX_TRUE@am__append_54 = -DXETEX_MAC
-@XETEX_MACOSX_TRUE@am__append_55 = libxetexmm.a
-@XETEX_MACOSX_FALSE@am__append_56 = -DXETEX_OTHER $(XPDF_INCLUDES) \
+@LUATEX_TRUE@am__append_47 = luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_48 = call_luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_49 = install-luatex-links
+@LUATEX_TRUE@@WIN32_TRUE@am__append_50 = uninstall-luatex-links
+@LUATEX_TRUE@@WIN32_FALSE@am__append_51 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+@LUATEX_TRUE@am__append_52 = $(luatex_tests)
+@MINGW32_FALSE@am__append_53 = -DLUA_USE_POSIX
+@XETEX_TRUE@am__append_54 = xetex
+@XETEX_MACOSX_TRUE@am__append_55 = -DXETEX_MAC
+@XETEX_MACOSX_TRUE@am__append_56 = libxetexmm.a
+@XETEX_MACOSX_FALSE@am__append_57 = -DXETEX_OTHER $(POPPLER_INCLUDES) \
 @XETEX_MACOSX_FALSE@	$(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_57 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_FALSE@am__append_58 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
-@XETEX_GRAPHITE_TRUE@am__append_59 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
-@XETEX_GRAPHITE_TRUE@am__append_60 = $(GRAPHITE_LIBS)
-@XETEX_GRAPHITE_TRUE@am__append_61 = $(GRAPHITE_DEPEND)
-@XETEX_MACOSX_TRUE@am__append_62 = \
+@XETEX_MACOSX_FALSE@am__append_58 = $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_FALSE@am__append_59 = $(POPPLER_DEPEND) $(LIBPNG_DEPEND)
+@XETEX_GRAPHITE_TRUE@am__append_60 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
+@XETEX_GRAPHITE_TRUE@am__append_61 = $(GRAPHITE_LIBS)
+@XETEX_GRAPHITE_TRUE@am__append_62 = $(GRAPHITE_DEPEND)
+@XETEX_MACOSX_TRUE@am__append_63 = \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.cpp \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeX_mac.c
 
-@XETEX_MACOSX_FALSE@am__append_63 = \
+@XETEX_MACOSX_FALSE@am__append_64 = \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.cpp \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeX_pic.c \
@@ -181,52 +182,74 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 @XETEX_MACOSX_FALSE@	xetexdir/pngimage.c \
 @XETEX_MACOSX_FALSE@	xetexdir/pngimage.h
 
-@XETEX_GRAPHITE_TRUE@am__append_64 = \
+@XETEX_GRAPHITE_TRUE@am__append_65 = \
 @XETEX_GRAPHITE_TRUE@	xetexdir/XeTeXGrLayout.cpp \
 @XETEX_GRAPHITE_TRUE@	xetexdir/XeTeXGrLayout.h
 
-@XETEX_TRUE@am__append_65 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_66 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_67 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_68 = $(OTANGLE_tests)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_69 = $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_70 = pltotf tftopl
-@ALEPH_TRUE@am__append_71 = aleph
-@TEX_SYNCTEX_TRUE@am__append_72 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_66 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_67 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_68 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_69 = $(OTANGLE_tests)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_70 = $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_71 = pltotf tftopl
+@ALEPH_TRUE@am__append_72 = aleph
+@TEX_SYNCTEX_TRUE@am__append_73 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @TEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_73 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_74 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_75 = \
+@TEX_SYNCTEX_TRUE@am__append_74 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_75 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_76 = \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-tex.h
 
-@ETEX_SYNCTEX_TRUE@am__append_76 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_77 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @ETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_77 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_78 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_79 = \
+@ETEX_SYNCTEX_TRUE@am__append_78 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_79 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_80 = \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-etex.h
 
-@PDFTEX_SYNCTEX_TRUE@am__append_80 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_81 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
+@PTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
+@PTEX_SYNCTEX_TRUE@am__append_82 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_83 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_84 = \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex-ptex.h
+
+@EPTEX_SYNCTEX_TRUE@am__append_85 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
+@EPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
+@EPTEX_SYNCTEX_TRUE@am__append_86 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_87 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_88 = \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-eptex.h
+
+@PDFTEX_SYNCTEX_TRUE@am__append_89 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @PDFTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_81 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_90 = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-pdftex.h
 
-@XETEX_SYNCTEX_TRUE@am__append_82 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_91 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @XETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_83 = \
+@XETEX_SYNCTEX_TRUE@am__append_92 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
@@ -554,7 +577,7 @@ am__EXEEXT_5 = $(am__EXEEXT_3) $(am__EXEEXT_4)
 @MP_TRUE@am__EXEEXT_12 = mpost$(EXEEXT)
 @ETEX_TRUE@am__EXEEXT_13 = etex$(EXEEXT)
 @PTEX_TRUE@am__EXEEXT_14 = ptex$(EXEEXT)
-@PTEX_TRUE@@WEB_TRUE@am__EXEEXT_15 = $(am__EXEEXT_2)
+@PWEB_TRUE@am__EXEEXT_15 = $(am__EXEEXT_2)
 @EPTEX_TRUE@am__EXEEXT_16 = eptex$(EXEEXT)
 @PDFTEX_TRUE@am__EXEEXT_17 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
 @PDFTEX_TRUE@	pdftosrc$(EXEEXT)
@@ -620,23 +643,30 @@ nodist_dvitype_OBJECTS = dvitype.$(OBJEXT)
 dvitype_OBJECTS = $(nodist_dvitype_OBJECTS)
 dvitype_LDADD = $(LDADD)
 dvitype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-dist_eptex_OBJECTS = eptex-eptexextra.$(OBJEXT)
-am__objects_11 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
-nodist_eptex_OBJECTS = $(am__objects_11) eptex-eptex-pool.$(OBJEXT)
+am__dist_eptex_SOURCES_DIST = eptexdir/eptexextra.c \
+	eptexdir/eptexextra.h synctexdir/synctex.c \
+	synctexdir/synctex.h synctexdir/synctex-common.h \
+	synctexdir/synctex-eptex.h
+@EPTEX_SYNCTEX_TRUE@am__objects_11 = eptex-synctex.$(OBJEXT)
+dist_eptex_OBJECTS = eptex-eptexextra.$(OBJEXT) $(am__objects_11)
+am__objects_12 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
+nodist_eptex_OBJECTS = $(am__objects_12) eptex-eptex-pool.$(OBJEXT)
 eptex_OBJECTS = $(dist_eptex_OBJECTS) $(nodist_eptex_OBJECTS)
+@EPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
 eptex_DEPENDENCIES = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_3)
 am__dist_etex_SOURCES_DIST = etexdir/etexextra.c etexdir/etexextra.h \
 	synctexdir/synctex.c synctexdir/synctex.h \
 	synctexdir/synctex-common.h synctexdir/synctex-etex.h
-@ETEX_SYNCTEX_TRUE@am__objects_12 = etex-synctex.$(OBJEXT)
-dist_etex_OBJECTS = etex-etexextra.$(OBJEXT) $(am__objects_12)
-am__objects_13 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
-nodist_etex_OBJECTS = $(am__objects_13) etex-etex-pool.$(OBJEXT)
+@ETEX_SYNCTEX_TRUE@am__objects_13 = etex-synctex.$(OBJEXT)
+dist_etex_OBJECTS = etex-etexextra.$(OBJEXT) $(am__objects_13)
+am__objects_14 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
+nodist_etex_OBJECTS = $(am__objects_14) etex-etex-pool.$(OBJEXT)
 etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS)
-@ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+@ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
 etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_3)
+	$(am__DEPENDENCIES_4)
 am_gftodvi_OBJECTS =
 nodist_gftodvi_OBJECTS = gftodvi.$(OBJEXT)
 gftodvi_OBJECTS = $(am_gftodvi_OBJECTS) $(nodist_gftodvi_OBJECTS)
@@ -658,7 +688,7 @@ initex_OBJECTS = $(am_initex_OBJECTS)
 initex_DEPENDENCIES =
 am_luatex_OBJECTS = luatex-luatex.$(OBJEXT)
 luatex_OBJECTS = $(am_luatex_OBJECTS)
-am__DEPENDENCIES_4 = libluatex.a libff.a libluamisc.a libluasocket.a \
+am__DEPENDENCIES_5 = libluatex.a libff.a libluamisc.a libluasocket.a \
 	liblua51.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) libmd5.a libmplib.a
@@ -670,12 +700,12 @@ md5main_OBJECTS = $(am_md5main_OBJECTS)
 md5main_DEPENDENCIES = libmd5.a
 dist_mf_OBJECTS = mf-mfextra.$(OBJEXT)
 mf_OBJECTS = $(dist_mf_OBJECTS)
-@WIN32_FALSE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) \
+@WIN32_FALSE@am__DEPENDENCIES_6 = $(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)
+	$(am__DEPENDENCIES_6)
 dist_mf_nowin_OBJECTS = mf_nowin-mfextra.$(OBJEXT)
 mf_nowin_OBJECTS = $(dist_mf_nowin_OBJECTS)
 mf_nowin_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib)
@@ -683,8 +713,8 @@ nodist_mft_OBJECTS = mft.$(OBJEXT)
 mft_OBJECTS = $(nodist_mft_OBJECTS)
 mft_LDADD = $(LDADD)
 mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_14 = mpost-mpxout.$(OBJEXT)
-nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_14)
+am__objects_15 = mpost-mpxout.$(OBJEXT)
+nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_15)
 mpost_OBJECTS = $(nodist_mpost_OBJECTS)
 nodist_odvicopy_OBJECTS = odvicopy.$(OBJEXT)
 odvicopy_OBJECTS = $(nodist_odvicopy_OBJECTS)
@@ -721,19 +751,19 @@ patgen_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
 am_pbibtex_OBJECTS =
 nodist_pbibtex_OBJECTS = pbibtex-pbibtex.$(OBJEXT)
 pbibtex_OBJECTS = $(am_pbibtex_OBJECTS) $(nodist_pbibtex_OBJECTS)
-am__DEPENDENCIES_6 = $(pproglib) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_7 = $(pproglib) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2)
-pbibtex_DEPENDENCIES = $(am__DEPENDENCIES_6)
+pbibtex_DEPENDENCIES = $(am__DEPENDENCIES_7)
 am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \
 	pdftexdir/pdftexextra.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-pdftex.h
-@PDFTEX_SYNCTEX_TRUE@am__objects_15 = pdftex-synctex.$(OBJEXT)
-dist_pdftex_OBJECTS = pdftex-pdftexextra.$(OBJEXT) $(am__objects_15)
-am__objects_16 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
-nodist_pdftex_OBJECTS = $(am__objects_16) pdftex-pdftex-pool.$(OBJEXT)
+@PDFTEX_SYNCTEX_TRUE@am__objects_16 = pdftex-synctex.$(OBJEXT)
+dist_pdftex_OBJECTS = pdftex-pdftexextra.$(OBJEXT) $(am__objects_16)
+am__objects_17 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_17) pdftex-pdftex-pool.$(OBJEXT)
 pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmd5.a
 pdftex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(pdftex_CXXFLAGS) $(CXXFLAGS) \
@@ -746,7 +776,7 @@ pdftosrc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 am_pdvitype_OBJECTS =
 nodist_pdvitype_OBJECTS = pdvitype-pdvitype.$(OBJEXT)
 pdvitype_OBJECTS = $(am_pdvitype_OBJECTS) $(nodist_pdvitype_OBJECTS)
-pdvitype_DEPENDENCIES = $(am__DEPENDENCIES_6)
+pdvitype_DEPENDENCIES = $(am__DEPENDENCIES_7)
 nodist_pktogf_OBJECTS = pktogf.$(OBJEXT)
 pktogf_OBJECTS = $(nodist_pktogf_OBJECTS)
 pktogf_LDADD = $(LDADD)
@@ -766,17 +796,22 @@ pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
 am_ppltotf_OBJECTS =
 nodist_ppltotf_OBJECTS = ppltotf-ppltotf.$(OBJEXT)
 ppltotf_OBJECTS = $(am_ppltotf_OBJECTS) $(nodist_ppltotf_OBJECTS)
-ppltotf_DEPENDENCIES = $(am__DEPENDENCIES_6)
-dist_ptex_OBJECTS = ptex-ptexextra.$(OBJEXT)
-am__objects_17 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_17) ptex-ptex-pool.$(OBJEXT)
+ppltotf_DEPENDENCIES = $(am__DEPENDENCIES_7)
+am__dist_ptex_SOURCES_DIST = ptexdir/ptexextra.c ptexdir/ptexextra.h \
+	synctexdir/synctex.c synctexdir/synctex.h \
+	synctexdir/synctex-common.h synctexdir/synctex-ptex.h
+@PTEX_SYNCTEX_TRUE@am__objects_18 = ptex-synctex.$(OBJEXT)
+dist_ptex_OBJECTS = ptex-ptexextra.$(OBJEXT) $(am__objects_18)
+am__objects_19 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_19) ptex-ptex-pool.$(OBJEXT)
 ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
-ptex_DEPENDENCIES = libkanji.a $(am__DEPENDENCIES_6) \
-	$(am__DEPENDENCIES_1)
+@PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
+ptex_DEPENDENCIES = libkanji.a $(am__DEPENDENCIES_7) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
 am_ptftopl_OBJECTS =
 nodist_ptftopl_OBJECTS = ptftopl-ptftopl.$(OBJEXT)
 ptftopl_OBJECTS = $(am_ptftopl_OBJECTS) $(nodist_ptftopl_OBJECTS)
-ptftopl_DEPENDENCIES = $(am__DEPENDENCIES_6)
+ptftopl_DEPENDENCIES = $(am__DEPENDENCIES_7)
 am_synctex_OBJECTS = synctex-synctex_main.$(OBJEXT) \
 	synctex-synctex_parser.$(OBJEXT) \
 	synctex-synctex_parser_utils.$(OBJEXT)
@@ -792,14 +827,14 @@ tangleboot_LDADD = $(LDADD)
 am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-tex.h
-@TEX_SYNCTEX_TRUE@am__objects_18 = tex-synctex.$(OBJEXT)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_18)
-am__objects_19 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_19) tex-tex-pool.$(OBJEXT)
+@TEX_SYNCTEX_TRUE@am__objects_20 = tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_20)
+am__objects_21 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_21) tex-tex-pool.$(OBJEXT)
 tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
-@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
+@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
 tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_8)
+	$(am__DEPENDENCIES_10)
 nodist_tftopl_OBJECTS = tftopl.$(OBJEXT)
 tftopl_OBJECTS = $(nodist_tftopl_OBJECTS)
 tftopl_LDADD = $(LDADD)
@@ -829,20 +864,20 @@ am__dist_xetex_SOURCES_DIST = xetexdir/xetexextra.c \
 	xetexdir/xetexextra.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-xetex.h
-@XETEX_SYNCTEX_TRUE@am__objects_20 = xetex-synctex.$(OBJEXT)
-dist_xetex_OBJECTS = xetex-xetexextra.$(OBJEXT) $(am__objects_20)
-am__objects_21 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_21) xetex-xetex_pool.$(OBJEXT)
+@XETEX_SYNCTEX_TRUE@am__objects_22 = xetex-synctex.$(OBJEXT)
+dist_xetex_OBJECTS = xetex-xetexextra.$(OBJEXT) $(am__objects_22)
+am__objects_23 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_23) xetex-xetex_pool.$(OBJEXT)
 xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
-@XETEX_MACOSX_FALSE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) \
+@XETEX_MACOSX_FALSE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) \
 @XETEX_MACOSX_FALSE@	$(am__DEPENDENCIES_1) \
 @XETEX_MACOSX_FALSE@	$(am__DEPENDENCIES_1)
-@XETEX_GRAPHITE_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_11 = $(libxetex) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9) \
-	$(am__DEPENDENCIES_10) $(am__DEPENDENCIES_1) \
+@XETEX_GRAPHITE_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_13 = $(libxetex) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_11) \
+	$(am__DEPENDENCIES_12) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-xetex_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_2) \
+xetex_DEPENDENCIES = $(am__DEPENDENCIES_13) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
 xetex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(xetex_CXXFLAGS) $(CXXFLAGS) \
@@ -919,15 +954,16 @@ DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
 	$(EXTRA_libpdftex_a_SOURCES) $(am__libxetex_a_SOURCES_DIST) \
 	$(libxetexmm_a_SOURCES) $(dist_aleph_SOURCES) \
 	$(call_luatex_SOURCES) $(call_mpost_SOURCES) \
-	$(dist_eptex_SOURCES) $(am__dist_etex_SOURCES_DIST) \
+	$(am__dist_eptex_SOURCES_DIST) $(am__dist_etex_SOURCES_DIST) \
 	$(gftodvi_SOURCES) $(inimf_SOURCES) $(initex_SOURCES) \
 	$(luatex_SOURCES) $(md5main_SOURCES) $(dist_mf_SOURCES) \
 	$(dist_mf_nowin_SOURCES) $(pbibtex_SOURCES) \
 	$(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \
-	$(pdvitype_SOURCES) $(ppltotf_SOURCES) $(dist_ptex_SOURCES) \
-	$(ptftopl_SOURCES) $(synctex_SOURCES) \
-	$(am__dist_tex_SOURCES_DIST) $(ttf2afm_SOURCES) \
-	$(EXTRA_ttf2afm_SOURCES) $(am__dist_xetex_SOURCES_DIST)
+	$(pdvitype_SOURCES) $(ppltotf_SOURCES) \
+	$(am__dist_ptex_SOURCES_DIST) $(ptftopl_SOURCES) \
+	$(synctex_SOURCES) $(am__dist_tex_SOURCES_DIST) \
+	$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
+	$(am__dist_xetex_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -1272,20 +1308,20 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	etexdir/etrip/etrip1.in etexdir/etrip/etrip2.in \
 	etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \
 	etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \
-	etexdir/etrip/trip2.in $(ptex_tests) $(ptex_web_srcs) \
-	$(ptex_ch_srcs) ptexdir/ptex.defines ptexdir/pbibtex.ch \
-	web2c/cvtbib.sed ptexdir/pdvitype.ch ptexdir/ppltotf.ch \
-	ptexdir/ptftopl.ch ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis \
-	ptexdir/ChangeLog ptexdir/Changes.txt ptexdir/INSTALL.txt \
-	ptexdir/README.txt ptexdir/tests/nissya_bib.aux \
-	ptexdir/tests/nissya.bst ptexdir/tests/sample.bib \
-	tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst \
-	ptexdir/tests/goth10.tfm ptexdir/tests/sample.dvi \
-	ptexdir/tests/min10.pl ptexdir/tests/min10.tfm \
-	ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm \
-	ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf \
-	$(eptex_tests) $(eptex_web_srcs) $(eptex_ch_srcs) \
-	eptexdir/eptex.defines eptexdir/ChangeLog \
+	etexdir/etrip/trip2.in $(ptex_tests) $(pweb_tests) \
+	$(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines \
+	ptexdir/pbibtex.ch web2c/cvtbib.sed ptexdir/pdvitype.ch \
+	ptexdir/ppltotf.ch ptexdir/ptftopl.ch ptexdir/COPYRIGHT \
+	ptexdir/COPYRIGHT.jis ptexdir/ChangeLog ptexdir/Changes.txt \
+	ptexdir/INSTALL.txt ptexdir/README.txt \
+	ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \
+	ptexdir/tests/sample.bib tests/memdata1.bst tests/memdata2.bst \
+	tests/memdata3.bst ptexdir/tests/goth10.tfm \
+	ptexdir/tests/sample.dvi ptexdir/tests/min10.pl \
+	ptexdir/tests/min10.tfm ptexdir/tests/tmin10.pl \
+	ptexdir/tests/tmin10.tfm ptexdir/ptrip/ptrip.diffs \
+	ptexdir/ptrip/texmf.cnf $(eptex_tests) $(eptex_web_srcs) \
+	$(eptex_ch_srcs) eptexdir/eptex.defines eptexdir/ChangeLog \
 	eptexdir/ChangeLog.TL eptexdir/README.txt \
 	eptexdir/eptrip/eptrip.diffs eptexdir/eptrip/etrip.log \
 	eptexdir/eptrip/etrip.tex eptexdir/eptrip/texmf.cnf \
@@ -1431,9 +1467,12 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	synctexdir/synctex-rec.ch1 synctexdir/synctex-rec.ch2 \
 	synctexdir/synctex-e-mem.ch0 synctexdir/synctex-e-mem.ch1 \
 	synctexdir/synctex-e-rec.ch0 synctexdir/synctex-e-rec.ch1 \
-	synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-mem.ch2 \
-	synctexdir/synctex-xe-rec.ch2 synctexdir/synctex-xe-rec.ch3 \
-	libmd5/md5.test
+	synctexdir/synctex-p-mem.ch0 synctexdir/synctex-p-mem.ch1 \
+	synctexdir/synctex-p-rec.ch0 synctexdir/synctex-p-rec.ch1 \
+	synctexdir/synctex-ep-mem.ch0 synctexdir/synctex-ep-mem.ch1 \
+	synctexdir/synctex-ep-rec.ch1 synctexdir/synctex-pdf-rec.ch2 \
+	synctexdir/synctex-xe-mem.ch2 synctexdir/synctex-xe-rec.ch2 \
+	synctexdir/synctex-xe-rec.ch3 libmd5/md5.test
 DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	tangle-web2c tangleboot.c tangleboot.h tangleboot.p \
 	tangleboot-web2c ctangle.c cweb.c cweb.h ctangle-ctangle \
@@ -1483,13 +1522,13 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	aleph.pool aleph-tangle
 CLEANFILES = 
 TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_26) \
-	$(am__append_31) $(am__append_37) $(am__append_42)
+	$(am__append_31) $(am__append_37) $(am__append_43)
 TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
-	$(am__append_30) $(am__append_36) $(am__append_41)
+	$(am__append_30) $(am__append_36) $(am__append_42)
 bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
-	$(am__append_50)
-install_exe_links = $(am__append_20) $(am__append_48)
-uninstall_exe_links = $(am__append_21) $(am__append_49)
+	$(am__append_51)
+install_exe_links = $(am__append_20) $(am__append_49)
+uninstall_exe_links = $(am__append_21) $(am__append_50)
 web2c = $(SHELL) ./web2c-sh $@
 makecpool = web2c/makecpool
 
@@ -1573,18 +1612,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
 initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
 initex_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
 initex_LDADD = 
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_72)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_73)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_73)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_74)
 
 # TeX C sources
 tex_c_h = texini.c tex0.c texcoerce.h texd.h
 nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_75)
+dist_tex_SOURCES = texextra.c $(am__append_76)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_74)
+tex_prereq = texd.h $(am__append_75)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -1652,19 +1691,19 @@ psout_c_h = mppsout.h psout.c mplibps.h
 svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
 libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
 	mplibdir/mpmath.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_76)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_77)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_77)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_78)
 
 # e-TeX C sources
 etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
-	$(am__append_79)
+	$(am__append_80)
 
 # We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_78)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_79)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -1689,32 +1728,36 @@ pweb_programs = pbibtex pdvitype ppltotf ptftopl
 
 # pTeX Tests
 #
-ptex_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
-	ptexdir/ppltotf.test ptexdir/ptftopl.test ptexdir/ptrip.test \
+ptex_tests = ptexdir/ptrip.test
+pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
+	ptexdir/ppltotf.test ptexdir/ptftopl.test \
 	ptexdir/pbibtex-openout-test.pl \
 	ptexdir/pbibtex-longline-test.pl ptexdir/pbibtex-mem.test \
 	ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test
 pproglib = lib/libp.a
 libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
 libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_81)
 
 # With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = libkanji.a $(ptex_ldadd) $(ipc_socketlibs)
+ptex_LDADD = libkanji.a $(ptex_ldadd) $(ipc_socketlibs) \
+	$(am__append_82)
 
 # pTeX C sources
 ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
 nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexdir/ptex_version.h
-dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h
+dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
+	$(am__append_84)
 
 # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_83)
 ptex_web_srcs = \
 	tex.web \
 	tex.ch
 
 ptex_ch_srcs = \
 	ptexdir/ptex-base.ch \
+	$(ptex_ch_synctex) \
 	tex-binpool.ch
 
 nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
@@ -1737,18 +1780,21 @@ ptftopl_LDADD = $(ptex_ldadd)
 # e-pTeX Tests
 #
 eptex_tests = eptexdir/eptrip.test
-eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_85)
 
 # With --enable-ipc, e-pTeX may need to link with -lsocket.
-eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs)
+eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
+	$(ipc_socketlibs) $(am__append_86)
 
 # e-pTeX C sources
 eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
 nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/ptex_version.h
-dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h
+dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
+	$(am__append_88)
 
 # We must create eptexd.h and eptexdir/[ep]tex_version.h before building the eptex_OBJECTS.
-eptex_prereq = eptexd.h eptexdir/etex_version.h eptexdir/ptex_version.h
+eptex_prereq = eptexd.h eptexdir/etex_version.h \
+	eptexdir/ptex_version.h $(am__append_87)
 eptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -1762,6 +1808,7 @@ eptex_ch_srcs = \
 	ptexdir/ptex-base.ch \
 	eptexdir/eptex.ech \
 	eptexdir/etex.ch1 \
+	$(eptex_ch_synctex) \
 	eptexdir/fam256.ch \
 	eptexdir/pdfstrcmp.ch \
 	eptexdir/pdfsavepos.ch \
@@ -1780,7 +1827,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx
 pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_80)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_89)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 # With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -1794,7 +1841,7 @@ nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \
 	pdftexdir/etex_version.h pdftexdir/pdftex_version.h
 
 dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
-	$(am__append_81)
+	$(am__append_90)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -1820,7 +1867,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
 	pdftexdir/writejbig2.c pdftexdir/writejbig2.h \
 	pdftexdir/writejpg.c pdftexdir/writepng.c pdftexdir/writet1.c \
 	pdftexdir/writet3.c pdftexdir/writettf.c pdftexdir/writettf.h \
-	pdftexdir/writezip.c $(am__append_45)
+	pdftexdir/writezip.c $(am__append_46)
 EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
 	pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
 	pdftexdir/regex/regex_internal.h pdftexdir/regex/regexec.c
@@ -1861,7 +1908,7 @@ call_luatex_LDADD =
 # luaTeX Tests
 #
 luatex_tests = luatexdir/luatex.test
-liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_52)
+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_53)
 liblua51_a_CFLAGS = # $(WARNING_CFLAGS)
 liblua51_a_SOURCES = \
 	luatexdir/lua51/lapi.c \
@@ -2239,17 +2286,17 @@ txt2zlib_LDADD = $(ZLIB_LIBS)
 
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_xetex_SOURCES = dummy.cxx
-libxetex = libxetex.a $(am__append_55)
+libxetex = libxetex.a $(am__append_56)
 xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
-	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_54) \
-	$(am__append_56) $(am__append_59) $(ZLIB_INCLUDES)
-xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_57) \
-	$(am__append_60) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_55) \
+	$(am__append_57) $(am__append_60) $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_58) \
+	$(am__append_61) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
 xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
-	$(TECKIT_DEPEND) $(am__append_58) $(am__append_61) \
+	$(TECKIT_DEPEND) $(am__append_59) $(am__append_62) \
 	$(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
 @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_82)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_91)
 xetex_CFLAGS = # $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -2261,7 +2308,7 @@ nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c \
 	xetexdir/etex_version.h xetexdir/xetex_version.h
 
 dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
-	$(am__append_83)
+	$(am__append_92)
 xetex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2292,7 +2339,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/FontTableCache.cpp \
 	xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \
 	xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \
 	xetexdir/trans.h xetexdir/hz.cpp xetexdir/xetex.h \
-	$(am__append_62) $(am__append_63) $(am__append_64)
+	$(am__append_63) $(am__append_64) $(am__append_65)
 
 # We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
 libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -2417,6 +2464,29 @@ synctex_LDADD = $(ZLIB_LIBS)
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-e-rec.ch0 \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-e-rec.ch1
 
+@PTEX_SYNCTEX_TRUE@ptex_ch_synctex = \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-mem.ch0 \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex-mem.ch0 \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex-mem.ch1 \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-mem.ch1 \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-rec.ch0 \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch0 \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch1 \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch2 \
+@PTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-rec.ch1
+
+@EPTEX_SYNCTEX_TRUE@eptex_ch_synctex = \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-ep-mem.ch0 \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-mem.ch0 \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-mem.ch1 \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-e-mem.ch0 \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-ep-mem.ch1 \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-rec.ch0 \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch0 \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch1 \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-ep-rec.ch1 \
+@EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-rec.ch1
+
 @PDFTEX_SYNCTEX_TRUE@pdftex_ch_synctex = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-mem.ch0 \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-mem.ch1 \
@@ -2815,6 +2885,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptex0.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptexextra.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-synctex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etex-pool.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etex0.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etexextra.Po@am__quote@
@@ -3147,6 +3218,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex0.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptexextra.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-synctex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptftopl-ptftopl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synctex-synctex_main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synctex-synctex_parser.Po@am__quote@
@@ -7058,6 +7130,20 @@ eptex-eptexextra.obj: eptexdir/eptexextra.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptexextra.obj `if test -f 'eptexdir/eptexextra.c'; then $(CYGPATH_W) 'eptexdir/eptexextra.c'; else $(CYGPATH_W) '$(srcdir)/eptexdir/eptexextra.c'; fi`
 
+eptex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-synctex.o -MD -MP -MF $(DEPDIR)/eptex-synctex.Tpo -c -o eptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eptex-synctex.Tpo $(DEPDIR)/eptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='synctexdir/synctex.c' object='eptex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+eptex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-synctex.obj -MD -MP -MF $(DEPDIR)/eptex-synctex.Tpo -c -o eptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eptex-synctex.Tpo $(DEPDIR)/eptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='synctexdir/synctex.c' object='eptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
 eptex-eptexini.o: eptexini.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptexini.o -MD -MP -MF $(DEPDIR)/eptex-eptexini.Tpo -c -o eptex-eptexini.o `test -f 'eptexini.c' || echo '$(srcdir)/'`eptexini.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eptex-eptexini.Tpo $(DEPDIR)/eptex-eptexini.Po
@@ -7408,6 +7494,20 @@ ptex-ptexextra.obj: ptexdir/ptexextra.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptexextra.obj `if test -f 'ptexdir/ptexextra.c'; then $(CYGPATH_W) 'ptexdir/ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/ptexextra.c'; fi`
 
+ptex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-synctex.o -MD -MP -MF $(DEPDIR)/ptex-synctex.Tpo -c -o ptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ptex-synctex.Tpo $(DEPDIR)/ptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='synctexdir/synctex.c' object='ptex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+ptex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-synctex.obj -MD -MP -MF $(DEPDIR)/ptex-synctex.Tpo -c -o ptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ptex-synctex.Tpo $(DEPDIR)/ptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='synctexdir/synctex.c' object='ptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
 ptex-ptexini.o: ptexini.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptexini.o -MD -MP -MF $(DEPDIR)/ptex-ptexini.Tpo -c -o ptex-ptexini.o `test -f 'ptexini.c' || echo '$(srcdir)/'`ptexini.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index c88e73c5c6b..1249251eb3c 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -1,6 +1,6 @@
 ## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 dnl
-dnl Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
 ## configure options for TeX and MF
@@ -33,12 +33,12 @@ dnl [PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS]
 m4_define([kpse_tex_progs], [dnl
 [[tex],    [yes], [no],  [TeX],    []],
 [[etex],   [no],  [yes], [e-TeX],  []],
-[[ptex],   [yes], [no],  [pTeX],   [ptexenc]],
-[[eptex],  [yes], [no],  [e-pTeX], [ptexenc]],
-[[aleph],  [yes], [no],  [Aleph],  []],
+[[ptex],   [yes], [yes], [pTeX],   [ptexenc]],
+[[eptex],  [yes], [yes], [e-pTeX], [ptexenc]],
+[[aleph],  [yes], [],    [Aleph],  []],
 [[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng obsdcompat]],
-[[luatex], [yes], [no],  [luaTeX], [poppler libpng obsdcompat zziplib]],
-[[xetex],  [yes], [yes], [XeTeX],  [xpdf libpng freetype2 icu-xetex teckit graphite]],
+[[luatex], [yes], [],    [luaTeX], [poppler libpng obsdcompat zziplib]],
+[[xetex],  [yes], [yes], [XeTeX],  [poppler libpng freetype2 icu-xetex teckit graphite]],
 ])[]dnl
 m4_foreach([Kpse_Prog], [kpse_tex_progs],
            [m4_ifset([Kpse_Prog],
diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index ab57e65e0b1..c2208184515 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -89,9 +89,6 @@
 /* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
-/* Define to 1 if class `PDFDoc' has the `getPDFMajorVersion' member. */
-#undef HAVE_GETPDFMAJORVERSION
-
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index a5cb65b4896..b4a5f340cde 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.68 for Web2C 2011.
+# Generated by GNU Autoconf 2.68 for Web2C 2012/dev.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Web2C'
 PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2011'
-PACKAGE_STRING='Web2C 2011'
+PACKAGE_VERSION='2012/dev'
+PACKAGE_STRING='Web2C 2012/dev'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -679,6 +679,8 @@ LEX
 YFLAGS
 YACC
 KPATHSEA_PATHS_H
+PWEB_FALSE
+PWEB_TRUE
 WEB_FALSE
 WEB_TRUE
 MP_FALSE
@@ -705,16 +707,12 @@ XETEX_SYNCTEX_FALSE
 XETEX_SYNCTEX_TRUE
 XETEX_FALSE
 XETEX_TRUE
-LUATEX_SYNCTEX_FALSE
-LUATEX_SYNCTEX_TRUE
 LUATEX_FALSE
 LUATEX_TRUE
 PDFTEX_SYNCTEX_FALSE
 PDFTEX_SYNCTEX_TRUE
 PDFTEX_FALSE
 PDFTEX_TRUE
-ALEPH_SYNCTEX_FALSE
-ALEPH_SYNCTEX_TRUE
 ALEPH_FALSE
 ALEPH_TRUE
 EPTEX_SYNCTEX_FALSE
@@ -898,13 +896,19 @@ enable_dump_share
 enable_ipc
 enable_omfonts
 enable_tex
+enable_tex_synctex
 enable_etex
+enable_etex_synctex
 enable_ptex
+enable_ptex_synctex
 enable_eptex
+enable_eptex_synctex
 enable_aleph
 enable_pdftex
+enable_pdftex_synctex
 enable_luatex
 enable_xetex
+enable_xetex_synctex
 enable_mf
 enable_mf_nowin
 with_mf_x_toolkit
@@ -1501,7 +1505,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 2011 to adapt to many kinds of systems.
+\`configure' configures Web2C 2012/dev to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1575,7 +1579,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Web2C 2011:";;
+     short | recursive ) echo "Configuration of Web2C 2012/dev:";;
    esac
   cat <<\_ACEOF
 
@@ -1604,13 +1608,19 @@ Optional Features:
   --disable-omfonts       do not compile and install omfonts (use Web2C
                           versions)
   --disable-tex           do not compile and install TeX
+  --enable-tex-synctex      build TeX with SyncTeX support
   --enable-etex           compile and install e-TeX
+  --disable-etex-synctex    build e-TeX without SyncTeX support
   --disable-ptex          do not compile and install pTeX
+  --disable-ptex-synctex    build pTeX without SyncTeX support
   --disable-eptex         do not compile and install e-pTeX
+  --disable-eptex-synctex   build e-pTeX without SyncTeX support
   --disable-aleph         do not compile and install Aleph
   --disable-pdftex        do not compile and install pdfTeX
+  --disable-pdftex-synctex  build pdfTeX without SyncTeX support
   --disable-luatex        do not compile and install luaTeX
   --disable-xetex         do not compile and install XeTeX
+  --disable-xetex-synctex   build XeTeX without SyncTeX support
   --disable-mf            do not build METAFONT
   --disable-mf-nowin        do not build a separate non-windows-capable
                             METAFONT
@@ -1764,7 +1774,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Web2C configure 2011
+Web2C configure 2012/dev
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2672,7 +2682,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 2011, which was
+It was created by Web2C $as_me 2012/dev, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3053,7 +3063,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-WEB2CVERSION=2011
+WEB2CVERSION=2012/dev
 
 
 am__api_version='1.11'
@@ -8028,7 +8038,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='web2c'
- VERSION='2011'
+ VERSION='2012/dev'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13166,39 +13176,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -16817,26 +16830,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
 if ${kpse_cv_warning_cxxflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GXX" = xyes; then
   kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
-case `$CXX -dumpversion` in #(
+  case `$CXX -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+      fi
     fi
+  fi
 fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
 else
   kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
 fi
@@ -17101,26 +17120,32 @@ $as_echo_n "checking what warning flags to pass to the Objective C++ compiler...
 if ${kpse_cv_warning_objcxxflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GOBJCXX" = xyes; then
   kpse_cv_warning_objcxxflags=
-elif test "x$GOBJCXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_objcxxflags="-Wimplicit -Wreturn-type"
-case `$OBJCXX -dumpversion` in #(
+  case `$OBJCXX -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_objcxxflags="-Wall -Wunused $kpse_cv_warning_objcxxflags"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wshadow"
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_objcxxflags="-Wall -Wunused $kpse_cv_warning_objcxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags -Wshadow"
+      fi
     fi
+  fi
 fi
+kpse_cv_warning_objcxxflags="$kpse_cv_warning_objcxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_objcxxflags=
 else
   kpse_cv_warning_objcxxflags= # FIXME: warning flags for non-GNU Objective C++ compilers
 fi
@@ -17284,32 +17309,47 @@ if test "${enable_tex+set}" = set; then :
   enableval=$enable_tex;
 fi
 case $enable_tex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_tex=yes ;;
 esac
+
+# Check whether --enable-tex-synctex was given.
+if test "${enable_tex_synctex+set}" = set; then :
+  enableval=$enable_tex_synctex;
+fi
 # Check whether --enable-etex was given.
 if test "${enable_etex+set}" = set; then :
   enableval=$enable_etex;
 fi
 case $enable_etex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_etex=no ;;
 esac
+
+# Check whether --enable-etex-synctex was given.
+if test "${enable_etex_synctex+set}" = set; then :
+  enableval=$enable_etex_synctex;
+fi
 # Check whether --enable-ptex was given.
 if test "${enable_ptex+set}" = set; then :
   enableval=$enable_ptex;
 fi
 case $enable_ptex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_ptex=yes ;;
 esac
 
+# Check whether --enable-ptex-synctex was given.
+if test "${enable_ptex_synctex+set}" = set; then :
+  enableval=$enable_ptex_synctex;
+fi
+
 test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
 }
@@ -17318,12 +17358,17 @@ if test "${enable_eptex+set}" = set; then :
   enableval=$enable_eptex;
 fi
 case $enable_eptex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_eptex=yes ;;
 esac
 
+# Check whether --enable-eptex-synctex was given.
+if test "${enable_eptex_synctex+set}" = set; then :
+  enableval=$enable_eptex_synctex;
+fi
+
 test "x$enable_web2c:$enable_eptex" = xyes:yes && {
   need_ptexenc=yes
 }
@@ -17332,7 +17377,7 @@ if test "${enable_aleph+set}" = set; then :
   enableval=$enable_aleph;
 fi
 case $enable_aleph in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_aleph=yes ;;
@@ -17342,12 +17387,17 @@ if test "${enable_pdftex+set}" = set; then :
   enableval=$enable_pdftex;
 fi
 case $enable_pdftex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_pdftex=yes ;;
 esac
 
+# Check whether --enable-pdftex-synctex was given.
+if test "${enable_pdftex_synctex+set}" = set; then :
+  enableval=$enable_pdftex_synctex;
+fi
+
 test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
@@ -17358,7 +17408,7 @@ if test "${enable_luatex+set}" = set; then :
   enableval=$enable_luatex;
 fi
 case $enable_luatex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_luatex=yes ;;
@@ -17375,14 +17425,19 @@ if test "${enable_xetex+set}" = set; then :
   enableval=$enable_xetex;
 fi
 case $enable_xetex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_xetex=yes ;;
 esac
 
+# Check whether --enable-xetex-synctex was given.
+if test "${enable_xetex_synctex+set}" = set; then :
+  enableval=$enable_xetex_synctex;
+fi
+
 test "x$enable_web2c:$enable_xetex" = xyes:yes && {
-  need_xpdf=yes
+  need_poppler=yes
   need_libpng=yes
   need_freetype2=yes
   need_icu_xetex=yes
@@ -18315,7 +18370,16 @@ else
   TEX_TRUE='#'
   TEX_FALSE=
 fi
- if false; then
+
+case $enable_native_texlive_build:$enable_tex_synctex in #(
+  yes:no | no:yes | no:no) :
+     ;; #(
+  *) :
+    enable_tex_synctex=no
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-tex-synctex=no' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-tex-synctex=no' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_tex_synctex" = xyes; then
   TEX_SYNCTEX_TRUE=
   TEX_SYNCTEX_FALSE='#'
 else
@@ -18329,7 +18393,16 @@ else
   ETEX_TRUE='#'
   ETEX_FALSE=
 fi
- if true; then
+
+case $enable_native_texlive_build:$enable_etex_synctex in #(
+  yes:yes | no:yes | no:no) :
+     ;; #(
+  *) :
+    enable_etex_synctex=yes
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-etex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-etex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_etex_synctex" = xyes; then
   ETEX_SYNCTEX_TRUE=
   ETEX_SYNCTEX_FALSE='#'
 else
@@ -18343,7 +18416,16 @@ else
   PTEX_TRUE='#'
   PTEX_FALSE=
 fi
- if false; then
+
+case $enable_native_texlive_build:$enable_ptex_synctex in #(
+  yes:yes | no:yes | no:no) :
+     ;; #(
+  *) :
+    enable_ptex_synctex=yes
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_ptex_synctex" = xyes; then
   PTEX_SYNCTEX_TRUE=
   PTEX_SYNCTEX_FALSE='#'
 else
@@ -18357,7 +18439,16 @@ else
   EPTEX_TRUE='#'
   EPTEX_FALSE=
 fi
- if false; then
+
+case $enable_native_texlive_build:$enable_eptex_synctex in #(
+  yes:yes | no:yes | no:no) :
+     ;; #(
+  *) :
+    enable_eptex_synctex=yes
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_eptex_synctex" = xyes; then
   EPTEX_SYNCTEX_TRUE=
   EPTEX_SYNCTEX_FALSE='#'
 else
@@ -18371,13 +18462,6 @@ else
   ALEPH_TRUE='#'
   ALEPH_FALSE=
 fi
- if false; then
-  ALEPH_SYNCTEX_TRUE=
-  ALEPH_SYNCTEX_FALSE='#'
-else
-  ALEPH_SYNCTEX_TRUE='#'
-  ALEPH_SYNCTEX_FALSE=
-fi
  if test "x$enable_pdftex" = xyes; then
   PDFTEX_TRUE=
   PDFTEX_FALSE='#'
@@ -18385,7 +18469,16 @@ else
   PDFTEX_TRUE='#'
   PDFTEX_FALSE=
 fi
- if true; then
+
+case $enable_native_texlive_build:$enable_pdftex_synctex in #(
+  yes:yes | no:yes | no:no) :
+     ;; #(
+  *) :
+    enable_pdftex_synctex=yes
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-pdftex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-pdftex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_pdftex_synctex" = xyes; then
   PDFTEX_SYNCTEX_TRUE=
   PDFTEX_SYNCTEX_FALSE='#'
 else
@@ -18399,13 +18492,6 @@ else
   LUATEX_TRUE='#'
   LUATEX_FALSE=
 fi
- if false; then
-  LUATEX_SYNCTEX_TRUE=
-  LUATEX_SYNCTEX_FALSE='#'
-else
-  LUATEX_SYNCTEX_TRUE='#'
-  LUATEX_SYNCTEX_FALSE=
-fi
  if test "x$enable_xetex" = xyes; then
   XETEX_TRUE=
   XETEX_FALSE='#'
@@ -18413,7 +18499,16 @@ else
   XETEX_TRUE='#'
   XETEX_FALSE=
 fi
- if true; then
+
+case $enable_native_texlive_build:$enable_xetex_synctex in #(
+  yes:yes | no:yes | no:no) :
+     ;; #(
+  *) :
+    enable_xetex_synctex=yes
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-xetex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-xetex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_xetex_synctex" = xyes; then
   XETEX_SYNCTEX_TRUE=
   XETEX_SYNCTEX_FALSE='#'
 else
@@ -19288,6 +19383,20 @@ else
 fi
 
 
+if test "x$enable_ptex:$enable_eptex" = xno:no; then :
+  enable_pweb_progs=no
+else
+  enable_pweb_progs=$enable_web_progs
+fi
+ if test "x$enable_pweb_progs" != xno; then
+  PWEB_TRUE=
+  PWEB_FALSE='#'
+else
+  PWEB_TRUE='#'
+  PWEB_FALSE=
+fi
+
+
 if test "x$with_system_kpathsea" = xyes; then
   if test "x$with_kpathsea_includes" = x; then
     list="/usr/include /usr/local/include"
@@ -20574,7 +20683,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Web2C config.lt 2011
+Web2C config.lt 2012/dev
 configured by $0, generated by GNU Autoconf 2.68.
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -22021,12 +22130,12 @@ if test "${with_system_xpdf+set}" = set; then :
   withval=$with_system_xpdf;
 fi
 if test "x$with_system_xpdf" = xyes; then
-  if $PKG_CONFIG poppler --atleast-version=0.10; then
+  if $PKG_CONFIG poppler --atleast-version=0.12; then
   POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
   XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
   XPDF_LIBS=`$PKG_CONFIG poppler --libs`
 elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
-  as_fn_error $? "did not find poppler-0.10 or better" "$LINENO" 5
+  as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5
 fi
 else
   XPDF_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf' | sed \
@@ -22056,7 +22165,7 @@ if test "x$with_system_poppler" = xyes; then
   POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
   POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
 elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
-  as_fn_error $? "did not find poppler-0.10 or better" "$LINENO" 5
+  as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5
 fi
 else
   POPPLER_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler' | sed \
@@ -22325,58 +22434,6 @@ ${top_srcdir}/../../libs/obsdcompat/*.[ch]:
 	cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 
 
-# Checks for xpdf (libpoppler) features.
-eval CPPFLAGS=\"$XPDF_INCLUDES \$CPPFLAGS\"
-eval LIBS=\"$XPDF_LIBS \$LIBS\"
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_link="./libtool --mode=link --tag=CXX $ac_link"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDFDoc::getPDFMajorVersion" >&5
-$as_echo_n "checking for PDFDoc::getPDFMajorVersion... " >&6; }
-if ${kpse_cv_have_getPDFMajorVersion+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <PDFDoc.h>
-int
-main ()
-{
-PDFDoc *pdfDoc; pdfDoc->getPDFMajorVersion();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  kpse_cv_have_getPDFMajorVersion=yes
-else
-  kpse_cv_have_getPDFMajorVersion=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_getPDFMajorVersion" >&5
-$as_echo "$kpse_cv_have_getPDFMajorVersion" >&6; }
-if test "x$kpse_cv_have_getPDFMajorVersion" = xyes; then :
-
-$as_echo "#define HAVE_GETPDFMAJORVERSION 1" >>confdefs.h
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_link="./libtool --mode=link --tag=CC $ac_link"
-
-CPPFLAGS=$kpse_save_CPPFLAGS
-LIBS=$kpse_save_LIBS
-
-
 ac_config_headers="$ac_config_headers w2c/c-auto.h:c-auto.in"
 
 
@@ -22930,10 +22987,6 @@ if test -z "${ALEPH_TRUE}" && test -z "${ALEPH_FALSE}"; then
   as_fn_error $? "conditional \"ALEPH\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ALEPH_SYNCTEX_TRUE}" && test -z "${ALEPH_SYNCTEX_FALSE}"; then
-  as_fn_error $? "conditional \"ALEPH_SYNCTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${PDFTEX_TRUE}" && test -z "${PDFTEX_FALSE}"; then
   as_fn_error $? "conditional \"PDFTEX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22946,10 +22999,6 @@ if test -z "${LUATEX_TRUE}" && test -z "${LUATEX_FALSE}"; then
   as_fn_error $? "conditional \"LUATEX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${LUATEX_SYNCTEX_TRUE}" && test -z "${LUATEX_SYNCTEX_FALSE}"; then
-  as_fn_error $? "conditional \"LUATEX_SYNCTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${XETEX_TRUE}" && test -z "${XETEX_FALSE}"; then
   as_fn_error $? "conditional \"XETEX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22986,6 +23035,10 @@ if test -z "${WEB_TRUE}" && test -z "${WEB_FALSE}"; then
   as_fn_error $? "conditional \"WEB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${PWEB_TRUE}" && test -z "${PWEB_FALSE}"; then
+  as_fn_error $? "conditional \"PWEB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 
 : "${CONFIG_STATUS=./config.status}"
@@ -23396,7 +23449,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 2011, which was
+This file was extended by Web2C $as_me 2012/dev, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23462,7 +23515,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 2011
+Web2C config.status 2012/dev
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index aaf79e4b6e1..ce16cc8baee 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -196,6 +196,11 @@ AM_CONDITIONAL([MP], [test "x$enable_mp" != xno])
 
 AM_CONDITIONAL([WEB], [test "x$enable_web_progs" != xno])
 
+AS_IF([test "x$enable_ptex:$enable_eptex" = xno:no],
+      [enable_pweb_progs=no],
+      [enable_pweb_progs=$enable_web_progs])
+AM_CONDITIONAL([PWEB], [test "x$enable_pweb_progs" != xno])
+
 dnl Although quite unusual, it is possible to build Web2C (TeX & Co)
 dnl using installed (system) kpathsea headers and library.
 dnl In that case we need the location of <kpathsea/paths.h>.
@@ -262,21 +267,6 @@ KPSE_TECKIT_FLAGS
 KPSE_ICU_XETEX_FLAGS([icule])
 KPSE_OBSDCOMPAT_FLAGS
 
-# Checks for xpdf (libpoppler) features.
-KPSE_ADD_FLAGS([xpdf])
-AC_LANG_PUSH([C++])
-AC_CACHE_CHECK([for PDFDoc::getPDFMajorVersion],
-               [kpse_cv_have_getPDFMajorVersion],
-               [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <PDFDoc.h>]],
-                                                   [[PDFDoc *pdfDoc; pdfDoc->getPDFMajorVersion();]])],
-                                  [kpse_cv_have_getPDFMajorVersion=yes],
-                                  [kpse_cv_have_getPDFMajorVersion=no])])
-AS_IF([test "x$kpse_cv_have_getPDFMajorVersion" = xyes],
-      [AC_DEFINE([HAVE_GETPDFMAJORVERSION], 1,
-                 [Define to 1 if class `PDFDoc' has the `getPDFMajorVersion' member.])])
-AC_LANG_POP([C++])
-KPSE_RESTORE_FLAGS
-
 dnl Write output here, instead of putting a zillion -D's on the command line.
 AC_CONFIG_HEADERS([w2c/c-auto.h:c-auto.in],
  [sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \
diff --git a/Build/source/texk/web2c/enctex.ch b/Build/source/texk/web2c/enctex.ch
index 45dbb8419b8..aff72073d0e 100644
--- a/Build/source/texk/web2c/enctex.ch
+++ b/Build/source/texk/web2c/enctex.ch
@@ -42,14 +42,14 @@ for i:=@'177 to @'377 do xchr[i]:=i;
 {Initialize enc\TeX\ data.}
 for i:=0 to 255 do mubyte_read[i]:=null;
 for i:=0 to 255 do mubyte_write[i]:=0;
-for i:=0 to 128 do mubyte_cswrite[i]:=null;
+for i:=0 to 127 do mubyte_cswrite[i]:=null;
 mubyte_keep := 0; mubyte_start := false;
 write_noexpanding := false; cs_converting := false;
 special_printing := false; message_printing := false;
 no_convert := false; active_noconvert := false;
 @z
 
-@x [5.59] l.1508FIXME -- enc\TeX\ modifications of |print|.
+@x [5.59] l.1508 FIXME -- enc\TeX\ modifications of |print|.
   else begin if selector>pseudo then
       begin print_char(s); return; {internal strings are not expanded}
       end;
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
index c6c972c5358..4ad7523d8ee 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog.TL
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
@@ -1,6 +1,16 @@
 ChangeLog.TL: TeX Live (TL) changes for e-pTeX
 ==============================================
 
+2011-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* eptex.defines: Add newline at end of file.
+
+2011-07-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/eptex.am (eptex_ch_srcs): SyncTeX infrastructure.
+	* pdfsavepos.ch: Slightly reformulate to simplify SyncTeX.
+	* eptrip/texmf.cnf (main_memory): Increase for SyncTeX.
+
 2011-04-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* eptex.ech: Adapted to pTeX Version p3.2.
diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am
index 60d77c6f11c..96dbd00955e 100644
--- a/Build/source/texk/web2c/eptexdir/am/eptex.am
+++ b/Build/source/texk/web2c/eptexdir/am/eptex.am
@@ -75,6 +75,7 @@ eptex_ch_srcs = \
 	ptexdir/ptex-base.ch \
 	eptexdir/eptex.ech \
 	eptexdir/etex.ch1 \
+	$(eptex_ch_synctex) \
 	eptexdir/fam256.ch \
 	eptexdir/pdfstrcmp.ch \
 	eptexdir/pdfsavepos.ch \
diff --git a/Build/source/texk/web2c/eptexdir/eptex.defines b/Build/source/texk/web2c/eptexdir/eptex.defines
index f3d1332f096..e1c1ee2756a 100644
--- a/Build/source/texk/web2c/eptexdir/eptex.defines
+++ b/Build/source/texk/web2c/eptexdir/eptex.defines
@@ -35,4 +35,4 @@
 @define function kcatcodekey ();
 
 @define function getintone ();
-@define procedure setintone ();
\ No newline at end of file
+@define procedure setintone ();
diff --git a/Build/source/texk/web2c/eptexdir/eptrip/texmf.cnf b/Build/source/texk/web2c/eptexdir/eptrip/texmf.cnf
index e7241a532b3..69e0c92edf8 100644
--- a/Build/source/texk/web2c/eptexdir/eptrip/texmf.cnf
+++ b/Build/source/texk/web2c/eptexdir/eptrip/texmf.cnf
@@ -7,7 +7,8 @@ half_error_line = 32
 max_print_line = 72
 		
 % e-pTeX.
-main_memory     = 3999 % can't change mem_bot, it stays 0
+mem_bot          =    1
+main_memory      = 4500
 max_strings     = 3300
 pool_size       = 36000
 
diff --git a/Build/source/texk/web2c/eptexdir/pdfsavepos.ch b/Build/source/texk/web2c/eptexdir/pdfsavepos.ch
index 2f364617abf..3c5b58f822b 100644
--- a/Build/source/texk/web2c/eptexdir/pdfsavepos.ch
+++ b/Build/source/texk/web2c/eptexdir/pdfsavepos.ch
@@ -53,11 +53,9 @@ pdf_page_height_code:   print_esc("pdfpageheight");
 
 @x
 @!old_setting:0..max_selector; {saved |selector| setting}
-begin if tracing_output>0 then
 @y
 @!old_setting:0..max_selector; {saved |selector| setting}
 @!t: scaled;
-begin if tracing_output>0 then
 @z
 
 @x
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 4ffd0c76b3b..ee8ec05b24e 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* texmfmp.c: Drop `#warning SyncTeX: -synctex command line...'.
+
 2011-05-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* texmfmp.c (ipcpage): Add 'free(cwd)'.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 4e4c62419ec..1cc014bd5de 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -622,7 +622,6 @@ maininit (int ac, string *av)
   kpse_record_output = recorder_record_output;
 
 #if defined(__SyncTeX__)
-# warning SyncTeX: -synctex command line option available
   /* 0 means "disable Synchronize TeXnology".
      synctexoption is a *.web variable.
      We initialize it to a weird value to catch the -synctex command line flag.
@@ -631,11 +630,6 @@ maininit (int ac, string *av)
      by the user.  */
 # define SYNCTEX_NO_OPTION INT_MAX
   synctexoption = SYNCTEX_NO_OPTION;
-#else
-# /* Omit warning for Aleph, pTeX, epTeX, and non-TeX.  */
-# if defined(TeX) && !defined(Aleph) && !defined(pTeX) && !defined(epTeX)
-#  warning SyncTeX: -synctex command line option NOT available
-# endif
 #endif
 
   /* If the user says --help or --version, we need to notice early.  And
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index b716eaf735b..1506e0b3d2a 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,4 +1,16 @@
+2011-06-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Reduce memory leaks.
+	* lua/lkpselib.c (do_lua_kpathsea_lookup): Free string no longer
+	used.
+
+2011-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	lua/lkpselib.c (find_dpi): Allow find_suffix() to return a
+	const string.
+
 2011-05-19  Taco Hoekwater  <taco@luatex.org>
+
 	* lua/ltexlib.c: fix a bug on negative catcode table arguments.
 	* luatex.c, NEWS: luatex is now version 0.70.1
 	* luatex_svnversion.h: updated to reflect latest luatex revision (4277)
diff --git a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c
index 2949fae16f1..7a54d138b64 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c
@@ -331,7 +331,7 @@ static int lua_kpathsea_var_value(lua_State * L)
 static unsigned find_dpi(const_string s)
 {
     unsigned dpi_number = 0;
-    string extension = find_suffix(s);
+    const_string extension = find_suffix(s);
 
     if (extension != NULL)
         sscanf(extension, "%u", &dpi_number);
@@ -622,13 +622,16 @@ static int do_lua_kpathsea_lookup(lua_State * L, kpathsea kpse, int idx)
         case kpse_any_glyph_format:
             {
                 kpse_glyph_file_type glyph_ret;
+                string temp = remove_suffix (name);
                 /* Try to extract the resolution from the name.  */
                 unsigned local_dpi = find_dpi(name);
                 if (!local_dpi)
                     local_dpi = (unsigned) dpi;
                 ret =
-                    kpathsea_find_glyph(kpse, remove_suffix(name), local_dpi,
+                    kpathsea_find_glyph(kpse, temp, local_dpi,
                                         fmt, &glyph_ret);
+                if (temp != name)
+                    free (temp);
             }
             break;
 
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index e6ebf36e44c..e154e64e33c 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pdftosrc.cc: Rewrite the Object Stream handling for poppler
+	(or xpdf without patch-40-objectStream-support-for-pdftosrc).
+
+	* pdftoepdf.cc: Replace `#ifdef HAVE_GETPDFMAJORVERSION' by
+	'#ifdef POPPLER_VERSION' for poppler >= 0.12.
+
 2011-05-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* writepng.c: #define PNG_FP_1 for libpng < 1.5.0.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
index a5e8d3f79a8..e0981022485 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -717,7 +717,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
     PdfDocument *pdf_doc;
     Page *page;
     PDFRectangle *pagebox;
-#ifdef HAVE_GETPDFMAJORVERSION
+#ifdef POPPLER_VERSION
     int pdf_major_version_found, pdf_minor_version_found;
 #else
     float pdf_version_found, pdf_version_wanted;
@@ -736,7 +736,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
     // this works only for PDF 1.x -- but since any versions of PDF newer
     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
     // then have to changed drastically anyway.
-#ifdef HAVE_GETPDFMAJORVERSION
+#ifdef POPPLER_VERSION
     pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
     pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
     if ((pdf_major_version_found > 1)
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
index a6debc4acc5..85021303cb5 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
@@ -40,6 +40,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Object.h"
 #include "Stream.h"
+#include "Lexer.h"
+#include "Parser.h"
 #include "Array.h"
 #include "Dict.h"
 #include "XRef.h"
@@ -149,7 +151,39 @@ int main(int argc, char *argv[])
                         (e->type == xrefEntryFree ? "f" : "n"));
             else {              // e->offset is the object number of the object stream
 #ifdef POPPLER_VERSION
-                fprintf(stderr, "warning: this version of pdftosrc doesn't support object stream (use pdftosrc from TeX Live if you need it)\n");
+                Stream *str;
+                Parser *parser;
+                Object objStr, obj1, obj2;
+                int nObjects, first, n;
+                int localOffset = 0;
+                Guint firstOffset;
+
+                assert(xref->fetch(e->offset, 0, &objStr)->isStream());
+                nObjects = objStr.streamGetDict()->lookup("N", &obj1)->getInt();
+                obj1.free();
+                first = objStr.streamGetDict()->lookup("First", &obj1)->getInt();
+                obj1.free();
+                firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
+
+                // parse the header: object numbers and offsets
+                objStr.streamReset();
+                obj1.initNull();
+                str = new EmbedStream(objStr.getStream(), &obj1, gTrue, first);
+                parser = new Parser(xref, new Lexer(xref, str), gFalse);
+                for (n = 0; n < nObjects; ++n) {
+                    parser->getObj(&obj1);
+                    parser->getObj(&obj2);
+                    if (n == e->gen)
+                        localOffset = obj2.getInt();
+                    obj1.free();
+                    obj2.free();
+                }
+                while (str->getChar() != EOF) ;
+                delete parser;
+                objStr.free();
+
+                fprintf(outfile, "%.10lu 00000 n\n",
+                        (long unsigned)(firstOffset + localOffset));
 #else
                 // e->gen is the local index inside that object stream
                 //int objStrOffset = xref->getEntry(e->offset)->offset;
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 7c7790a62e8..37600573f4d 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,15 @@
+2011-07-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/ptex.am (pweb_tests): New variable for tests of pTeX
+	related Web programs (split off ptex_tests).
+
+	* ptrip/texmf.cnf (main_memory): Increase for SyncTeX.
+
+2011-06-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/ptex.am (ptex_ch_srcs): SyncTeX infrastructure.
+	* ptex-base.ch: Slightly reformulate to simplify SyncTeX.
+
 2011-04-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Avoid 'differ in signedness' warnings.
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index 9a989dd1647..51c38bdf5f2 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -1,6 +1,6 @@
 ## texk/web2c/ptexdir/am/ptex.am: Makefile fragment for pTeX.
 ##
-## Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2010-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
@@ -11,14 +11,14 @@ pweb_programs = pbibtex pdvitype ppltotf ptftopl
 
 # pTeX Tests
 #
-ptex_tests = \
+ptex_tests = ptexdir/ptrip.test
+pweb_tests = \
 	ptexdir/pbibtex.test \
 	ptexdir/pdvitype.test \
 	ptexdir/ppltotf.test \
-	ptexdir/ptftopl.test \
-	ptexdir/ptrip.test
+	ptexdir/ptftopl.test
 
-EXTRA_DIST += $(ptex_tests)
+EXTRA_DIST += $(ptex_tests) $(pweb_tests)
 DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \
 	$(pweb_programs:=.p) $(pweb_programs:=-web2c) $(pweb_programs:=.web)
 
@@ -41,10 +41,10 @@ libkanji_a_CPPFLAGS = $(ptex_cppflags)
 ##
 if PTEX
 bin_PROGRAMS += ptex
-if WEB
-bin_PROGRAMS += $(pweb_programs)
-endif WEB
 endif PTEX
+if PWEB
+bin_PROGRAMS += $(pweb_programs)
+endif PWEB
 EXTRA_PROGRAMS += ptex $(pweb_programs)
 
 ptex_CPPFLAGS = $(ptex_cppflags)
@@ -93,6 +93,7 @@ ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
 	$(tie) -c ptex.ch ptex.web $(ptex_ch_srcs)
 ptex_ch_srcs = \
 	ptexdir/ptex-base.ch \
+	$(ptex_ch_synctex) \
 	tex-binpool.ch
 
 EXTRA_DIST += $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines
@@ -116,8 +117,8 @@ pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
 	$(tie) -m pbibtex.web bibtex.web bibtex.ch
 EXTRA_DIST += ptexdir/pbibtex.ch web2c/cvtbib.sed
 
-ptex_tests += ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl
-ptex_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
+pweb_tests += ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl
+pweb_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
 
 ## pDVItype
 ## 
@@ -135,7 +136,7 @@ pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
 	$(tie) -m pdvitype.web dvitype.web dvitype.ch
 EXTRA_DIST += ptexdir/pdvitype.ch
 
-ptex_tests += ptexdir/sample.test
+pweb_tests += ptexdir/sample.test
 
 ## pPLtoTF
 ## 
@@ -169,7 +170,7 @@ ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
 	$(tie) -m ptftopl.web tftopl.web tftopl.ch
 EXTRA_DIST += ptexdir/ptftopl.ch
 
-ptex_tests += ptexdir/yokotate.test
+pweb_tests += ptexdir/yokotate.test
 
 ## 
 EXTRA_DIST += \
@@ -186,6 +187,9 @@ check_PROGRAMS += dvitype pltotf tftopl
 TRIPTRAP += ptrip.diffs
 TRIPTRAP_CLEAN += ptrip-clean
 endif PTEX
+if PWEB
+TESTS += $(pweb_tests)
+endif PWEB
 
 ## Test data and results
 ##
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index acbcf143a81..051df8a7fce 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -673,37 +673,32 @@ end
 @x [13.202] l.4056 - pTeX:
     kern_node,math_node,penalty_node: do_nothing;
 @y
-    kern_node,disp_node,math_node,penalty_node: do_nothing;
+    disp_node,
+    kern_node,math_node,penalty_node: do_nothing;
 @z
 
 @x [14.206] l.4121 - pTeX: space_ptr, xspace_ptr, dir_node, disp_node
 @ @<Case statement to copy...@>=
-case type(p) of
+@y
+@ @<Case statement to copy...@>=
+@z
+@x [14.206] l.4123
 hlist_node,vlist_node,unset_node: begin r:=get_node(box_node_size);
   mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
-  list_ptr(r):=copy_node_list(list_ptr(p)); {this affects |mem[r+5]|}
-  words:=5;
-  end;
-rule_node: begin r:=get_node(rule_node_size); words:=rule_node_size;
-  end;
+@y
+dir_node,
+hlist_node,vlist_node,unset_node: begin r:=get_node(box_node_size);
+  mem[r+7]:=mem[p+7];
+  mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last three words}
+  add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
+@z
+@x [14.206] l.4130
 ins_node: begin r:=get_node(ins_node_size); mem[r+4]:=mem[p+4];
   add_glue_ref(split_top_ptr(p));
   ins_ptr(r):=copy_node_list(ins_ptr(p)); {this affects |mem[r+4]|}
   words:=ins_node_size-1;
   end;
 @y
-@ @<Case statement to copy...@>=
-case type(p) of
-hlist_node,vlist_node,dir_node,unset_node:
-  begin r:=get_node(box_node_size);
-  mem[r+7]:=mem[p+7];
-  mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last three words}
-  add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
-  list_ptr(r):=copy_node_list(list_ptr(p)); {this affects |mem[r+5]|}
-  words:=5;
-  end;
-rule_node: begin r:=get_node(rule_node_size); words:=rule_node_size;
-  end;
 ins_node: begin r:=get_node(ins_node_size);
   mem[r+5]:=mem[p+5]; mem[r+4]:=mem[p+4];
   add_glue_ref(split_top_ptr(p));
@@ -714,12 +709,9 @@ ins_node: begin r:=get_node(ins_node_size);
 
 @x [14.206] l.4140 - pTeX: disp_node
 kern_node,math_node,penalty_node: begin r:=get_node(small_node_size);
-  words:=small_node_size;
-  end;
 @y
-kern_node,disp_node,math_node,penalty_node:
-  begin r:=get_node(small_node_size); words:=small_node_size;
-  end;
+disp_node,
+kern_node,math_node,penalty_node: begin r:=get_node(small_node_size);
 @z
 
 @x [15.207] l.4201 - pTeX: Add kanji, kana, other_kchar category codes.
@@ -2568,10 +2560,10 @@ fget; read_sixteen(nk);
 fget; read_sixteen(ne);
 fget; read_sixteen(np);
 if jfm_flag<>dir_default then
-  begin if lf<>7+lh+nt+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort
+  begin if lf<>7+lh+nt+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort;
   end
 else
-  begin if lf<>6+lh+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort
+  begin if lf<>6+lh+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort;
   end;
 if (nw=0)or(nh=0)or(nd=0)or(ni=0) then abort;
 end
diff --git a/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf b/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf
index 79e15b44a37..b6f41d3b62c 100644
--- a/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf
+++ b/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf
@@ -8,7 +8,7 @@ max_print_line = 72
 		
 % pTeX.
 mem_bot          =    1
-main_memory      = 3500
+main_memory      = 4500
 max_strings      = 3000
 pool_size        = 40000
 
diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog
index dc50ff4f15e..16be9296d5a 100644
--- a/Build/source/texk/web2c/synctexdir/ChangeLog
+++ b/Build/source/texk/web2c/synctexdir/ChangeLog
@@ -1,3 +1,21 @@
+2011-07-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	SyncTeX infrastructure for pTeX and e-pTeX.
+	* synctex-ptex.h, synctex-p-{mem,rec}.ch[01] (all new):
+	Additional files for pTeX.
+	* synctex-eptex.h, synctex-ep-{mem.ch[01],rec.ch1 (all new):
+	Additional files for e-pTeX.
+	* am/synctex.am: Adapt
+
+	* synctex.c: Drop `#warning These structures MUST be kept...'.
+
+2011-06-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* synctex-{,e}tex.h: Drop the `#warning SyncTeX for *TeX'.
+	* synctex-{,e,pdf,xe}tex.h: Move the default definition of
+	SYNCTEX_GET_CURRENT_NAME for here ...
+	* synctex.c: ... to here.
+
 2011-06-11  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* synctex_parser_utils.c: fix a typo.
diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am
index afc6bd05667..bd7de749b46 100644
--- a/Build/source/texk/web2c/synctexdir/am/synctex.am
+++ b/Build/source/texk/web2c/synctexdir/am/synctex.am
@@ -1,6 +1,6 @@
 ## texk/web2c/synctexdir/am/synctex.am: Makefile fragment for SyncTeX.
 ##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## The SyncTeX tool
@@ -108,6 +108,78 @@ EXTRA_DIST += \
 	synctexdir/synctex-e-rec.ch0 \
 	synctexdir/synctex-e-rec.ch1
 
+## SyncTeX infrastructure: pTeX
+
+if PTEX_SYNCTEX
+
+ptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+ptex_LDADD += $(ZLIB_LIBS)
+ptex_prereq += $(ZLIB_DEPEND)
+
+ptex_ch_synctex = \
+	synctexdir/synctex-p-mem.ch0 \
+	synctexdir/synctex-mem.ch0 \
+	synctexdir/synctex-mem.ch1 \
+	synctexdir/synctex-p-mem.ch1 \
+	synctexdir/synctex-p-rec.ch0 \
+	synctexdir/synctex-rec.ch0 \
+	synctexdir/synctex-rec.ch1 \
+	synctexdir/synctex-rec.ch2 \
+	synctexdir/synctex-p-rec.ch1
+
+dist_ptex_SOURCES += \
+	synctexdir/synctex.c \
+	synctexdir/synctex.h \
+	synctexdir/synctex-common.h \
+	synctexdir/synctex-ptex.h
+
+ptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
+
+endif PTEX_SYNCTEX
+
+EXTRA_DIST += \
+	synctexdir/synctex-p-mem.ch0 \
+	synctexdir/synctex-p-mem.ch1 \
+	synctexdir/synctex-p-rec.ch0 \
+	synctexdir/synctex-p-rec.ch1
+
+## SyncTeX infrastructure: e-pTeX
+
+if EPTEX_SYNCTEX
+
+eptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+eptex_LDADD += $(ZLIB_LIBS)
+eptex_prereq += $(ZLIB_DEPEND)
+
+eptex_ch_synctex = \
+	synctexdir/synctex-ep-mem.ch0 \
+	synctexdir/synctex-mem.ch0 \
+	synctexdir/synctex-mem.ch1 \
+	synctexdir/synctex-e-mem.ch0 \
+	synctexdir/synctex-ep-mem.ch1 \
+	synctexdir/synctex-p-rec.ch0 \
+	synctexdir/synctex-rec.ch0 \
+	synctexdir/synctex-rec.ch1 \
+	synctexdir/synctex-ep-rec.ch1 \
+	synctexdir/synctex-p-rec.ch1
+
+dist_eptex_SOURCES += \
+	synctexdir/synctex.c \
+	synctexdir/synctex.h \
+	synctexdir/synctex-common.h \
+	synctexdir/synctex-eptex.h
+
+eptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
+
+endif EPTEX_SYNCTEX
+
+EXTRA_DIST += \
+	synctexdir/synctex-ep-mem.ch0 \
+	synctexdir/synctex-ep-mem.ch1 \
+	synctexdir/synctex-ep-rec.ch1
+
 ## SyncTeX infrastructure: pdfTeX
 
 if PDFTEX_SYNCTEX
diff --git a/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch0 b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch0
new file mode 100644
index 00000000000..80d71cfe1cd
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch0
@@ -0,0 +1,25 @@
+@x tex.web l.2897
+@d box_node_size=8 {number of words to allocate for a box node}
+@y
+@d box_node_size=7 {number of words to allocate for a box node}
+@z
+
+@x tex.web l.3937
+    disp_node,
+@y
+    disp_node: do_nothing;
+@z
+
+@x tex.web l.4021:
+disp_node,
+@y
+disp_node: begin r:=get_node(small_node_size);
+  words:=small_node_size;
+  end;
+@z
+
+@x tex.web l. 24956
+@* \[54/p\TeX] System-dependent changes for p\TeX.
+@y
+@* \[54] System-dependent changes.
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch1 b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch1
new file mode 100644
index 00000000000..8747294c42e
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-ep-mem.ch1
@@ -0,0 +1,23 @@
+@x tex.web l.2897
+@d box_node_size=7+synctex_field_size {number of words to allocate for a box node}
+@y
+@d box_node_size=8+synctex_field_size {number of words to allocate for a box node}
+@z
+
+@x tex.web l.4912 + synctex-mem.ch0
+@d REMOVE ME IF synctex_code is properly defined
+@y
+@z
+
+@x tex.web l.4960 + tex.ch
+@d tex_int_pars=60 {total number of \TeX's integer parameters}
+@y
+@d synctex_code=60
+@d tex_int_pars=synctex_code+1 {total number of \TeX's integer parameters}
+@z
+
+@x tex.web l. 24956
+@* \[54] System-dependent changes.
+@y
+@* \[54/p\TeX] System-dependent changes for p\TeX.
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-ep-rec.ch1 b/Build/source/texk/web2c/synctexdir/synctex-ep-rec.ch1
new file mode 100644
index 00000000000..8535418e19d
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-ep-rec.ch1
@@ -0,0 +1,16 @@
+@x tex.web l.12378
+kern_node:cur_h:=cur_h+width(p);
+@y
+kern_node: begin
+  @<Record |kern_node| {\sl Sync\TeX} information@>;
+  cur_h:=cur_h+width(p);
+end;
+@z
+
+@x tex.web: Handle a math node in |hlist_out
+  cur_h:=cur_h+width(p);
+@y
+  @<Record |math_node| {\sl Sync\TeX} information@>;
+  cur_h:=cur_h+width(p);
+@z
+
diff --git a/Build/source/texk/web2c/synctexdir/synctex-eptex.h b/Build/source/texk/web2c/synctexdir/synctex-eptex.h
new file mode 100644
index 00000000000..dbc9c872798
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-eptex.h
@@ -0,0 +1,57 @@
+/* 
+Copyright (c) 2011 jerome DOT laurens AT u-bourgogne DOT fr
+
+This file is part of the SyncTeX package.
+
+Latest Revision: Wed Jun 30 11:00:00 UTC 2011
+
+License:
+--------
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE
+
+Except as contained in this notice, the name of the copyright holder  
+shall not be used in advertising or otherwise to promote the sale,  
+use or other dealings in this Software without prior written  
+authorization from the copyright holder.
+
+Acknowledgments:
+----------------
+The author received useful remarks from the pdfTeX developers, especially Hahn The Thanh,
+and significant help from XeTeX developer Jonathan Kew
+
+Nota Bene:
+----------
+If you include or use a significant part of the synctex package into a software,
+I would appreciate to be listed as contributor and see "SyncTeX" highlighted.
+
+Version 1
+Thu Jun 30 11:00:00 UTC 2011
+
+*/
+
+#include "eptexd.h"
+
+#define box_node_size (8+synchronization_field_size)
+
+#define rule_node 3
+#define glue_node 12
+#define kern_node 13
diff --git a/Build/source/texk/web2c/synctexdir/synctex-etex.h b/Build/source/texk/web2c/synctexdir/synctex-etex.h
index 4b80f1da0bb..faca1be7a2d 100644
--- a/Build/source/texk/web2c/synctexdir/synctex-etex.h
+++ b/Build/source/texk/web2c/synctexdir/synctex-etex.h
@@ -48,8 +48,4 @@ Thu Jun 19 09:39:21 UTC 2008
 
 */
 
-#    warning SyncTeX for eTeX
-
-#    include "etexd.h"
-
-#define SYNCTEX_GET_CURRENT_NAME() generic_synctex_get_current_name()
+#include "etexd.h"
diff --git a/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch0 b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch0
new file mode 100644
index 00000000000..e4fd4a9f504
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch0
@@ -0,0 +1,25 @@
+@x tex.web l.2897
+@d box_node_size=8 {number of words to allocate for a box node}
+@y
+@d box_node_size=7 {number of words to allocate for a box node}
+@z
+
+@x tex.web l.3937
+    disp_node,
+@y
+    disp_node: do_nothing;
+@z
+
+@x tex.web l.4021:
+disp_node,
+@y
+disp_node: begin r:=get_node(small_node_size);
+  words:=small_node_size;
+  end;
+@z
+
+@x tex.web l. 24956
+@* \[55/p\TeX] System-dependent changes for p\TeX.
+@y
+@* \[54] System-dependent changes.
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch1 b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch1
new file mode 100644
index 00000000000..3d47ed82b3b
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-p-mem.ch1
@@ -0,0 +1,23 @@
+@x tex.web l.2897
+@d box_node_size=7+synctex_field_size {number of words to allocate for a box node}
+@y
+@d box_node_size=8+synctex_field_size {number of words to allocate for a box node}
+@z
+
+@x tex.web l.4912 + synctex-mem.ch0
+@d REMOVE ME IF synctex_code is properly defined
+@y
+@z
+
+@x tex.web l.4960 + tex.ch
+@d int_pars=60 {total number of integer parameters}
+@y
+@d synctex_code=60
+@d int_pars=synctex_code+1 {total number of integer parameters}
+@z
+
+@x tex.web l. 24956
+@* \[54] System-dependent changes.
+@y
+@* \[55/p\TeX] System-dependent changes for p\TeX.
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch0 b/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch0
new file mode 100644
index 00000000000..b2c1bf8a73c
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch0
@@ -0,0 +1,5 @@
+@x tex.web l.12533
+left_edge:=cur_h; cur_v:=cur_v-height(this_box);
+@y
+save_loc:=dvi_offset+dvi_ptr; left_edge:=cur_h; cur_v:=cur_v-height(this_box);
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch1 b/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch1
new file mode 100644
index 00000000000..56a63cec885
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-p-rec.ch1
@@ -0,0 +1,19 @@
+@x tex.web l.12394
+  @<Record void list {\sl Sync\TeX} information@>;
+@y
+  if type(p)<>dir_node then
+    @<Record void list {\sl Sync\TeX} information@>;
+@z
+
+@x tex.web l.12533
+save_loc:=dvi_offset+dvi_ptr; left_edge:=cur_h;
+@y
+left_edge:=cur_h;
+@z
+
+@x tex.web l.12569
+  @<Record void list {\sl Sync\TeX} information@>;
+@y
+  if type(p)<>dir_node then
+    @<Record void list {\sl Sync\TeX} information@>;
+@z
diff --git a/Build/source/texk/web2c/synctexdir/synctex-pdftex.h b/Build/source/texk/web2c/synctexdir/synctex-pdftex.h
index cc8a5c33efa..7c7251d742b 100644
--- a/Build/source/texk/web2c/synctexdir/synctex-pdftex.h
+++ b/Build/source/texk/web2c/synctexdir/synctex-pdftex.h
@@ -56,4 +56,3 @@ Thu Jun 19 09:39:21 UTC 2008
  *   the synctex_sheet function below, in the including synctex.c file.  */
 #    define SYNCTEX_OFFSET_IS_PDF (pdfoutputvalue>0)
 #    define SYNCTEX_OUTPUT ((pdfoutputvalue>0)?"pdf":"dvi")
-#    define SYNCTEX_GET_CURRENT_NAME() generic_synctex_get_current_name()
diff --git a/Build/source/texk/web2c/synctexdir/synctex-ptex.h b/Build/source/texk/web2c/synctexdir/synctex-ptex.h
new file mode 100644
index 00000000000..3a67d9f210c
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-ptex.h
@@ -0,0 +1,57 @@
+/* 
+Copyright (c) 2011 jerome DOT laurens AT u-bourgogne DOT fr
+
+This file is part of the SyncTeX package.
+
+Latest Revision: Wed Jun 30 11:00:00 UTC 2011
+
+License:
+--------
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE
+
+Except as contained in this notice, the name of the copyright holder  
+shall not be used in advertising or otherwise to promote the sale,  
+use or other dealings in this Software without prior written  
+authorization from the copyright holder.
+
+Acknowledgments:
+----------------
+The author received useful remarks from the pdfTeX developers, especially Hahn The Thanh,
+and significant help from XeTeX developer Jonathan Kew
+
+Nota Bene:
+----------
+If you include or use a significant part of the synctex package into a software,
+I would appreciate to be listed as contributor and see "SyncTeX" highlighted.
+
+Version 1
+Thu Jun 30 11:00:00 UTC 2011
+
+*/
+
+#include "ptexd.h"
+
+#define box_node_size (8+synchronization_field_size)
+
+#define rule_node 3
+#define glue_node 12
+#define kern_node 13
diff --git a/Build/source/texk/web2c/synctexdir/synctex-tex.h b/Build/source/texk/web2c/synctexdir/synctex-tex.h
index b026b9242c2..c1ca933c586 100644
--- a/Build/source/texk/web2c/synctexdir/synctex-tex.h
+++ b/Build/source/texk/web2c/synctexdir/synctex-tex.h
@@ -48,8 +48,4 @@ Thu Jun 19 09:39:21 UTC 2008
 
 */
 
-#  warning SyncTeX for TeX
-
-#  include "texd.h"
-
-#  define SYNCTEX_GET_CURRENT_NAME() generic_synctex_get_current_name()
+#include "texd.h"
diff --git a/Build/source/texk/web2c/synctexdir/synctex-xetex.h b/Build/source/texk/web2c/synctexdir/synctex-xetex.h
index a34a5dd8ffa..9c80d259088 100644
--- a/Build/source/texk/web2c/synctexdir/synctex-xetex.h
+++ b/Build/source/texk/web2c/synctexdir/synctex-xetex.h
@@ -68,4 +68,3 @@ Thu Jun 19 09:39:21 UTC 2008
                 mem[NODE+TYPE##_node_size-synchronization_field_size].hh.lhfield
 #  define SYNCTEX_LINE_MODEL(NODE,TYPE)\
                 mem[NODE+TYPE##_node_size-synchronization_field_size].hh.rh
-#  define SYNCTEX_GET_CURRENT_NAME() generic_synctex_get_current_name()
diff --git a/Build/source/texk/web2c/synctexdir/synctex.c b/Build/source/texk/web2c/synctexdir/synctex.c
index 04da2c2bb2b..6e3c457a711 100644
--- a/Build/source/texk/web2c/synctexdir/synctex.c
+++ b/Build/source/texk/web2c/synctexdir/synctex.c
@@ -153,7 +153,6 @@
  *  and *tex.web for details, the synctex_ prefix prevents name conflicts, it
  *  is some kind of namespace
  */
-#   warning These structures MUST be kept in synchronization with the main program
 /*  synctexoption is a global integer variable defined in *tex.web
  *  it is set to 1 by texmfmp.c if the command line has the '-synctex=1'
  *  option.  */
@@ -303,7 +302,7 @@ mem[NODE+TYPE##_node_size-synchronization_field_size+1].cint
 #       define SYNCTEX_CURRENT_TAG (curinput.synctextagfield)
 #   endif
 #   if !defined(SYNCTEX_GET_CURRENT_NAME)
-#       define SYNCTEX_GET_CURRENT_NAME() (gettexstring(curinput.namefield))
+#       define SYNCTEX_GET_CURRENT_NAME() generic_synctex_get_current_name()
 #   endif
 #   if !defined(SYNCTEX_GET_TOTAL_PAGES)
 #       define SYNCTEX_GET_TOTAL_PAGES() (totalpages)
diff --git a/Build/source/texk/web2c/texmfmp-help.h b/Build/source/texk/web2c/texmfmp-help.h
index 0353eb2d4e4..b8242269e8e 100644
--- a/Build/source/texk/web2c/texmfmp-help.h
+++ b/Build/source/texk/web2c/texmfmp-help.h
@@ -122,6 +122,9 @@ const_string EPTEXHELP[] = {
     "-src-specials=WHERE     insert source specials in certain places of",
     "                          the DVI file. WHERE is a comma-separated value",
     "                          list: cr display hbox math par parend vbox",
+#if defined(__SyncTeX__)
+    "-synctex=NUMBER         generate SyncTeX data for previewers if nonzero",
+#endif
     "-translate-file=TCXNAME use the TCX file TCXNAME",
     "-help                   print this message and exit.",
     "-version                print version information and exit.",
@@ -346,6 +349,9 @@ const_string PTEXHELP[] = {
     "-src-specials=WHERE     insert source specials in certain places of",
     "                          the DVI file. WHERE is a comma-separated value",
     "                          list: cr display hbox math par parend vbox",
+#if defined(__SyncTeX__)
+    "-synctex=NUMBER         generate SyncTeX data for previewers if nonzero",
+#endif
     "-translate-file=TCXNAME use the TCX file TCXNAME",
     "-help                   print this message and exit.",
     "-version                print version information and exit.",
diff --git a/Build/source/texk/web2c/web2c/configure b/Build/source/texk/web2c/web2c/configure
index f476383b9fd..aa8e274b621 100755
--- a/Build/source/texk/web2c/web2c/configure
+++ b/Build/source/texk/web2c/web2c/configure
@@ -12633,39 +12633,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 24bb3d9c8bb..36852f4ad82 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,14 @@
+2011-07-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* xetex.ch: Fix an off-by-one bug initializing mubyte_cswrite.
+	From Roderich Schupp <roderich.schupp@googlemail.com>,
+	Debian Bug#633011, tex-k mail Fri, 8 Jul 2011 15:56:23.
+
+2011-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* XeTeX_ext.c, pdfimage.cpp, am/xetex.am: Always use poppler
+	instead of xpdf.
+
 2011-04-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Avoid 'differ in signedness' warnings.
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index 1650e762e7e..3362adb0cd1 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -39,14 +39,7 @@ authorization from the copyright holders.
 #include <kpathsea/config.h>
 
 #ifdef XETEX_OTHER
-#ifdef POPPLER_VERSION
-#define xpdfVersion POPPLER_VERSION
-#define xpdfString "poppler"
 #include "poppler-config.h"
-#else
-#define xpdfString "xpdf"
-#include "xpdf/config.h"
-#endif
 #include "png.h"
 #endif
 
@@ -201,7 +194,7 @@ void initversionstring(char **versions)
 #else
 		"Compiled with fontconfig version %d.%d.%d; using %d.%d.%d\n"
 		"Compiled with libpng version %s; using %s\n"
-		"Compiled with %s version %s\n"
+		"Compiled with poppler version %s\n"
 #endif
 		;
 
@@ -212,8 +205,7 @@ void initversionstring(char **versions)
 #ifdef XETEX_OTHER
 			+ strlen(PNG_LIBPNG_VER_STRING)
 			+ strlen(png_libpng_ver)
-			+ strlen(xpdfString)
-			+ strlen(xpdfVersion)
+			+ strlen(POPPLER_VERSION)
 			+ 6 * 3 /* for fontconfig version #s (won't really need 3 digits per field!) */
 #endif
 			+ 6 * 3; /* for freetype version #s (ditto) */
@@ -237,8 +229,7 @@ void initversionstring(char **versions)
 		,
 		FC_VERSION / 10000, (FC_VERSION % 10000) / 100, FC_VERSION % 100,
 		fc_version / 10000, (fc_version % 10000) / 100, fc_version % 100,
-		PNG_LIBPNG_VER_STRING, png_libpng_ver,
-		xpdfString, xpdfVersion
+		PNG_LIBPNG_VER_STRING, png_libpng_ver, POPPLER_VERSION
 #endif
 		);
 }
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 19b805736a6..db2960f187d 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -1,6 +1,6 @@
 ## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX.
 ##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## XeTeX
@@ -37,9 +37,9 @@ libxetex += libxetexmm.a
 else !XETEX_MACOSX
 
 xetex_cppflags += -DXETEX_OTHER
-xetex_cppflags += $(XPDF_INCLUDES) $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-xetex_ldadd += $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-xetex_dependencies += $(XPDF_DEPEND) $(LIBPNG_DEPEND)
+xetex_cppflags += $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
+xetex_ldadd += $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
+xetex_dependencies += $(POPPLER_DEPEND) $(LIBPNG_DEPEND)
 
 endif !XETEX_MACOSX
 
diff --git a/Build/source/texk/web2c/xetexdir/pdfimage.cpp b/Build/source/texk/web2c/xetexdir/pdfimage.cpp
index af2a10686aa..126d62ae2ca 100644
--- a/Build/source/texk/web2c/xetexdir/pdfimage.cpp
+++ b/Build/source/texk/web2c/xetexdir/pdfimage.cpp
@@ -32,16 +32,11 @@ authorization from the copyright holders.
 
 #include "pdfimage.h"
 
-#ifdef POPPLER_VERSION
 #include <dirent.h>
 #include <poppler-config.h>
 #include <goo/GooString.h>
 #include <goo/gmem.h>
 #include <goo/gfile.h>
-#define GString GooString
-#else
-#include "goo/GString.h"
-#endif
 
 #include "PDFDoc.h"
 #include "Catalog.h"
@@ -60,7 +55,7 @@ int
 pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
 	/* return the box converted to TeX points */
 {
-	GString*	name = new GString(filename);
+	GooString*	name = new GooString(filename);
 	PDFDoc*		doc = new PDFDoc(name);
 	
 	if (!doc) {
@@ -119,7 +114,7 @@ int
 pdf_count_pages(char* filename)
 {
 	int			pages = 0;
-	GString*	name = new GString(filename);
+	GooString*	name = new GooString(filename);
 	PDFDoc*		doc = new PDFDoc(name);
 	
 	if (!doc) {
diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch
index 0139d24e8bb..562da5393b0 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.ch
+++ b/Build/source/texk/web2c/xetexdir/xetex.ch
@@ -328,7 +328,7 @@ for i:=@'177 to @'377 do xchr[i]:=i;
 {Initialize enc\TeX\ data.}
 for i:=0 to 255 do mubyte_read[i]:=null;
 for i:=0 to 255 do mubyte_write[i]:=0;
-for i:=0 to 128 do mubyte_cswrite[i]:=null;
+for i:=0 to 127 do mubyte_cswrite[i]:=null;
 mubyte_keep := 0; mubyte_start := false;
 write_noexpanding := false; cs_converting := false;
 special_printing := false; message_printing := false;
diff --git a/Build/source/texk/xdv2pdf/configure b/Build/source/texk/xdv2pdf/configure
index 4a9ebf3697b..73796ae8910 100755
--- a/Build/source/texk/xdv2pdf/configure
+++ b/Build/source/texk/xdv2pdf/configure
@@ -763,7 +763,6 @@ with_sysroot
 enable_libtool_lock
 enable_largefile
 enable_compiler_warnings
-with_gnu_ld
 with_system_kpathsea
 with_kpathsea_includes
 with_kpathsea_libdir
@@ -777,19 +776,12 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-CPPFLAGS
 CXX
 CXXFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
 CCC
 CXXCPP
 OBJC
-OBJCFLAGS
-LDFLAGS
-LIBS
-OBJC'
+OBJCFLAGS'
 
 
 # Initialize some variables set by options.
@@ -12649,39 +12641,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -16289,26 +16284,32 @@ $as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
 if ${kpse_cv_warning_cxxflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GXX" = xyes; then
   kpse_cv_warning_cxxflags=
-elif test "x$GXX" = xyes; then
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type"
-case `$CXX -dumpversion` in #(
+  case `$CXX -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings"
-  fi
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+      fi
     fi
+  fi
 fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
 else
   kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
 fi
@@ -16698,39 +16699,42 @@ $as_echo_n "checking what warning flags to pass to the Objective C compiler... "
 if ${kpse_cv_warning_objcflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GOBJC" = xyes; then
   kpse_cv_warning_objcflags=
-elif test "x$GOBJC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_objcflags="-Wimplicit -Wreturn-type"
-case `$OBJC -dumpversion` in #(
+  case `$OBJC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_objcflags="$kpse_cv_warning_objcflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$OBJC -dumpversion` in #(
+  case `$OBJC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_objcflags="$kpse_cv_warning_objcflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_objcflags="-Wall -Wunused $kpse_cv_warning_objcflags"
-  kpse_cv_warning_objcflags="$kpse_cv_warning_objcflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_objcflags="$kpse_cv_warning_objcflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_objcflags="$kpse_cv_warning_objcflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$OBJC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_objcflags="-Wall -Wunused $kpse_cv_warning_objcflags"
+    kpse_cv_warning_objcflags="$kpse_cv_warning_objcflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_objcflags="$kpse_cv_warning_objcflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_objcflags="$kpse_cv_warning_objcflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$OBJC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_objcflags="$kpse_cv_warning_objcflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_objcflags="$kpse_cv_warning_objcflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_objcflags="$kpse_cv_warning_objcflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_objcflags=
 else
   kpse_cv_warning_objcflags= # FIXME: warning flags for non-GNU Objective C compilers
 fi
diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL
index 17c883fa7ba..536ea493349 100644
--- a/Build/source/texk/xdvik/ChangeLog.TL
+++ b/Build/source/texk/xdvik/ChangeLog.TL
@@ -1,6 +1,11 @@
 ChangeLog.TL: Changes for xdvik (TeX Live)
 ==================================================
 
+2011-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* read-mapfile.c (read_map_file): Allow find_suffix() to return
+	a const string.
+
 2011-03-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* hypertex.c (launch_xdvi): `program_invocation_name' has been
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 524c3eb6608..649efea108f 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -800,7 +800,6 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-CPPFLAGS
 XMKMF'
 ac_subdirs_all='squeeze'
 
@@ -12763,39 +12762,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/xdvik/read-mapfile.c b/Build/source/texk/xdvik/read-mapfile.c
index f637f06f6ae..ccc2233e83e 100644
--- a/Build/source/texk/xdvik/read-mapfile.c
+++ b/Build/source/texk/xdvik/read-mapfile.c
@@ -129,7 +129,7 @@ read_map_file(char *name)
 		/* If we had a header we were downloading, figure out what to do;
 		   couldn't do this above since we want to check the suffix.  */
 		if (hdr_name) {
-		    char *suffix = find_suffix(hdr_name);
+		    const char *suffix = find_suffix(hdr_name);
 		    if (encoding_p
 			|| (suffix != NULL && strcmp(suffix, "enc") == 0)) {
 			Vectfile = hdr_name;
diff --git a/Build/source/texk/xdvik/squeeze/configure b/Build/source/texk/xdvik/squeeze/configure
index 4caeeeb83dc..5b4eb71a6ea 100755
--- a/Build/source/texk/xdvik/squeeze/configure
+++ b/Build/source/texk/xdvik/squeeze/configure
@@ -3302,39 +3302,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index b2d09ee0301..1ad33ef3b6c 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,6 +1,11 @@
 ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx
 =================================================
 
+2011-06-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac (AC_TYPE_UINT32_T): Portability fix for AIX.
+	* dpxcrypt.c: Use headers as in configure test for uint32_t.
+
 2011-06-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* dpxfile.c (exec_spawn): Do not quote execvp() arguments.
diff --git a/Build/source/texk/xdvipdfmx/config.h.in b/Build/source/texk/xdvipdfmx/config.h.in
index b39a40e79ba..7165e09f431 100644
--- a/Build/source/texk/xdvipdfmx/config.h.in
+++ b/Build/source/texk/xdvipdfmx/config.h.in
@@ -268,6 +268,11 @@
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+#undef _UINT32_T
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
@@ -279,3 +284,7 @@
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint32_t
diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index 64b29a61c28..bc8b84e6881 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -787,8 +787,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -2050,6 +2049,59 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_decl
 
+# ac_fn_c_find_uintX_t LINENO BITS VAR
+# ------------------------------------
+# Finds an unsigned integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_uintX_t ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+$as_echo_n "checking for uint$2_t... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
+	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  case $ac_type in #(
+  uint$2_t) :
+    eval "$3=yes" ;; #(
+  *) :
+    eval "$3=\$ac_type" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       if eval test \"x\$"$3"\" = x"no"; then :
+
+else
+  break
+fi
+     done
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_find_uintX_t
+
 # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
 # --------------------------------------------
 # Tries to find the compile-time value of EXPR in a program that includes
@@ -12722,39 +12774,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
@@ -13310,6 +13365,20 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
+ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
+case $ac_cv_c_uint32_t in #(
+  no|yes) ;; #(
+  *)
+
+$as_echo "#define _UINT32_T 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define uint32_t $ac_cv_c_uint32_t
+_ACEOF
+;;
+  esac
+
 
 ac_fn_c_check_decl "$LINENO" "timezone" "ac_cv_have_decl_timezone" "#include <time.h>
 "
diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac
index 1c0ab3393c5..69143becdbf 100644
--- a/Build/source/texk/xdvipdfmx/configure.ac
+++ b/Build/source/texk/xdvipdfmx/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -31,6 +31,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 AC_STRUCT_TM
 AC_STRUCT_TIMEZONE
 AC_C_BIGENDIAN
+AC_TYPE_UINT32_T
 
 AC_CHECK_DECL([timezone],
               [AC_DEFINE([HAVE_TIMEZONE], 1,
diff --git a/Build/source/texk/xdvipdfmx/src/dpxcrypt.c b/Build/source/texk/xdvipdfmx/src/dpxcrypt.c
index 4bad1620485..b58829db9e4 100644
--- a/Build/source/texk/xdvipdfmx/src/dpxcrypt.c
+++ b/Build/source/texk/xdvipdfmx/src/dpxcrypt.c
@@ -24,8 +24,16 @@
 #include "config.h"
 #endif
 
-#include <stdint.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #include <string.h>
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 #include "dpxcrypt.h"
 
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index c3a79ee9c16..c5a489b56b5 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../m4/kpse-libpng-flags.m4 \
 	$(top_srcdir)/../m4/kpse-lt-hack.m4 \
+	$(top_srcdir)/../m4/kpse-mktex.m4 \
 	$(top_srcdir)/../m4/kpse-options.m4 \
 	$(top_srcdir)/../m4/kpse-pkgs.m4 \
 	$(top_srcdir)/../m4/kpse-poppler-flags.m4 \
@@ -133,7 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../libs/zlib/ac/withenable.ac \
 	$(top_srcdir)/../texk/ptexenc/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/withenable.ac \
-	$(top_srcdir)/../texk/kpathsea/ac/web2c.ac \
+	$(top_srcdir)/../texk/kpathsea/ac/mktex.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4
index 86d2a2ce443..d784586c558 100644
--- a/Build/source/utils/aclocal.m4
+++ b/Build/source/utils/aclocal.m4
@@ -999,6 +999,7 @@ m4_include([../m4/kpse-icu-flags.m4])
 m4_include([../m4/kpse-kpathsea-flags.m4])
 m4_include([../m4/kpse-libpng-flags.m4])
 m4_include([../m4/kpse-lt-hack.m4])
+m4_include([../m4/kpse-mktex.m4])
 m4_include([../m4/kpse-options.m4])
 m4_include([../m4/kpse-pkgs.m4])
 m4_include([../m4/kpse-poppler-flags.m4])
diff --git a/Build/source/utils/chktex/configure b/Build/source/utils/chktex/configure
index 70ddba111b2..cdbd693e31b 100755
--- a/Build/source/utils/chktex/configure
+++ b/Build/source/utils/chktex/configure
@@ -3724,39 +3724,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 9296be7428c..362f1782378 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -692,13 +692,19 @@ enable_dump_share
 enable_ipc
 enable_omfonts
 enable_tex
+enable_tex_synctex
 enable_etex
+enable_etex_synctex
 enable_ptex
+enable_ptex_synctex
 enable_eptex
+enable_eptex_synctex
 enable_aleph
 enable_pdftex
+enable_pdftex_synctex
 enable_luatex
 enable_xetex
+enable_xetex_synctex
 enable_mf
 enable_mf_nowin
 with_mf_x_toolkit
@@ -1469,13 +1475,19 @@ Optional Features:
   --disable-omfonts         do not compile and install omfonts (use Web2C
                             versions)
   --disable-tex             do not compile and install TeX
+  --enable-tex-synctex        build TeX with SyncTeX support
   --enable-etex             compile and install e-TeX
+  --disable-etex-synctex      build e-TeX without SyncTeX support
   --disable-ptex            do not compile and install pTeX
+  --disable-ptex-synctex      build pTeX without SyncTeX support
   --disable-eptex           do not compile and install e-pTeX
+  --disable-eptex-synctex     build e-pTeX without SyncTeX support
   --disable-aleph           do not compile and install Aleph
   --disable-pdftex          do not compile and install pdfTeX
+  --disable-pdftex-synctex    build pdfTeX without SyncTeX support
   --disable-luatex          do not compile and install luaTeX
   --disable-xetex           do not compile and install XeTeX
+  --disable-xetex-synctex     build XeTeX without SyncTeX support
   --disable-mf              do not build METAFONT
   --disable-mf-nowin          do not build a separate non-windows-capable
                               METAFONT
@@ -3091,6 +3103,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
 $as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
 if ${kpse_cv_have_win32+:} false; then :
@@ -3468,32 +3481,47 @@ if test "${enable_tex+set}" = set; then :
   enableval=$enable_tex;
 fi
 case $enable_tex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_tex=yes ;;
 esac
+
+# Check whether --enable-tex-synctex was given.
+if test "${enable_tex_synctex+set}" = set; then :
+  enableval=$enable_tex_synctex;
+fi
 # Check whether --enable-etex was given.
 if test "${enable_etex+set}" = set; then :
   enableval=$enable_etex;
 fi
 case $enable_etex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_etex=no ;;
 esac
+
+# Check whether --enable-etex-synctex was given.
+if test "${enable_etex_synctex+set}" = set; then :
+  enableval=$enable_etex_synctex;
+fi
 # Check whether --enable-ptex was given.
 if test "${enable_ptex+set}" = set; then :
   enableval=$enable_ptex;
 fi
 case $enable_ptex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_ptex=yes ;;
 esac
 
+# Check whether --enable-ptex-synctex was given.
+if test "${enable_ptex_synctex+set}" = set; then :
+  enableval=$enable_ptex_synctex;
+fi
+
 test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
 }
@@ -3502,12 +3530,17 @@ if test "${enable_eptex+set}" = set; then :
   enableval=$enable_eptex;
 fi
 case $enable_eptex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_eptex=yes ;;
 esac
 
+# Check whether --enable-eptex-synctex was given.
+if test "${enable_eptex_synctex+set}" = set; then :
+  enableval=$enable_eptex_synctex;
+fi
+
 test "x$enable_web2c:$enable_eptex" = xyes:yes && {
   need_ptexenc=yes
 }
@@ -3516,7 +3549,7 @@ if test "${enable_aleph+set}" = set; then :
   enableval=$enable_aleph;
 fi
 case $enable_aleph in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_aleph=yes ;;
@@ -3526,12 +3559,17 @@ if test "${enable_pdftex+set}" = set; then :
   enableval=$enable_pdftex;
 fi
 case $enable_pdftex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_pdftex=yes ;;
 esac
 
+# Check whether --enable-pdftex-synctex was given.
+if test "${enable_pdftex_synctex+set}" = set; then :
+  enableval=$enable_pdftex_synctex;
+fi
+
 test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
@@ -3542,7 +3580,7 @@ if test "${enable_luatex+set}" = set; then :
   enableval=$enable_luatex;
 fi
 case $enable_luatex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_luatex=yes ;;
@@ -3559,14 +3597,19 @@ if test "${enable_xetex+set}" = set; then :
   enableval=$enable_xetex;
 fi
 case $enable_xetex in #(
-  yes|no) :
+  yes | no) :
      ;; #(
   *) :
     enable_xetex=yes ;;
 esac
 
+# Check whether --enable-xetex-synctex was given.
+if test "${enable_xetex_synctex+set}" = set; then :
+  enableval=$enable_xetex_synctex;
+fi
+
 test "x$enable_web2c:$enable_xetex" = xyes:yes && {
-  need_xpdf=yes
+  need_poppler=yes
   need_libpng=yes
   need_freetype2=yes
   need_icu_xetex=yes
@@ -4976,79 +5019,37 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'"
 fi
 
-## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live
+## texk/kpathsea/ac/mktex.ac: configure.ac fragment for the TeX Live
 ## subdirectory texk/kpathsea.
 ## configure defaults for mktexfmt & Co.
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then :
   enableval=$enable_mktexmf_default;
 fi
-case $enable_mktexmf_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexmf_default=yes ;;
-esac
 # Check whether --enable-mktexpk-default was given.
 if test "${enable_mktexpk_default+set}" = set; then :
   enableval=$enable_mktexpk_default;
 fi
-case $enable_mktexpk_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexpk_default=yes ;;
-esac
 # Check whether --enable-mktextfm-default was given.
 if test "${enable_mktextfm_default+set}" = set; then :
   enableval=$enable_mktextfm_default;
 fi
-case $enable_mktextfm_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktextfm_default=yes ;;
-esac
 # Check whether --enable-mkocp-default was given.
 if test "${enable_mkocp_default+set}" = set; then :
   enableval=$enable_mkocp_default;
 fi
-case $enable_mkocp_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mkocp_default=yes ;;
-esac
 # Check whether --enable-mkofm-default was given.
 if test "${enable_mkofm_default+set}" = set; then :
   enableval=$enable_mkofm_default;
 fi
-case $enable_mkofm_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mkofm_default=yes ;;
-esac
 # Check whether --enable-mktexfmt-default was given.
 if test "${enable_mktexfmt_default+set}" = set; then :
   enableval=$enable_mktexfmt_default;
 fi
-case $enable_mktexfmt_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktexfmt_default=yes ;;
-esac
 # Check whether --enable-mktextex-default was given.
 if test "${enable_mktextex_default+set}" = set; then :
   enableval=$enable_mktextex_default;
 fi
-case $enable_mktextex_default in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_mktextex_default=no ;;
-esac
 
 
 
diff --git a/Build/source/utils/ps2eps/configure b/Build/source/utils/ps2eps/configure
index ecbd01046bb..6d30900e600 100755
--- a/Build/source/utils/ps2eps/configure
+++ b/Build/source/utils/ps2eps/configure
@@ -3352,39 +3352,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/utils/psutils/configure b/Build/source/utils/psutils/configure
index 9f139e1d48c..8813ce11c6d 100755
--- a/Build/source/utils/psutils/configure
+++ b/Build/source/utils/psutils/configure
@@ -3352,39 +3352,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/utils/t1utils/configure b/Build/source/utils/t1utils/configure
index 9b40b4a91c1..56483b1c592 100755
--- a/Build/source/utils/t1utils/configure
+++ b/Build/source/utils/t1utils/configure
@@ -706,8 +706,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -3974,39 +3973,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/utils/vlna/configure b/Build/source/utils/vlna/configure
index d52bdd60dcf..e1edab27550 100755
--- a/Build/source/utils/vlna/configure
+++ b/Build/source/utils/vlna/configure
@@ -3301,39 +3301,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index 998ca2ed658..c59bd604c5c 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -3770,39 +3770,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/utils/xpdfopen/configure b/Build/source/utils/xpdfopen/configure
index 502bfd09c2d..03ff4536ff2 100755
--- a/Build/source/utils/xpdfopen/configure
+++ b/Build/source/utils/xpdfopen/configure
@@ -3473,39 +3473,42 @@ $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
 if ${kpse_cv_warning_cflags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "x$enable_compiler_warnings" = xno; then
+  if test "x$GCC" = xyes; then
   kpse_cv_warning_cflags=
-elif test "x$GCC" = xyes; then
+if test "x$enable_compiler_warnings" != xno; then
   kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
   *) :
      ;;
 esac
-case `$CC -dumpversion` in #(
+  case `$CC -dumpversion` in #(
   3.[234].* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
   *) :
      ;;
 esac
-if test "x$enable_compiler_warnings" != xmin; then
-  kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
-  kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_compiler_warnings" != xyes; then
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
-    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
-    case `$CC -dumpversion` in #(
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags"
+    kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
+      case `$CC -dumpversion` in #(
   3.4.* | 4.*) :
     kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
   *) :
      ;;
 esac
-    if test "x$enable_compiler_warnings" != xmax; then
-      kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow"
+      fi
     fi
   fi
 fi
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cflags=
 else
   kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers
 fi
diff --git a/Build/source/version.ac b/Build/source/version.ac
index 38636ced414..64565add6fc 100644
--- a/Build/source/version.ac
+++ b/Build/source/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current TeX Live version
-m4_define([tex_live_version], [2011])
+m4_define([tex_live_version], [2012/dev])