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

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

9 files changed, 214 insertions, 98 deletions

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