help string, doc for TL (lib)xpdf

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

9 files changed, 21 insertions, 14 deletions

diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index 782b664c550..d3f7b868d73 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-11  Karl Berry  <karl@tug.org>
+
+	* README.config: text tweaks for poppler/libxpdf/luatex/etc.
+
 2012-01-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Report `$enable_largefile'.
diff --git a/Build/source/README.config b/Build/source/README.config
index 45a800bc0d0..a20cab31eea 100644
--- a/Build/source/README.config
+++ b/Build/source/README.config
@@ -76,11 +76,11 @@ Live build).
 
 1.6. --disable-largefile
 ------------------------
-Omit large files support (LFS), needed for files >=2GB on most 32Bit Unix
+Omit large file support (LFS), needed for files >=2GB on most 32Bit Unix
 systems.  The size of DVI and GF files must always be <2GB.  With LFS there
 should be no limit on the size of PDF files created by pdfTeX or PS files
 created by dvips.  The size of PDF images included by pdfTeX must, however,
-be <4GB when using xpdf and <2GB when using poppler (even on 64Bit systems
+be <4GB when using xpdf and <2GB when using poppler (even on 64-bit systems
 with LFS).
 
 1.7. --without-x
@@ -242,20 +242,20 @@ The flags for a system freetype2 library are determined via freetype-config.
 
 3.4. Configure options for xpdf and poppler
 -------------------------------------------
-Building luaTeX and XeTeX requires poppler either from the TL tree or
+Building LuaTeX and XeTeX requires poppler either from the TL tree or
 installed (system) headers and library; pdfTeX requires either xpdf from the
 TL tree or installed poppler headers and library.
 
 3.4.1. --with-system-poppler
-Use an installed (system) version >=0.12 of poppler for luaTeX and XeTeX
+Use an installed (system) version >=0.12 of poppler for LuaTeX and XeTeX
 (and pkg-config to obtain the required flags).
 
 3.4.2. --with-system-xpdf
 Use an installed (system) version >=0.12 of poppler instead of xpdf for
 pdfTeX (and pkg-config to obtain the required flags).
 
-Note: The size of PDF images included by pdfTeX must be <4GB when using xpdf
-with LFS and <2GB when using poppler (even on 64Bit systems with LFS).
+See information at --disable-largefile for a minor deficiency resulting
+from using poppler instead of TL's xpdf library.
 
 3.5. Configure options for graphite
 -----------------------------------
diff --git a/Build/source/configure b/Build/source/configure
index 728beddf980..7d198d3ee0b 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -1718,7 +1718,7 @@ Optional Packages:
   --with-system-zziplib   use installed zziplib headers and library (requires
                           pkg-config)
   --with-system-xpdf      use installed poppler headers and library instead of
-                          xpdf (requires pkg-config)
+                          xpdf library from TL (requires pkg-config)
   --with-system-poppler   use installed poppler headers and library (requires
                           pkg-config)
   --with-system-gd        use installed gd headers and library
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 6f178557c6d..950b805431c 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -1609,7 +1609,7 @@ Optional Packages:
   --with-system-zziplib   use installed zziplib headers and library (requires
                           pkg-config)
   --with-system-xpdf      use installed poppler headers and library instead of
-                          xpdf (requires pkg-config)
+                          xpdf library from TL (requires pkg-config)
   --with-system-poppler   use installed poppler headers and library (requires
                           pkg-config)
   --with-system-gd        use installed gd headers and library
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 6bf15a07fc5..1d00a960459 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-11  Karl Berry  <karl@tug.org>
+
+	* kpse-xpdf-flags.m4 (KPSE_XPDF_OPTIONS): tweak help text slightly.
+
 2012-02-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpse-warnings.m4: Drop `-Wimplicit' for g++ >= 4.6.
diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4
index 2ab194181ea..ceb32dffb5b 100644
--- a/Build/source/m4/kpse-xpdf-flags.m4
+++ b/Build/source/m4/kpse-xpdf-flags.m4
@@ -1,5 +1,5 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -24,8 +24,7 @@ AC_DEFUN([KPSE_XPDF_OPTIONS],
 [m4_ifval([$1],
           [AC_ARG_WITH([system-xpdf],
                        AS_HELP_STRING([--with-system-xpdf],
-                                      [use installed poppler headers and library instead of xpdf
-                                       (requires pkg-config)]))])[]dnl
+                                      [use installed poppler headers and library instead of xpdf library from TL (requires pkg-config)]))])[]dnl
 ]) # KPSE_XPDF_OPTIONS
 
 # KPSE_XPDF_SYSTEM_FLAGS
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 7ae9cd3d2f0..2513f09bf89 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -1629,7 +1629,7 @@ Optional Packages:
   --with-system-zziplib   use installed zziplib headers and library (requires
                           pkg-config)
   --with-system-xpdf      use installed poppler headers and library instead of
-                          xpdf (requires pkg-config)
+                          xpdf library from TL (requires pkg-config)
   --with-system-poppler   use installed poppler headers and library (requires
                           pkg-config)
   --with-system-gd        use installed gd headers and library
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index d37f46966b9..05b7122d1ce 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1690,7 +1690,7 @@ Optional Packages:
   --with-system-libpng    use installed libpng headers and library (requires
                           pkg-config)
   --with-system-xpdf      use installed poppler headers and library instead of
-                          xpdf (requires pkg-config)
+                          xpdf library from TL (requires pkg-config)
   --with-system-poppler   use installed poppler headers and library (requires
                           pkg-config)
   --with-system-zziplib   use installed zziplib headers and library (requires
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 35ee1c46259..1799b27b140 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -1605,7 +1605,7 @@ Optional Packages:
   --with-system-zziplib   use installed zziplib headers and library (requires
                           pkg-config)
   --with-system-xpdf      use installed poppler headers and library instead of
-                          xpdf (requires pkg-config)
+                          xpdf library from TL (requires pkg-config)
   --with-system-poppler   use installed poppler headers and library (requires
                           pkg-config)
   --with-system-gd        use installed gd headers and library