summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-03-21 18:53:55 +0000
committerKarl Berry <karl@freefriends.org>2008-03-21 18:53:55 +0000
commitb61514777e4bb338c90faeb2a3cc2f5dea2e94da (patch)
treeb84b29a51050581b03b41ad840d31e1608f441ad /Build/source
parent863fd221e0a76260801e4369a92f8612eb9ba1bc (diff)
omit warning about missing texmf.cnf if KPATHSEA_WARNING envvar is set to `0'
git-svn-id: svn://tug.org/texlive/trunk@7063 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rwxr-xr-xBuild/source/Build4
-rw-r--r--Build/source/texk/kpathsea/cnf.c6
-rw-r--r--Build/source/texk/kpathsea/kpathsea.info192
-rw-r--r--Build/source/texk/kpathsea/kpathsea.texi11
4 files changed, 119 insertions, 94 deletions
diff --git a/Build/source/Build b/Build/source/Build
index 144703d59a1..3bc07a7b58b 100755
--- a/Build/source/Build
+++ b/Build/source/Build
@@ -61,6 +61,10 @@ cd $TL_WORKDIR || exit 1
: ${GNUMAKE=${TL_MAKE}}
export GNUMAKE
+# Kpathsea is not going to be able to find its cnf files during the
+# build, so omit the warning about it.
+: ${KPATHSEA_WARNING=0}
+
# configure && make.
(set -x; \
eval $TL_BUILD_ENV time $TL_CONFIGURE \
diff --git a/Build/source/texk/kpathsea/cnf.c b/Build/source/texk/kpathsea/cnf.c
index f3b8efed19c..4ac5451fd8c 100644
--- a/Build/source/texk/kpathsea/cnf.c
+++ b/Build/source/texk/kpathsea/cnf.c
@@ -198,7 +198,11 @@ read_all_cnf P1H(void)
}
free (cnf_files);
} else {
- WARNING1 ("kpathsea: configuration file texmf.cnf not found in these directories: %s", cnf_path);
+ string warn = getenv ("KPATHSEA_WARNING");
+ if (!(warn && STREQ (warn, "0"))) {
+ WARNING1 ("kpathsea: configuration file texmf.cnf not found in these directories: %s",
+ cnf_path);
+ }
}
}
diff --git a/Build/source/texk/kpathsea/kpathsea.info b/Build/source/texk/kpathsea/kpathsea.info
index 25caed427a9..7fdce091cab 100644
--- a/Build/source/texk/kpathsea/kpathsea.info
+++ b/Build/source/texk/kpathsea/kpathsea.info
@@ -39,7 +39,7 @@ Kpathsea library
This manual documents how to install and use the Kpathsea library for
filename lookup. It corresponds to version 3.5.6dev, released in
-February 2008.
+March 2008.
* Menu:
@@ -60,7 +60,7 @@ File: kpathsea.info, Node: Introduction, Next: Installation, Prev: Top, Up:
**************
This manual corresponds to version 3.5.6dev of the Kpathsea library,
-released in February 2008.
+released in March 2008.
The library's fundamental purpose is to return a filename from a
list of directories specified by the user, similar to what shells do
@@ -2160,6 +2160,11 @@ the first one found; definitions in earlier files override those in
later files. Thus, if the search path is `.:$TEXMF', values from
`./texmf.cnf' override those from `$TEXMF/texmf.cnf'.
+ If Kpathsea cannot find any `texmf.cnf' file, it reports a warning
+including all the directories it checked. If you don't want to see
+this warning, set the environment variable `KPATHSEA_WARNING' to the
+single character `0' (zero, not oh).
+
While (or instead of) reading this description, you may find it
helpful to look at the distributed `texmf.cnf', which uses or at least
mentions most features. The format of `texmf.cnf' files follows:
@@ -3741,7 +3746,7 @@ Index
* : may not be :: Searching overview. (line 13)
* :: expansion: Default expansion. (line 6)
* @VAR@ substitutions: Running configure. (line 6)
-* \, line continuation in texmf.cnf: Config files. (line 26)
+* \, line continuation in texmf.cnf: Config files. (line 31)
* \openin: Searching overview. (line 31)
* \special, suppressing warnings about: Suppressing warnings.
(line 31)
@@ -3787,7 +3792,7 @@ Index
* Bach, Johann Sebastian: Default expansion. (line 41)
* backbone of CTAN: Electronic distribution.
(line 6)
-* backslash-newline: Config files. (line 26)
+* backslash-newline: Config files. (line 31)
* bash, recommended for running configure: configure shells. (line 6)
* basic glyph lookup: Basic glyph lookup. (line 6)
* Berry, Karl: History. (line 12)
@@ -3795,7 +3800,7 @@ Index
(line 28)
* binary mode, for file transfers: Electronic distribution.
(line 20)
-* blank lines, in texmf.cnf: Config files. (line 24)
+* blank lines, in texmf.cnf: Config files. (line 29)
* brace expansion: Brace expansion. (line 6)
* BSD universe: Running make. (line 44)
* bsh, ok with configure: configure shells. (line 14)
@@ -3831,13 +3836,13 @@ Index
(line 36)
* cmr10, as fallback font: Fallback font. (line 15)
* cmr10.vf: Searching overview. (line 31)
-* cnf.c: Config files. (line 75)
+* cnf.c: Config files. (line 80)
* cnf.h: Programming with config files.
(line 23)
* code sharing: Shared library. (line 9)
* color printers, configuring: Simple installation. (line 60)
* comments, in fontmap files: Fontmap. (line 28)
-* comments, in texmf.cnf: Config files. (line 22)
+* comments, in texmf.cnf: Config files. (line 27)
* comments, making: Introduction. (line 27)
* common features in glyph lookup: Basic glyph lookup. (line 6)
* common problems: Common problems. (line 6)
@@ -3874,7 +3879,7 @@ Index
* configuration compiler options: configure environment.
(line 23)
* configuration file, source for path: Path sources. (line 17)
-* configuration files as shell scripts.: Config files. (line 67)
+* configuration files as shell scripts.: Config files. (line 72)
* configuration of mktex scripts: mktex configuration. (line 6)
* configuration of optional features: configure options. (line 16)
* configure error from sed: Empty Makefiles. (line 6)
@@ -3882,7 +3887,7 @@ Index
* configure options for mktex scripts: mktex configuration. (line 12)
* configure, running: Running configure. (line 6)
* context diff: Bug checklist. (line 56)
-* continuation character: Config files. (line 26)
+* continuation character: Config files. (line 31)
* core dumps, reporting: Bug checklist. (line 62)
* CPPFLAGS: configure environment.
(line 22)
@@ -4077,7 +4082,7 @@ Index
* HOME, as ~ expansion: Tilde expansion. (line 6)
* HP-UX, compiling on: TeX or Metafont failing.
(line 30)
-* identifiers, characters valid in: Config files. (line 36)
+* identifiers, characters valid in: Config files. (line 41)
* illegal pointer combination warnings: Pointer combination warnings.
(line 6)
* include fontmap directive: Fontmap. (line 33)
@@ -4124,6 +4129,7 @@ Index
* KPATHSEA_DEBUG: Debugging. (line 18)
* kpathsea_debug: Debugging. (line 6)
* kpathsea_debug variable: Calling sequence. (line 37)
+* KPATHSEA_WARNING: Config files. (line 18)
* KPSE_BITMAP_TOLERANCE: Basic glyph lookup. (line 15)
* kpse_cnf_get: Programming with config files.
(line 23)
@@ -4410,7 +4416,7 @@ Index
(line 17)
* resolutions, last-resort: Fallback font. (line 6)
* retrieving TeX: unixtex.ftp. (line 6)
-* right-hand side of variable assignments: Config files. (line 44)
+* right-hand side of variable assignments: Config files. (line 49)
* Rokicki, Tom: History. (line 12)
* root user: Tilde expansion. (line 19)
* runtime configuration files: Config files. (line 6)
@@ -4436,7 +4442,7 @@ Index
(line 149)
* sh5, ok with configure: configure shells. (line 25)
* shared library, making: Shared library. (line 6)
-* shell scripts as configuration files: Config files. (line 67)
+* shell scripts as configuration files: Config files. (line 72)
* shell variables: Variable expansion. (line 17)
* shell_escape, example for code: Programming with config files.
(line 10)
@@ -4543,6 +4549,7 @@ Index
(line 62)
* TEXMF: TeX directory structure.
(line 6)
+* texmf.cnf missing, warning about: Config files. (line 18)
* texmf.cnf, and variable expansion: Variable expansion. (line 6)
* texmf.cnf, creating: Running make. (line 6)
* texmf.cnf, definition for: Config files. (line 6)
@@ -4639,6 +4646,7 @@ Index
* Vojta, Paul: History. (line 30)
* Walsh, Norman: History. (line 57)
* warning about unusable ls-R: ls-R. (line 45)
+* warning, about missing texmf.cnf: Config files. (line 18)
* warnings, file access: Searching overview. (line 56)
* warnings, pointer combinations: Pointer combination warnings.
(line 6)
@@ -4652,7 +4660,7 @@ Index
(line 196)
* whitespace, in fontmap files: Fontmap. (line 28)
* whitespace, not ignored on continuation lines: Config files.
- (line 26)
+ (line 31)
* Windows TeX implementations: Other TeX packages. (line 6)
* World Wide Web CTAN access: Electronic distribution.
(line 17)
@@ -4681,84 +4689,84 @@ Index

Tag Table:
Node: Top1555
-Node: Introduction2205
-Node: History4188
-Node: Installation8280
-Node: Simple installation9070
-Node: Custom installation12653
-Node: Disk space13827
-Node: Kpathsea application distributions14711
-Node: Changing search paths15826
-Node: Default path features17008
-Node: Default path generation19144
-Node: Running configure20587
-Node: configure shells21638
-Node: configure options22690
-Node: configure environment24197
-Node: configure scenarios25999
-Node: Shared library27585
-Node: Running make28599
-Node: Installing files30646
-Node: Cleaning up32593
-Node: Filename database generation33641
-Node: mktex scripts34208
-Node: mktex configuration35485
-Node: mktex script names41304
-Node: mktex script arguments42695
-Node: Installation testing43585
-Node: Security43949
-Node: TeX directory structure46516
-Node: unixtex.ftp50938
-Node: Electronic distribution52953
-Node: CD-ROM distribution55718
-Node: Other TeX packages56688
-Node: Reporting bugs57984
-Node: Bug checklist58724
-Node: Mailing lists62426
-Node: Debugging63785
-Node: Logging68857
-Node: Common problems70727
-Node: Unable to find files71558
-Node: Slow path searching73969
-Node: Unable to generate fonts75346
-Node: TeX or Metafont failing77855
-Node: Empty Makefiles79733
-Node: XtStrings80963
-Node: dlopen81799
-Node: ShellWidgetClass82617
-Node: Pointer combination warnings84249
-Node: Path searching84638
-Node: Searching overview85285
-Node: Path sources88657
-Node: Config files89728
-Node: Path expansion93128
-Node: Default expansion94077
-Node: Variable expansion96147
-Node: Tilde expansion97550
-Node: Brace expansion98530
-Node: KPSE_DOT expansion99635
-Node: Subdirectory expansion100148
-Node: Filename database102497
-Node: ls-R103811
-Node: Filename aliases106705
-Node: Database format107883
-Node: Invoking kpsewhich108896
-Node: Path searching options109773
-Node: Auxiliary tasks116422
-Node: Standard options118243
-Node: TeX support118563
-Node: Supported file formats119854
-Node: File lookup127002
-Node: Glyph lookup128293
-Node: Basic glyph lookup129420
-Node: Fontmap130299
-Node: Fallback font132916
-Node: Suppressing warnings133881
-Node: Programming134986
-Node: Programming overview135499
-Node: Calling sequence137775
-Node: Program-specific files142804
-Node: Programming with config files143842
-Node: Index145142
+Node: Introduction2202
+Node: History4182
+Node: Installation8274
+Node: Simple installation9064
+Node: Custom installation12647
+Node: Disk space13821
+Node: Kpathsea application distributions14705
+Node: Changing search paths15820
+Node: Default path features17002
+Node: Default path generation19138
+Node: Running configure20581
+Node: configure shells21632
+Node: configure options22684
+Node: configure environment24191
+Node: configure scenarios25993
+Node: Shared library27579
+Node: Running make28593
+Node: Installing files30640
+Node: Cleaning up32587
+Node: Filename database generation33635
+Node: mktex scripts34202
+Node: mktex configuration35479
+Node: mktex script names41298
+Node: mktex script arguments42689
+Node: Installation testing43579
+Node: Security43943
+Node: TeX directory structure46510
+Node: unixtex.ftp50932
+Node: Electronic distribution52947
+Node: CD-ROM distribution55712
+Node: Other TeX packages56682
+Node: Reporting bugs57978
+Node: Bug checklist58718
+Node: Mailing lists62420
+Node: Debugging63779
+Node: Logging68851
+Node: Common problems70721
+Node: Unable to find files71552
+Node: Slow path searching73963
+Node: Unable to generate fonts75340
+Node: TeX or Metafont failing77849
+Node: Empty Makefiles79727
+Node: XtStrings80957
+Node: dlopen81793
+Node: ShellWidgetClass82611
+Node: Pointer combination warnings84243
+Node: Path searching84632
+Node: Searching overview85279
+Node: Path sources88651
+Node: Config files89722
+Node: Path expansion93367
+Node: Default expansion94316
+Node: Variable expansion96386
+Node: Tilde expansion97789
+Node: Brace expansion98769
+Node: KPSE_DOT expansion99874
+Node: Subdirectory expansion100387
+Node: Filename database102736
+Node: ls-R104050
+Node: Filename aliases106944
+Node: Database format108122
+Node: Invoking kpsewhich109135
+Node: Path searching options110012
+Node: Auxiliary tasks116661
+Node: Standard options118482
+Node: TeX support118802
+Node: Supported file formats120093
+Node: File lookup127241
+Node: Glyph lookup128532
+Node: Basic glyph lookup129659
+Node: Fontmap130538
+Node: Fallback font133155
+Node: Suppressing warnings134120
+Node: Programming135225
+Node: Programming overview135738
+Node: Calling sequence138014
+Node: Program-specific files143043
+Node: Programming with config files144081
+Node: Index145381

End Tag Table
diff --git a/Build/source/texk/kpathsea/kpathsea.texi b/Build/source/texk/kpathsea/kpathsea.texi
index d56a843003d..4d0e823975e 100644
--- a/Build/source/texk/kpathsea/kpathsea.texi
+++ b/Build/source/texk/kpathsea/kpathsea.texi
@@ -3,7 +3,7 @@
@settitle Kpathsea: A library for path searching
@set version 3.5.6dev
-@set month-year February 2008
+@set month-year March 2008
@c Define new indices for commands, filenames, and options.
@defcodeindex cm
@@ -443,6 +443,15 @@ just the first one found; definitions in earlier files override those in
later files. Thus, if the search path is @samp{.:$TEXMF}, values from
@file{./texmf.cnf} override those from @file{$TEXMF/texmf.cnf}.
+@vindex KPATHSEA_WARNING
+@cindex warning, about missing @file{texmf.cnf}
+@cindex @file{texmf.cnf} missing, warning about
+If Kpathsea cannot find any @file{texmf.cnf} file, it reports a
+warning including all the directories it checked. If you don't want
+to see this warning, set the environment variable
+@env{KPATHSEA_WARNING} to the single character @samp{0} (zero, not
+oh).
+
While (or instead of) reading this description, you may find it helpful
to look at the distributed @file{texmf.cnf}, which uses or at least
mentions most features. The format of @file{texmf.cnf} files follows: