diff -Naur xdvik-22.40n/CHANGES xdvik-22.40o/CHANGES --- xdvik-22.40n/CHANGES Mon Sep 16 17:49:46 2002 +++ xdvik-22.40o/CHANGES Wed Oct 16 23:22:31 2002 @@ -12,22 +12,44 @@ Only major changes are listed (mostly those visible to the user); for a more detailed list of changes, see the CVS logs. + * 22.40o: + + More changes for ANSI C; fixed a few compilation problems + on Tru64 v5.1, HP-UX-10.20 and Mac OS X. + + Upgraded to kpathsea v.3.3.8, and libwww version 5.4.0. + + Show numerical prefix in the statusline. + + Fixed a bug with `FIXME_ps_lock' not being defined when + configuring "with-ps=dps" (thanks to Norman Wattenberg + for reporting and fixing it). + + Improved warnings about incorrect papersize options. + + New actions do-href() and do-href-newwindow() to allow + binding a mouse event independent of magnifier binding. + + Some additions to the man page + + Fixed bug #518761: Xdvik won't exit(1) any more when + there had been a problem parsing a Type1 encoding or font file + + Fixed bug #619632: try Type1 fallback first, then PK + fallback, and generate PK fallback if it's not already present + + Added a wrapper script `xdvizilla' that makes xdvi act as a + Mozilla helper application, which can also deal with .tar files. + * 22.40n: + Fixed a few bugs in xdvi-search.el (thanks to Reiner Steib for spotting them, and suggesting patches) - + merged in changes for libs and configure from teTeX-beta + + Merged in changes for libs and configure from teTeX-beta (had been planned only for HEAD, but the situation became too messy) - thanks to Thomas Esser for the great work in teTeX that made this much easier ;-) This means that --with-system-wwwlib and --with-system-t1lib now finally work properly. - + removed K&R compatibility macros to address bugs with gcc 3.2 - on Solaris, and simplify the setup - + added progress indicator for file downloads + + Removed K&R compatibility macros to address bugs with gcc 3.2 + on Solaris, and simplify the setup. + Users who really need K&R support should look at Paul Vojta's + version of xdvi instead: http://math.berkeley.edu/~vojta/xdvi.html + + Added progress indicator for file downloads * 22.40m: - Was the same as 22.40n, except that the depend.mk file had contained - references locally installed libwww headers that had made it unusable. + Same as 22.40n, except that the depend.mk file had contained + references locally installed libwww headers that had made it + unusable. For that reason, 22.40m was withdrawn and replaced by 22.40n. * 22.40l: diff -Naur xdvik-22.40n/CVS/Entries xdvik-22.40o/CVS/Entries --- xdvik-22.40n/CVS/Entries Mon Sep 16 17:50:31 2002 +++ xdvik-22.40o/CVS/Entries Wed Oct 16 23:45:11 2002 @@ -1,12 +1,13 @@ /.indent.pro/1.1.1.1/Wed Apr 18 14:23:08 2001//Txdvik_22_40_STABLE /BUGS/1.1.1.1/Wed Apr 18 14:23:07 2001//Txdvik_22_40_STABLE +/CHANGES/1.1.6.13/Wed Oct 16 23:22:31 2002//Txdvik_22_40_STABLE /INSTALL/1.4.6.3/Tue Aug 20 22:33:23 2002//Txdvik_22_40_STABLE /Makefile.in/1.5.6.1/Sat Sep 14 00:24:46 2002//Txdvik_22_40_STABLE -/README/1.3.8.4/Wed Aug 14 22:50:05 2002//Txdvik_22_40_STABLE -/README.CVS/1.1.2.6/Sat Aug 31 17:12:11 2002//Txdvik_22_40_STABLE +/README/1.3.8.5/Mon Sep 23 19:48:38 2002//Txdvik_22_40_STABLE +/README.CVS/1.1.2.9/Mon Sep 23 22:27:38 2002//Txdvik_22_40_STABLE /README_maintainer/1.7.6.1/Sun Oct 14 12:32:03 2001//Txdvik_22_40_STABLE -/TODO/1.2/Sun Jun 24 14:52:08 2001//Txdvik_22_40_STABLE -/configure/1.4.8.4/Sun Sep 15 15:14:13 2002//Txdvik_22_40_STABLE +/TODO/1.2.6.1/Tue Sep 17 16:13:07 2002//Txdvik_22_40_STABLE +/configure/1.4.8.5/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE /configure.in/1.3.8.2/Sat Sep 14 00:24:46 2002//Txdvik_22_40_STABLE /reautoconf/1.2/Sun May 13 10:54:58 2001//Txdvik_22_40_STABLE /selfautofix/1.1.1.1/Wed Apr 18 14:23:08 2001//Txdvik_22_40_STABLE @@ -15,4 +16,3 @@ D/config//// D/libs//// D/texk//// -/CHANGES/1.1.6.11/Mon Sep 16 17:49:46 2002//Txdvik_22_40_STABLE diff -Naur xdvik-22.40n/README xdvik-22.40o/README --- xdvik-22.40n/README Wed Aug 14 22:50:05 2002 +++ xdvik-22.40o/README Mon Sep 23 19:48:38 2002 @@ -1,7 +1,8 @@ This is the kpathsea version of xdvi, called xdvik. xdvik is currently maintained by Nicolai Langfeldt -and others. +and Stefan Ulrich ; please send +all email regarding xdvik to *both* addresses. The k extentions for xdvi was written by many people, whose names are sprinkled in the source files. diff -Naur xdvik-22.40n/README.CVS xdvik-22.40o/README.CVS --- xdvik-22.40n/README.CVS Sat Aug 31 17:12:11 2002 +++ xdvik-22.40o/README.CVS Mon Sep 23 22:27:38 2002 @@ -8,13 +8,9 @@ Prerequisites for using these examples are: -1. Have cvs and ssh installed. +1. Have cvs installed. -2. Set the CVS_RSH environment variable to ssh, e.g. - $ setenv CVS_RSH ssh (for (t)csh) - $ export CVS_RSH=ssh (for (ba)sh) - -3. Log in as `anonymous' user to the CVS server on SourceForge: +2. Log in as `anonymous' user to the CVS server on SourceForge: $ cvs -d:pserver:anonymous@cvs.xdvi.sourceforge.net:/cvsroot/xdvi login (Simply hit RETURN after the password prompt) @@ -23,12 +19,14 @@ version. The following examples cover the procedures for this. a) Upgrading to the current `stable' version: - - This requires that you already have a complete `standard' - source distribution available. Note that some distributions, - such as teTeX, have a different directory structure and don't - come with the CVS subdirectories; in this case, see example (b) - instead. + + Starting with version 22.40e, the source distribution of xdvik + also contains the CVS subdirectories, which will allow you to + upgrade your sources to the most up-to-date version. Note + however that some distributions, such as teTeX, have a different + directory structure and don't include the CVS subdirectories; in + this case, use method (b) instead to upgrade your distribution + via CVS. - Change to the top-level xdvik directory, e.g. if your current xdvik version is 22.40g: diff -Naur xdvik-22.40n/TODO xdvik-22.40o/TODO --- xdvik-22.40n/TODO Sun Jun 24 14:52:08 2001 +++ xdvik-22.40o/TODO Tue Sep 17 16:13:07 2002 @@ -1,3 +1,4 @@ + TODO list for xdvik: - Update statusline as print_statusline calls are made, not after diff -Naur xdvik-22.40n/configure xdvik-22.40o/configure --- xdvik-22.40n/configure Sun Sep 15 15:14:13 2002 +++ xdvik-22.40o/configure Wed Oct 16 22:26:18 2002 @@ -26,6 +26,10 @@ ac_help="$ac_help --without-mkofm-default do not run mkofm if OFM file missing" ac_help="$ac_help + --with-mktexfmt-default run mktexfmt if format file missing" +ac_help="$ac_help + --with-mktextex-default run mktextex if TeX source missing" +ac_help="$ac_help --enable-multiplatform put executables in bin/PLATFORM" ac_help="$ac_help --with-x-toolkit=KIT use a toolkit (KIT=xaw/xaw3d/neXtaw)" @@ -602,7 +606,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:606: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:610: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -631,7 +635,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:635: checking for $ac_word" >&5 +echo "configure:639: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -662,7 +666,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:666: checking for $ac_word" >&5 +echo "configure:670: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -714,7 +718,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:718: checking for $ac_word" >&5 +echo "configure:722: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -747,7 +751,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:751: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:755: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -758,12 +762,12 @@ cat > conftest.$ac_ext << EOF -#line 762 "configure" +#line 766 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -789,12 +793,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:793: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:797: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:798: checking whether we are using GNU C" >&5 +echo "configure:802: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -803,7 +807,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -822,7 +826,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:826: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:830: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -881,7 +885,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:885: checking host system type" >&5 +echo "configure:889: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -902,7 +906,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:906: checking target system type" >&5 +echo "configure:910: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -920,7 +924,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:924: checking build system type" >&5 +echo "configure:928: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -944,7 +948,7 @@ echo $ac_n "checking whether to define additional compiler specific flags""... $ac_c" 1>&6 -echo "configure:948: checking whether to define additional compiler specific flags" >&5 +echo "configure:952: checking whether to define additional compiler specific flags" >&5 case "$target" in alpha*-dec*) if test "$CC" = "cc"; then @@ -985,7 +989,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:989: checking for a BSD compatible install" >&5 +echo "configure:993: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1040,7 +1044,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1044: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1048: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1067,7 +1071,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1071: checking whether ln -s works" >&5 +echo "configure:1075: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1090,7 +1094,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1094: checking how to run the C preprocessor" >&5 +echo "configure:1098: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1105,13 +1109,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1122,13 +1126,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1139,13 +1143,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1172,19 +1176,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1176: checking for working alloca.h" >&5 +echo "configure:1180: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1205,12 +1209,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1209: checking for alloca" >&5 +echo "configure:1213: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1270,12 +1274,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1274: checking whether alloca needs Cray hooks" >&5 +echo "configure:1278: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1304: checking for $ac_func" >&5 +echo "configure:1308: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1355,7 +1359,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1359: checking stack direction for C alloca" >&5 +echo "configure:1363: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1363,7 +1367,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -1406,7 +1410,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1410: checking for $ac_word" >&5 +echo "configure:1414: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1485,7 +1489,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1489: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1493: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1504,7 +1508,7 @@ echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6 -echo "configure:1508: checking for loader (symbol LD)" >&5 +echo "configure:1512: checking for loader (symbol LD)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1518,7 +1522,7 @@ echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6 -echo "configure:1522: checking for archiver (symbol AR)" >&5 +echo "configure:1526: checking for archiver (symbol AR)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1531,18 +1535,18 @@ echo "$ac_t""$AR" 1>&6 -echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 -echo "configure:1536: checking for archiver options (symbol AR_OPTS)" >&5 -if eval "test \"`echo '$''{'cf_cv_subst_AR_OPTS'+set}'`\" = set"; then +echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6 +echo "configure:1540: checking for archiver options (symbol ARFLAGS)" >&5 +if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -test -z "$AR_OPTS" && AR_OPTS=rc -cf_cv_subst_AR_OPTS=$AR_OPTS +test -z "$ARFLAGS" && ARFLAGS=rc +cf_cv_subst_ARFLAGS=$ARFLAGS fi -AR_OPTS=${cf_cv_subst_AR_OPTS} -echo "$ac_t""$AR_OPTS" 1>&6 +ARFLAGS=${cf_cv_subst_ARFLAGS} +echo "$ac_t""$ARFLAGS" 1>&6 @@ -1551,80 +1555,64 @@ withval="$with_mktexmf_default" : else - withval=yes + with_mktexmf_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_MF_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktexpk-default or --without-mktexpk-default was given. if test "${with_mktexpk_default+set}" = set; then withval="$with_mktexpk_default" : else - withval=yes + with_mktexpk_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_PK_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktextfm-default or --without-mktextfm-default was given. if test "${with_mktextfm_default+set}" = set; then withval="$with_mktextfm_default" : else - withval=yes + with_mktextfm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_TFM_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkocp-default or --without-mkocp-default was given. if test "${with_mkocp_default+set}" = set; then withval="$with_mkocp_default" : else - withval=yes + with_mkocp_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OCP_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkofm-default or --without-mkofm-default was given. if test "${with_mkofm_default+set}" = set; then withval="$with_mkofm_default" : else - withval=yes + with_mkofm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OFM_BY_DEFAULT 1 -EOF +# Check whether --with-mktexfmt-default or --without-mktexfmt-default was given. +if test "${with_mktexfmt_default+set}" = set; then + withval="$with_mktexfmt_default" + : +fi +# Check whether --with-mktextex-default or --without-mktextex-default was given. +if test "${with_mktextex_default+set}" = set; then + withval="$with_mktextex_default" + with_mktextex_default=yes +else + with_mktextex_default=no fi + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1628: checking host system type" >&5 +echo "configure:1616: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1656,7 +1644,7 @@ echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 -echo "configure:1660: checking where the main texmf tree is located" >&5 +echo "configure:1648: checking where the main texmf tree is located" >&5 texmfmain= if test "x$datadir" != 'x${prefix}/share'; then # First case, datadir is defined... @@ -1690,6 +1678,13 @@ if test -n "$texmfmain"; then echo "$ac_t"""$texmfmain"" 1>&6 else + ### SU: added using `kpsewhich' as last fallback before giving up; since + ### xdvik is most likely to be installed with an *existing* kpathsearch + ### system, this seemed reasonable to me. + texmfmain=`kpsewhich --expand-path='$TEXMFMAIN' 2>/dev/null | sed 's,//*,/,g'` + if test -d "$texmfmain"; then + echo "$ac_t"""$texmfmain"" 1>&6 + else eval texmfmain="$datadir/texmf" echo "$ac_t""not found" 1>&6 echo "configure: warning: The main texmf tree was not found. @@ -1699,6 +1694,7 @@ in systems/web2c. Winging it by using the default location $texmfmain." 1>&2 fi + fi fi @@ -1846,7 +1842,7 @@ # Extract the first word of "pwd", so it can be a program name with args. set dummy pwd; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1850: checking for $ac_word" >&5 +echo "configure:1846: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BINPWD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2082,7 +2078,7 @@ # Extract the first word of "$libwww_config", so it can be a program name with args. set dummy $libwww_config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2086: checking for $ac_word" >&5 +echo "configure:2082: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LIBWWW_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2158,17 +2154,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2162: checking for $ac_hdr" >&5 +echo "configure:2158: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2213,7 +2209,7 @@ LDLIBWWW=-lwww libwww_libdir_found=yes echo $ac_n "checking for HTParse in -lwww""... $ac_c" 1>&6 -echo "configure:2217: checking for HTParse in -lwww" >&5 +echo "configure:2213: checking for HTParse in -lwww" >&5 ac_lib_var=`echo www'_'HTParse | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2221,7 +2217,7 @@ ac_save_LIBS="$LIBS" LIBS="-lwww $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2314,7 +2310,7 @@ if test "$with_system_t1lib" = yes; then echo $ac_n "checking for T1_AddFont in -lt1""... $ac_c" 1>&6 -echo "configure:2318: checking for T1_AddFont in -lt1" >&5 +echo "configure:2314: checking for T1_AddFont in -lt1" >&5 ac_lib_var=`echo t1'_'T1_AddFont | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2322,7 +2318,7 @@ ac_save_LIBS="$LIBS" LIBS="-lt1 -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2360,13 +2356,13 @@ LDFLAGS="$LDFLAGS $EXTRA_LIBT1_LIBDIR -lt1 -lm" if test "$with_system_t1lib" = yes; then echo $ac_n "checking whether installed T1 lib is >= v 1.3.1 ""... $ac_c" 1>&6 -echo "configure:2364: checking whether installed T1 lib is >= v 1.3.1 " >&5 +echo "configure:2360: checking whether installed T1 lib is >= v 1.3.1 " >&5 if test "$cross_compiling" = yes; then ac_compile_t1lib=1 ] else cat > conftest.$ac_ext < @@ -2397,7 +2393,7 @@ } EOF -if { (eval echo configure:2401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_compile_t1lib=0 else @@ -2646,7 +2642,7 @@ s%@MAINT@%$MAINT%g s%@LD@%$LD%g s%@AR@%$AR%g -s%@AR_OPTS@%$AR_OPTS%g +s%@ARFLAGS@%$ARFLAGS%g s%@texmfmain@%$texmfmain%g s%@LDT1LIB@%$LDT1LIB%g s%@BINPWD@%$BINPWD%g diff -Naur xdvik-22.40n/libs/libwww/CVS/Entries xdvik-22.40o/libs/libwww/CVS/Entries --- xdvik-22.40n/libs/libwww/CVS/Entries Mon Sep 16 17:45:07 2002 +++ xdvik-22.40o/libs/libwww/CVS/Entries Wed Oct 16 23:45:11 2002 @@ -1,281 +1,281 @@ /COPYRIGH/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAABrow.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAABrow.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAAUtil.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAAUtil.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTANSI.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE +/HTAABrow.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAABrow.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAAUtil.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAAUtil.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTANSI.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE /HTANSI.h/1.1.1.1/Wed Apr 18 14:23:10 2001//Txdvik_22_40_STABLE -/HTAccess.c/1.2.6.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAccess.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAlert.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAlert.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAncMan.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAnchor.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAnchor.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTArray.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTArray.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAssoc.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAssoc.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAtom.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTAtom.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTBInit.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTBInit.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTBTree.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTBTree.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTBind.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTBind.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTBound.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTBound.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTBufWrt.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTBufWrt.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTCache.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTCache.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTChannl.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTChannl.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTChunk.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTChunk.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTConLen.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTConLen.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTCookie.c/1.1.2.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTCookie.h/1.1.2.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDAV.c/1.1.2.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDAV.h/1.1.2.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDNS.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDNS.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDemux.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDemux.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDescpt.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDescpt.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDialog.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDialog.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDigest.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDigest.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDir.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTDir.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTEPtoCl.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTEPtoCl.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTError.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTError.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTEscape.c/1.2.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTEscape.h/1.2.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTEvent.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTEvent.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTEvtLst.c/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTEvtLst.h/1.1.1.1.8.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTFSave.c/1.1.2.1/Fri Sep 13 00:23:45 2002//Txdvik_22_40_STABLE -/HTFSave.h/1.1.2.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFTP.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFTP.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFTPDir.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFTPDir.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFWrite.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFWrite.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFile.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFile.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFilter.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFilter.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFormat.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTFormat.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE +/HTAccess.c/1.2.6.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAccess.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAlert.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAlert.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAncMan.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAnchor.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAnchor.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTArray.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTArray.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAssoc.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAssoc.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAtom.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTAtom.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTBInit.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTBInit.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTBTree.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTBTree.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTBind.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTBind.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTBound.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTBound.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTBufWrt.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTBufWrt.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTCache.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTCache.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTChannl.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTChannl.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTChunk.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTChunk.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTConLen.c/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTConLen.h/1.1.1.1.8.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTCookie.c/1.1.2.2/Wed Oct 16 22:26:18 2002//Txdvik_22_40_STABLE +/HTCookie.h/1.1.2.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDAV.c/1.1.2.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDAV.h/1.1.2.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDNS.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDNS.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDemux.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDemux.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDescpt.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDescpt.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDialog.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDialog.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDigest.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDigest.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDir.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTDir.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTEPtoCl.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTEPtoCl.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTError.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTError.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTEscape.c/1.2.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTEscape.h/1.2.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTEvent.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTEvent.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTEvtLst.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTEvtLst.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFSave.c/1.1.2.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFSave.h/1.1.2.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFTP.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFTP.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFTPDir.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFTPDir.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFWrite.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFWrite.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFile.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFile.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFilter.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFilter.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFormat.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTFormat.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE /HTGopher.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTGopher.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTGuess.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTGuess.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHInit.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHInit.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE +/HTGopher.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTGuess.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTGuess.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTHInit.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTHInit.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE /HTHash.c/1.1.2.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHash.h/1.1.2.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHeader.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHeader.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHist.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHist.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHome.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHome.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHost.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHost.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTHstMan.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTIOStream.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTIcons.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTIcons.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTInet.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTInet.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTInit.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTInit.h/1.1.1.1.8.2/Sat Sep 14 00:24:46 2002//Txdvik_22_40_STABLE -/HTLib.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTLib.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTLink.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTLink.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTList.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTList.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTLocal.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTLocal.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTLog.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTLog.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMIME.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMIME.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMIMERq.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMIMERq.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMIMImp.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMIMImp.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMIMPrs.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMIMPrs.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTML.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTML.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMLGen.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMLGen.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMLPDTD.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMLPDTD.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMemLog.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMemLog.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMemory.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMemory.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMerge.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMerge.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMethod.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMethod.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMulpar.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMulti.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMulti.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMuxCh.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMuxCh.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMuxHeader.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMuxTx.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTMuxTx.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNDir.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNDir.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNet.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNet.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNetMan.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNetTxt.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNetTxt.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE +/HTHash.h/1.1.2.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTHeader.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTHeader.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTHist.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTHist.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTHome.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTHome.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTHost.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTHost.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTHstMan.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTIOStream.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTIcons.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTIcons.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTInet.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTInet.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTInit.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTInit.h/1.1.1.1.8.3/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTLib.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTLib.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTLink.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTLink.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTList.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTList.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTLocal.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTLocal.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTLog.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTLog.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMIME.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMIME.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMIMERq.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMIMERq.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMIMImp.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMIMImp.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMIMPrs.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMIMPrs.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTML.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTML.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMLGen.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMLGen.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMLPDTD.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMLPDTD.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMemLog.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMemLog.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMemory.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMemory.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMerge.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMerge.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMethod.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMethod.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMulpar.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMulti.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMulti.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMuxCh.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMuxCh.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMuxHeader.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMuxTx.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTMuxTx.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNDir.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNDir.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNet.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNet.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNetMan.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNetTxt.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNetTxt.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE /HTNews.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNews.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNewsLs.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNewsLs.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNewsRq.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNewsRq.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNoFree.c/1.1.2.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTNoFree.h/1.1.2.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTPEP.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTPEP.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTParse.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTParse.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTPlain.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTPlain.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTProfil.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTProfil.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTProt.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTProt.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTProxy.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTProxy.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTRDF.c/1.1.2.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTRDF.h/1.1.2.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTReader.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTReader.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTReq.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTReqMan.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTReqMan.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTResMan.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTResponse.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTResponse.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTRules.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTRules.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTSChunk.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTSChunk.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTSQL.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTSQL.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTSQLLog.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTSQLLog.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTSocket.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTSocket.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTStream.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTStream.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTString.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTString.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTStruct.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTStyle.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTStyle.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTCP.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTCP.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTChunk.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTChunk.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTP.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTP.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTPGen.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTPGen.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTPReq.c/1.3.6.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTPReq.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTPRes.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTPRes.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTPServ.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTPServ.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTPUtil.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTeXGen.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTeXGen.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTee.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTee.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTelnet.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTelnet.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTimer.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTimer.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTrace.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTrans.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTTrans.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTUTree.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTUTree.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTUU.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTUU.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTUser.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTUser.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTUtils.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTWAIS.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTWAIS.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTWSRC.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTWSRC.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTWWWStr.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTWWWStr.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTWriter.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTWriter.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTXML.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTXML.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTXParse.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE +/HTNews.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNewsLs.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNewsLs.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNewsRq.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNewsRq.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNoFree.c/1.1.2.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTNoFree.h/1.1.2.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTPEP.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTPEP.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTParse.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTParse.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTPlain.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTPlain.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTProfil.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTProfil.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTProt.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTProt.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTProxy.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTProxy.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTRDF.c/1.1.2.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTRDF.h/1.1.2.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTReader.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTReader.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTReq.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTReqMan.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTReqMan.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTResMan.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTResponse.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTResponse.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTRules.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTRules.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTSChunk.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTSChunk.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTSQL.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTSQL.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTSQLLog.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTSQLLog.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTSocket.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTSocket.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTStream.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTStream.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTString.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTString.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTStruct.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTStyle.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTStyle.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTCP.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTCP.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTChunk.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTChunk.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTP.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTP.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTPGen.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTPGen.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTPReq.c/1.3.6.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTPReq.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTPRes.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTPRes.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTPServ.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTPServ.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTPUtil.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTeXGen.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTeXGen.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTee.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTee.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTelnet.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTelnet.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTimer.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTimer.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTrace.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTrans.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTTrans.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTUTree.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTUTree.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTUU.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTUU.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTUser.c/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTUser.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTUtils.h/1.1.1.1.8.2/Wed Oct 16 22:26:19 2002//Txdvik_22_40_STABLE +/HTWAIS.c/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTWAIS.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTWSRC.c/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTWSRC.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTWWWStr.c/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTWWWStr.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTWriter.c/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTWriter.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTXML.c/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTXML.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTXParse.c/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE /HTXParse.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTZip.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTZip.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HText.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HText.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/HTextImp.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE +/HTZip.c/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTZip.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HText.c/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HText.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/HTextImp.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE /Makefile.in/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/SGML.c/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/SGML.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWApp.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWCache.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWCore.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWDir.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWFTP.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWFile.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWGophe.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWHTML.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWHTTP.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWInit.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWLib.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWMIME.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWMux.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWNews.h/1.1.1.1.8.1/Fri Sep 13 00:23:46 2002//Txdvik_22_40_STABLE -/WWWSQL.h/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE -/WWWStream.h/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE -/WWWTelnt.h/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE -/WWWTrans.h/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE -/WWWUtil.h/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE -/WWWWAIS.h/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE -/WWWXML.h/1.1.2.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE -/WWWZip.h/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE +/SGML.c/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/SGML.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWApp.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWCache.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWCore.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWDir.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWFTP.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWFile.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWGophe.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWHTML.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWHTTP.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWInit.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWLib.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWMIME.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWMux.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWNews.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWSQL.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWStream.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWTelnt.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWTrans.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWUtil.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWWAIS.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWXML.h/1.1.2.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/WWWZip.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE /aclocal.m4/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE -/configure/1.2.8.2/Mon Sep 16 17:45:27 2002//Txdvik_22_40_STABLE -/configure.in/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE +/configure/1.2.8.3/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE +/configure.in/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE /libwww.ac/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE /md5.c/1.1.1.1/Wed Apr 18 14:23:30 2001//Txdvik_22_40_STABLE /md5.h/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE /withenable.ac/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE /wwwconf.h.in/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE -/wwwsys.h/1.1.1.1.8.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE +/wwwsys.h/1.1.1.1.8.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE D/config//// diff -Naur xdvik-22.40n/libs/libwww/HTAABrow.c xdvik-22.40o/libs/libwww/HTAABrow.c --- xdvik-22.40n/libs/libwww/HTAABrow.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAABrow.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTAABrow.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTAABrow.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** Contains code for parsing challenges and creating credentials for ** basic authentication schemes. See also the HTAAUtil module diff -Naur xdvik-22.40n/libs/libwww/HTAABrow.h xdvik-22.40o/libs/libwww/HTAABrow.h --- xdvik-22.40n/libs/libwww/HTAABrow.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAABrow.h Wed Oct 16 22:26:18 2002 @@ -68,7 +68,7 @@ - @(#) $Id: HTAABrow.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTAABrow.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTAAUtil.c xdvik-22.40o/libs/libwww/HTAAUtil.c --- xdvik-22.40n/libs/libwww/HTAAUtil.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAAUtil.c Wed Oct 16 22:26:18 2002 @@ -4,7 +4,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTAAUtil.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTAAUtil.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** The authentication information is stored in a list of authentication ** data bases, each uniquely identified by a hostname and a port number. diff -Naur xdvik-22.40n/libs/libwww/HTAAUtil.h xdvik-22.40o/libs/libwww/HTAAUtil.h --- xdvik-22.40n/libs/libwww/HTAAUtil.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAAUtil.h Wed Oct 16 22:26:18 2002 @@ -246,6 +246,6 @@ - @(#) $Id: HTAAUtil.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTAAUtil.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTANSI.c xdvik-22.40o/libs/libwww/HTANSI.c --- xdvik-22.40n/libs/libwww/HTANSI.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTANSI.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTANSI.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTANSI.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** History: ** HFN: writtem diff -Naur xdvik-22.40n/libs/libwww/HTAccess.c xdvik-22.40o/libs/libwww/HTAccess.c --- xdvik-22.40n/libs/libwww/HTAccess.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAccess.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTAccess.c,v 1.2.6.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTAccess.c,v 1.2.6.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** Authors ** TBL Tim Berners-Lee timbl@w3.org @@ -157,7 +157,7 @@ /* If replace then open the file */ if ((fp = fopen(filename, "wb")) == NULL) { - HTRequest_addError(request, ERR_NON_FATAL, NO, HTERR_NO_FILE, + HTRequest_addError(request, ERR_FATAL, NO, HTERR_NO_FILE, (char *) filename, strlen(filename), "HTLoadToFile"); return NO; @@ -168,13 +168,6 @@ HTRequest_setOutputStream(request, HTFWriter_new(request, fp, NO)); if (HTLoadAbsolute(url, request) == NO) { fclose(fp); - /* SU 2001/06/23: following line will prevent closing fp for - the second time in HTFWriter_free() (called by - HTRequest_delete()); use `orig_output_stream' for libwww - 5.3.2 instead. There's probably a cleaner solution - for this bug. - */ - request->output_stream = NULL; return NO; } else return YES; diff -Naur xdvik-22.40n/libs/libwww/HTAccess.h xdvik-22.40o/libs/libwww/HTAccess.h --- xdvik-22.40n/libs/libwww/HTAccess.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAccess.h Wed Oct 16 22:26:18 2002 @@ -930,6 +930,6 @@ - @(#) $Id: HTAccess.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTAccess.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTAlert.c xdvik-22.40o/libs/libwww/HTAlert.c --- xdvik-22.40n/libs/libwww/HTAlert.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAlert.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTAlert.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTAlert.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** REPLACE THIS MODULE with a GUI version in a GUI environment! ** diff -Naur xdvik-22.40n/libs/libwww/HTAlert.h xdvik-22.40o/libs/libwww/HTAlert.h --- xdvik-22.40n/libs/libwww/HTAlert.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAlert.h Wed Oct 16 22:26:18 2002 @@ -317,6 +317,6 @@ - @(#) $Id: HTAlert.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTAlert.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTAncMan.h xdvik-22.40o/libs/libwww/HTAncMan.h --- xdvik-22.40n/libs/libwww/HTAncMan.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAncMan.h Wed Oct 16 22:26:18 2002 @@ -140,7 +140,7 @@ -@(#) $Id: HTAncMan.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +@(#) $Id: HTAncMan.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTAnchor.c xdvik-22.40o/libs/libwww/HTAnchor.c --- xdvik-22.40n/libs/libwww/HTAnchor.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAnchor.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTAnchor.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTAnchor.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** An anchor represents a region of a hypertext document which is ** linked to another anchor in the same or a different document. diff -Naur xdvik-22.40n/libs/libwww/HTAnchor.h xdvik-22.40o/libs/libwww/HTAnchor.h --- xdvik-22.40n/libs/libwww/HTAnchor.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAnchor.h Wed Oct 16 22:26:18 2002 @@ -693,6 +693,6 @@ - @(#) $Id: HTAnchor.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTAnchor.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTArray.c xdvik-22.40o/libs/libwww/HTArray.c --- xdvik-22.40n/libs/libwww/HTArray.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTArray.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTArray.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTArray.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** history: Sep 95 HFN Written after looking at Hancock Tower */ diff -Naur xdvik-22.40n/libs/libwww/HTArray.h xdvik-22.40o/libs/libwww/HTArray.h --- xdvik-22.40n/libs/libwww/HTArray.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTArray.h Wed Oct 16 22:26:18 2002 @@ -154,7 +154,7 @@ -@(#) $Id: HTArray.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +@(#) $Id: HTArray.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTAssoc.c xdvik-22.40o/libs/libwww/HTAssoc.c --- xdvik-22.40n/libs/libwww/HTAssoc.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAssoc.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTAssoc.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTAssoc.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** NAMES NOT CASE SENSITIVE, AND ONLY COMMON LENGTH ** IS CHECKED (allows abbreviations; well, length is diff -Naur xdvik-22.40n/libs/libwww/HTAssoc.h xdvik-22.40o/libs/libwww/HTAssoc.h --- xdvik-22.40n/libs/libwww/HTAssoc.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAssoc.h Wed Oct 16 22:26:18 2002 @@ -173,6 +173,6 @@ - @(#) $Id: HTAssoc.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTAssoc.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTAtom.c xdvik-22.40o/libs/libwww/HTAtom.c --- xdvik-22.40n/libs/libwww/HTAtom.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAtom.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTAtom.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTAtom.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** Atoms are names which are given representative pointer values ** so that they can be stored more efficiently, and comparisons diff -Naur xdvik-22.40n/libs/libwww/HTAtom.h xdvik-22.40o/libs/libwww/HTAtom.h --- xdvik-22.40n/libs/libwww/HTAtom.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTAtom.h Wed Oct 16 22:26:18 2002 @@ -96,6 +96,6 @@ - @(#) $Id: HTAtom.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTAtom.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTBInit.c xdvik-22.40o/libs/libwww/HTBInit.c --- xdvik-22.40n/libs/libwww/HTBInit.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTBInit.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTBInit.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTBInit.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** Define a basic set of suffixes and presentations */ diff -Naur xdvik-22.40n/libs/libwww/HTBInit.h xdvik-22.40o/libs/libwww/HTBInit.h --- xdvik-22.40n/libs/libwww/HTBInit.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTBInit.h Wed Oct 16 22:26:18 2002 @@ -60,6 +60,6 @@ - @(#) $Id: HTBInit.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTBInit.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTBTree.c xdvik-22.40o/libs/libwww/HTBTree.c --- xdvik-22.40n/libs/libwww/HTBTree.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTBTree.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTBTree.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTBTree.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** Authors: ** Arthur Secret diff -Naur xdvik-22.40n/libs/libwww/HTBTree.h xdvik-22.40o/libs/libwww/HTBTree.h --- xdvik-22.40n/libs/libwww/HTBTree.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTBTree.h Wed Oct 16 22:26:18 2002 @@ -105,7 +105,7 @@ -@(#) $Id: HTBTree.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +@(#) $Id: HTBTree.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTBind.c xdvik-22.40o/libs/libwww/HTBind.c --- xdvik-22.40n/libs/libwww/HTBind.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTBind.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995 ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTBind.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTBind.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** This module sets up the binding between a file Bind and a media ** type, language, encoding etc. In a client application the Binds diff -Naur xdvik-22.40n/libs/libwww/HTBind.h xdvik-22.40o/libs/libwww/HTBind.h --- xdvik-22.40n/libs/libwww/HTBind.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTBind.h Wed Oct 16 22:26:18 2002 @@ -222,6 +222,6 @@ - @(#) $Id: HTBind.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTBind.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTBound.c xdvik-22.40o/libs/libwww/HTBound.c --- xdvik-22.40n/libs/libwww/HTBound.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTBound.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTBound.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTBound.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** This stream parses a MIME multipart stream and builds a set of new ** streams via the stream stack each time we encounter a boundary start. diff -Naur xdvik-22.40n/libs/libwww/HTBound.h xdvik-22.40o/libs/libwww/HTBound.h --- xdvik-22.40n/libs/libwww/HTBound.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTBound.h Wed Oct 16 22:26:18 2002 @@ -41,7 +41,7 @@ -@(#) $Id: HTBound.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +@(#) $Id: HTBound.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTBufWrt.c xdvik-22.40o/libs/libwww/HTBufWrt.c --- xdvik-22.40n/libs/libwww/HTBufWrt.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTBufWrt.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTBufWrt.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTBufWrt.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** A buffered output stream. This stream lets you write characters to a ** stream without causing a write every time. The data is first written diff -Naur xdvik-22.40n/libs/libwww/HTBufWrt.h xdvik-22.40o/libs/libwww/HTBufWrt.h --- xdvik-22.40n/libs/libwww/HTBufWrt.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTBufWrt.h Wed Oct 16 22:26:18 2002 @@ -82,6 +82,6 @@ - @(#) $Id: HTBufWrt.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTBufWrt.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTCache.c xdvik-22.40o/libs/libwww/HTCache.c --- xdvik-22.40n/libs/libwww/HTCache.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTCache.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTCache.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTCache.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** This modules manages the cache ** diff -Naur xdvik-22.40n/libs/libwww/HTCache.h xdvik-22.40o/libs/libwww/HTCache.h --- xdvik-22.40n/libs/libwww/HTCache.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTCache.h Wed Oct 16 22:26:18 2002 @@ -435,6 +435,6 @@ - @(#) $Id: HTCache.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTCache.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTChannl.c xdvik-22.40o/libs/libwww/HTChannl.c --- xdvik-22.40n/libs/libwww/HTChannl.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTChannl.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTChannl.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTChannl.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** ** HISTORY: diff -Naur xdvik-22.40n/libs/libwww/HTChannl.h xdvik-22.40o/libs/libwww/HTChannl.h --- xdvik-22.40n/libs/libwww/HTChannl.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTChannl.h Wed Oct 16 22:26:18 2002 @@ -158,6 +158,6 @@ - @(#) $Id: HTChannl.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTChannl.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTChunk.c xdvik-22.40o/libs/libwww/HTChunk.c --- xdvik-22.40n/libs/libwww/HTChunk.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTChunk.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTChunk.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTChunk.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** history: AL, HF 28 Apr 94, Now chunk->data is filled by '\0' so ** that the string is terminated at any time. That makes diff -Naur xdvik-22.40n/libs/libwww/HTChunk.h xdvik-22.40o/libs/libwww/HTChunk.h --- xdvik-22.40n/libs/libwww/HTChunk.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTChunk.h Wed Oct 16 22:26:18 2002 @@ -231,6 +231,6 @@ - @(#) $Id: HTChunk.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTChunk.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTConLen.c xdvik-22.40o/libs/libwww/HTConLen.c --- xdvik-22.40n/libs/libwww/HTConLen.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTConLen.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTConLen.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTConLen.c,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** This stream counts the number of bytes in a stream until it reaches ** max number of bytes it can occupy. If this happens then it gives up. diff -Naur xdvik-22.40n/libs/libwww/HTConLen.h xdvik-22.40o/libs/libwww/HTConLen.h --- xdvik-22.40n/libs/libwww/HTConLen.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTConLen.h Wed Oct 16 22:26:18 2002 @@ -105,6 +105,6 @@ - @(#) $Id: HTConLen.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTConLen.h,v 1.1.1.1.8.2 2002/10/16 22:26:18 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTCookie.c xdvik-22.40o/libs/libwww/HTCookie.c --- xdvik-22.40n/libs/libwww/HTCookie.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTCookie.c Wed Oct 16 22:26:18 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1999. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTCookie.c,v 1.1.2.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTCookie.c,v 1.1.2.2 2002/10/16 22:26:18 stefanulrich Exp $ ** ** Written based on Jim Raven's code sent to the list ** diff -Naur xdvik-22.40n/libs/libwww/HTCookie.h xdvik-22.40o/libs/libwww/HTCookie.h --- xdvik-22.40n/libs/libwww/HTCookie.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTCookie.h Wed Oct 16 22:26:19 2002 @@ -175,6 +175,6 @@ - @(#) $Id: HTCookie.h,v 1.1.2.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTCookie.h,v 1.1.2.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTDAV.c xdvik-22.40o/libs/libwww/HTDAV.c --- xdvik-22.40n/libs/libwww/HTDAV.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDAV.c Wed Oct 16 22:26:19 2002 @@ -16,11 +16,8 @@ ** 30 May 02 Changed - wwwsys.h becames the first include file ** ** $Log: HTDAV.c,v $ -** Revision 1.1.2.1 2002/09/13 00:23:45 stefanulrich -** - updated libwww to status of teTeX beta-20020911, but with some additional -** fixes to compiler warnings and bug #434836. Still needs testing of configure -** options for compiling with system-wide libwwww. -** - re-enabled the nifty downloading messages (kind of saying goodbye to libwww ;-) +** Revision 1.1.2.2 2002/10/16 22:26:19 stefanulrich +** upgraded to kpathsea v.3.3.8 and libwww 5.4.0 ** ** Revision 1.3 2002/05/30 18:08:56 kirschpi ** Minor changes concerning windows plataform (as STDIN_FILENO reference at @@ -41,7 +38,7 @@ ** Manuele Kirsch ** ** -** $Id: HTDAV.c,v 1.1.2.1 2002/09/13 00:23:45 stefanulrich Exp $ +** $Id: HTDAV.c,v 1.1.2.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTDAV.h xdvik-22.40o/libs/libwww/HTDAV.h --- xdvik-22.40n/libs/libwww/HTDAV.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDAV.h Wed Oct 16 22:26:19 2002 @@ -378,7 +378,7 @@ - $Id: HTDAV.h,v 1.1.2.1 2002/09/13 00:23:45 stefanulrich Exp $ + $Id: HTDAV.h,v 1.1.2.2 2002/10/16 22:26:19 stefanulrich Exp $ diff -Naur xdvik-22.40n/libs/libwww/HTDNS.c xdvik-22.40o/libs/libwww/HTDNS.c --- xdvik-22.40n/libs/libwww/HTDNS.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDNS.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTDNS.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTDNS.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This object manages a cache of hosts we have looked up vis DNS. ** The object contains the necessary parts from hostent. For Internet host diff -Naur xdvik-22.40n/libs/libwww/HTDNS.h xdvik-22.40o/libs/libwww/HTDNS.h --- xdvik-22.40n/libs/libwww/HTDNS.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDNS.h Wed Oct 16 22:26:19 2002 @@ -147,6 +147,6 @@ - @(#) $Id: HTDNS.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTDNS.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTDemux.c xdvik-22.40o/libs/libwww/HTDemux.c --- xdvik-22.40n/libs/libwww/HTDemux.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDemux.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTDemux.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTDemux.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This stream parses MUX headers. ** diff -Naur xdvik-22.40n/libs/libwww/HTDemux.h xdvik-22.40o/libs/libwww/HTDemux.h --- xdvik-22.40n/libs/libwww/HTDemux.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDemux.h Wed Oct 16 22:26:19 2002 @@ -50,6 +50,6 @@ - @(#) $Id: HTDemux.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTDemux.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTDescpt.c xdvik-22.40o/libs/libwww/HTDescpt.c --- xdvik-22.40n/libs/libwww/HTDescpt.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDescpt.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTDescpt.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTDescpt.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Authors: ** AL Ari Luotonen diff -Naur xdvik-22.40n/libs/libwww/HTDescpt.h xdvik-22.40o/libs/libwww/HTDescpt.h --- xdvik-22.40n/libs/libwww/HTDescpt.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDescpt.h Wed Oct 16 22:26:19 2002 @@ -130,7 +130,7 @@ -@(#) $Id: HTDescpt.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +@(#) $Id: HTDescpt.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTDialog.c xdvik-22.40o/libs/libwww/HTDialog.c --- xdvik-22.40n/libs/libwww/HTDialog.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDialog.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTDialog.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTDialog.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module provides a default implementation of the application part ** of the Message and Dialog part or the Library. You do not have to do diff -Naur xdvik-22.40n/libs/libwww/HTDialog.h xdvik-22.40o/libs/libwww/HTDialog.h --- xdvik-22.40n/libs/libwww/HTDialog.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDialog.h Wed Oct 16 22:26:19 2002 @@ -315,6 +315,6 @@ - @(#) $Id: HTDialog.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTDialog.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTDigest.c xdvik-22.40o/libs/libwww/HTDigest.c --- xdvik-22.40n/libs/libwww/HTDigest.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDigest.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT W3C/INRIA 1998. ** Please first read the full copyright statement in the file COPYRIGHT. -** @(#) $Id: HTDigest.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTDigest.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Contains a generic interface to the message digest algorithms, ** inspired from the RSA-Euro toolkit. For the moment, it only diff -Naur xdvik-22.40n/libs/libwww/HTDigest.h xdvik-22.40o/libs/libwww/HTDigest.h --- xdvik-22.40n/libs/libwww/HTDigest.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDigest.h Wed Oct 16 22:26:19 2002 @@ -82,7 +82,7 @@ - @(#) $Id: HTDigest.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTDigest.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTDir.c xdvik-22.40o/libs/libwww/HTDir.c --- xdvik-22.40n/libs/libwww/HTDir.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDir.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTDir.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTDir.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This is unix-specific code in general ** The module is intended for use in HTFile.c and HTFTP.c where @@ -481,7 +481,7 @@ if (!dir) return NO; if (dir->key != HT_DK_NONE) { HTArray *array = dir->array; - void **data = NULL; + void **data; HTDirNode *node; HTDir_headLine(dir); HTArray_sort(array, (dir->key==HT_DK_CINS ? DirCaseSort : DirSort)); diff -Naur xdvik-22.40n/libs/libwww/HTDir.h xdvik-22.40o/libs/libwww/HTDir.h --- xdvik-22.40n/libs/libwww/HTDir.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTDir.h Wed Oct 16 22:26:19 2002 @@ -136,7 +136,7 @@ -@(#) $Id: HTDir.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +@(#) $Id: HTDir.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTEPtoCl.c xdvik-22.40o/libs/libwww/HTEPtoCl.c --- xdvik-22.40n/libs/libwww/HTEPtoCl.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTEPtoCl.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTEPtoCl.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTEPtoCl.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module contains the interface between the ** the XParse module and the client. The dummy function is diff -Naur xdvik-22.40n/libs/libwww/HTEPtoCl.h xdvik-22.40o/libs/libwww/HTEPtoCl.h --- xdvik-22.40n/libs/libwww/HTEPtoCl.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTEPtoCl.h Wed Oct 16 22:26:19 2002 @@ -43,6 +43,6 @@ - @(#) $Id: HTEPtoCl.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTEPtoCl.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTError.c xdvik-22.40o/libs/libwww/HTError.c --- xdvik-22.40n/libs/libwww/HTError.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTError.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTError.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTError.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This is the implementaion of an error message reporting system that ** reports errors occured either in a stream module (structured streams diff -Naur xdvik-22.40n/libs/libwww/HTError.h xdvik-22.40o/libs/libwww/HTError.h --- xdvik-22.40n/libs/libwww/HTError.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTError.h Wed Oct 16 22:26:19 2002 @@ -359,6 +359,6 @@ - @(#) $Id: HTError.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTError.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTEscape.c xdvik-22.40o/libs/libwww/HTEscape.c --- xdvik-22.40n/libs/libwww/HTEscape.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTEscape.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTEscape.c,v 1.2.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTEscape.c,v 1.2.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** history: ** Nov 13 94 Spawned from HTParse, as it then can be used in utility diff -Naur xdvik-22.40n/libs/libwww/HTEscape.h xdvik-22.40o/libs/libwww/HTEscape.h --- xdvik-22.40n/libs/libwww/HTEscape.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTEscape.h Wed Oct 16 22:26:19 2002 @@ -85,6 +85,6 @@ - @(#) $Id: HTEscape.h,v 1.2.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTEscape.h,v 1.2.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTEvent.c xdvik-22.40o/libs/libwww/HTEvent.c --- xdvik-22.40n/libs/libwww/HTEvent.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTEvent.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1996. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTEvent.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTEvent.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** The event dispatcher allows applications to register their own event ** models. They may register the standard HTEventrg methods from diff -Naur xdvik-22.40n/libs/libwww/HTEvent.h xdvik-22.40o/libs/libwww/HTEvent.h --- xdvik-22.40n/libs/libwww/HTEvent.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTEvent.h Wed Oct 16 22:26:19 2002 @@ -241,6 +241,6 @@ - @(#) $Id: HTEvent.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTEvent.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTEvtLst.c xdvik-22.40o/libs/libwww/HTEvtLst.c --- xdvik-22.40n/libs/libwww/HTEvtLst.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTEvtLst.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTEvtLst.c,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTEvtLst.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Updated HTEvent module ** This new module combines the functions of the old HTEvent module and diff -Naur xdvik-22.40n/libs/libwww/HTEvtLst.h xdvik-22.40o/libs/libwww/HTEvtLst.h --- xdvik-22.40n/libs/libwww/HTEvtLst.h Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTEvtLst.h Wed Oct 16 22:26:19 2002 @@ -175,6 +175,6 @@ - @(#) $Id: HTEvtLst.h,v 1.1.1.1.8.1 2002/09/13 00:23:45 stefanulrich Exp $ + @(#) $Id: HTEvtLst.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTFSave.c xdvik-22.40o/libs/libwww/HTFSave.c --- xdvik-22.40n/libs/libwww/HTFSave.c Fri Sep 13 00:23:45 2002 +++ xdvik-22.40o/libs/libwww/HTFSave.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTFSave.c,v 1.1.2.1 2002/09/13 00:23:45 stefanulrich Exp $ +** @(#) $Id: HTFSave.c,v 1.1.2.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This version of the stream object just writes to a C file. ** The file is assumed open and left open. diff -Naur xdvik-22.40n/libs/libwww/HTFSave.h xdvik-22.40o/libs/libwww/HTFSave.h --- xdvik-22.40n/libs/libwww/HTFSave.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFSave.h Wed Oct 16 22:26:19 2002 @@ -77,6 +77,6 @@ - @(#) $Id: HTFSave.h,v 1.1.2.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTFSave.h,v 1.1.2.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTFTP.c xdvik-22.40o/libs/libwww/HTFTP.c --- xdvik-22.40n/libs/libwww/HTFTP.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFTP.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTFTP.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTFTP.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** A cache of control connections is kept. ** diff -Naur xdvik-22.40n/libs/libwww/HTFTP.h xdvik-22.40o/libs/libwww/HTFTP.h --- xdvik-22.40n/libs/libwww/HTFTP.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFTP.h Wed Oct 16 22:26:19 2002 @@ -99,7 +99,7 @@ -@(#) $Id: HTFTP.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTFTP.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTFTPDir.c xdvik-22.40o/libs/libwww/HTFTPDir.c --- xdvik-22.40n/libs/libwww/HTFTPDir.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFTPDir.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTFTPDir.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTFTPDir.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Authors ** HF Henrik Frystyk diff -Naur xdvik-22.40n/libs/libwww/HTFTPDir.h xdvik-22.40o/libs/libwww/HTFTPDir.h --- xdvik-22.40n/libs/libwww/HTFTPDir.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFTPDir.h Wed Oct 16 22:26:19 2002 @@ -40,7 +40,7 @@ -@(#) $Id: HTFTPDir.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTFTPDir.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTFWrite.c xdvik-22.40o/libs/libwww/HTFWrite.c --- xdvik-22.40n/libs/libwww/HTFWrite.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFWrite.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTFWrite.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTFWrite.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This version of the stream object just writes to a C file. ** The file is assumed open and left open. diff -Naur xdvik-22.40n/libs/libwww/HTFWrite.h xdvik-22.40o/libs/libwww/HTFWrite.h --- xdvik-22.40n/libs/libwww/HTFWrite.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFWrite.h Wed Oct 16 22:26:19 2002 @@ -57,6 +57,6 @@ - @(#) $Id: HTFWrite.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTFWrite.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTFile.c xdvik-22.40o/libs/libwww/HTFile.c --- xdvik-22.40n/libs/libwww/HTFile.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFile.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTFile.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTFile.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This is unix-specific code in general, with some VMS bits. ** These are routines for file access used by browsers. diff -Naur xdvik-22.40n/libs/libwww/HTFile.h xdvik-22.40o/libs/libwww/HTFile.h --- xdvik-22.40n/libs/libwww/HTFile.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFile.h Wed Oct 16 22:26:19 2002 @@ -97,6 +97,6 @@ - @(#) $Id: HTFile.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTFile.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTFilter.c xdvik-22.40o/libs/libwww/HTFilter.c --- xdvik-22.40n/libs/libwww/HTFilter.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFilter.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTFilter.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTFilter.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module implrments a set of default filters that can be registerd ** as BEFORE and AFTER filters to the Net manager diff -Naur xdvik-22.40n/libs/libwww/HTFilter.h xdvik-22.40o/libs/libwww/HTFilter.h --- xdvik-22.40n/libs/libwww/HTFilter.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFilter.h Wed Oct 16 22:26:19 2002 @@ -195,6 +195,6 @@ - @(#) $Id: HTFilter.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTFilter.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTFormat.c xdvik-22.40o/libs/libwww/HTFormat.c --- xdvik-22.40n/libs/libwww/HTFormat.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFormat.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTFormat.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTFormat.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Bugs: ** Assumes the incoming stream is ASCII, rather than a local file diff -Naur xdvik-22.40n/libs/libwww/HTFormat.h xdvik-22.40o/libs/libwww/HTFormat.h --- xdvik-22.40n/libs/libwww/HTFormat.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTFormat.h Wed Oct 16 22:26:19 2002 @@ -762,6 +762,6 @@ - @(#) $Id: HTFormat.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTFormat.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTGopher.h xdvik-22.40o/libs/libwww/HTGopher.h --- xdvik-22.40n/libs/libwww/HTGopher.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTGopher.h Wed Oct 16 22:26:19 2002 @@ -37,7 +37,7 @@ -@(#) $Id: HTGopher.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTGopher.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTGuess.c xdvik-22.40o/libs/libwww/HTGuess.c --- xdvik-22.40n/libs/libwww/HTGuess.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTGuess.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTGuess.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTGuess.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This version of the stream object just writes its input ** to its output, but prepends Content-Type: field and an diff -Naur xdvik-22.40n/libs/libwww/HTGuess.h xdvik-22.40o/libs/libwww/HTGuess.h --- xdvik-22.40n/libs/libwww/HTGuess.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTGuess.h Wed Oct 16 22:26:19 2002 @@ -43,6 +43,6 @@ - @(#) $Id: HTGuess.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTGuess.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTHInit.c xdvik-22.40o/libs/libwww/HTHInit.c --- xdvik-22.40n/libs/libwww/HTHInit.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHInit.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTHInit.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTHInit.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Set up the HTML parsers in libwww */ diff -Naur xdvik-22.40n/libs/libwww/HTHInit.h xdvik-22.40o/libs/libwww/HTHInit.h --- xdvik-22.40n/libs/libwww/HTHInit.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHInit.h Wed Oct 16 22:26:19 2002 @@ -66,6 +66,6 @@ - @(#) $Id: HTHInit.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTHInit.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTHash.h xdvik-22.40o/libs/libwww/HTHash.h --- xdvik-22.40n/libs/libwww/HTHash.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHash.h Wed Oct 16 22:26:19 2002 @@ -124,6 +124,6 @@ - @(#) $Id: HTHash.h,v 1.1.2.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTHash.h,v 1.1.2.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTHeader.c xdvik-22.40o/libs/libwww/HTHeader.c --- xdvik-22.40n/libs/libwww/HTHeader.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHeader.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTHeader.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTHeader.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** HISTORY: ** 2 Nov 95 HFN Written on a rainy night diff -Naur xdvik-22.40n/libs/libwww/HTHeader.h xdvik-22.40o/libs/libwww/HTHeader.h --- xdvik-22.40n/libs/libwww/HTHeader.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHeader.h Wed Oct 16 22:26:19 2002 @@ -120,6 +120,6 @@ - @(#) $Id: HTHeader.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTHeader.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTHist.c xdvik-22.40o/libs/libwww/HTHist.c --- xdvik-22.40n/libs/libwww/HTHist.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHist.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTHist.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTHist.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** The history manager for the Library. This module is not called any ** where in the Library so if the application does not call it, it is diff -Naur xdvik-22.40n/libs/libwww/HTHist.h xdvik-22.40o/libs/libwww/HTHist.h --- xdvik-22.40n/libs/libwww/HTHist.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHist.h Wed Oct 16 22:26:19 2002 @@ -222,7 +222,7 @@ -@(#) $Id: HTHist.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTHist.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTHome.c xdvik-22.40o/libs/libwww/HTHome.c --- xdvik-22.40n/libs/libwww/HTHome.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHome.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTHome.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTHome.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Authors ** TBL Tim Berners-Lee timbl@w3.org diff -Naur xdvik-22.40n/libs/libwww/HTHome.h xdvik-22.40o/libs/libwww/HTHome.h --- xdvik-22.40n/libs/libwww/HTHome.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHome.h Wed Oct 16 22:26:19 2002 @@ -230,6 +230,6 @@ - @(#) $Id: HTHome.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTHome.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTHost.c xdvik-22.40o/libs/libwww/HTHost.c --- xdvik-22.40n/libs/libwww/HTHost.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHost.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTHost.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTHost.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This object manages the information that we know about a remote host. ** This can for example be what type of host it is, and what version diff -Naur xdvik-22.40n/libs/libwww/HTHost.h xdvik-22.40o/libs/libwww/HTHost.h --- xdvik-22.40n/libs/libwww/HTHost.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHost.h Wed Oct 16 22:26:19 2002 @@ -637,6 +637,6 @@ - @(#) $Id: HTHost.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTHost.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTHstMan.h xdvik-22.40o/libs/libwww/HTHstMan.h --- xdvik-22.40n/libs/libwww/HTHstMan.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTHstMan.h Wed Oct 16 22:26:19 2002 @@ -125,6 +125,6 @@ - @(#) $Id: HTHstMan.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTHstMan.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTIOStream.h xdvik-22.40o/libs/libwww/HTIOStream.h --- xdvik-22.40n/libs/libwww/HTIOStream.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTIOStream.h Wed Oct 16 22:26:19 2002 @@ -217,6 +217,6 @@ - @(#) $Id: HTIOStream.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTIOStream.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTIcons.c xdvik-22.40o/libs/libwww/HTIcons.c --- xdvik-22.40n/libs/libwww/HTIcons.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTIcons.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTIcons.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTIcons.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module contains the functions for initializing, adding ** and selecting the icon for local directory listings, FTP and Gopher. diff -Naur xdvik-22.40n/libs/libwww/HTIcons.h xdvik-22.40o/libs/libwww/HTIcons.h --- xdvik-22.40n/libs/libwww/HTIcons.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTIcons.h Wed Oct 16 22:26:19 2002 @@ -199,6 +199,6 @@ - @(#) $Id: HTIcons.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTIcons.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTInet.c xdvik-22.40o/libs/libwww/HTInet.c --- xdvik-22.40n/libs/libwww/HTInet.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTInet.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTInet.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTInet.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This code is in common between client and server sides. ** diff -Naur xdvik-22.40n/libs/libwww/HTInet.h xdvik-22.40o/libs/libwww/HTInet.h --- xdvik-22.40n/libs/libwww/HTInet.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTInet.h Wed Oct 16 22:26:19 2002 @@ -173,6 +173,6 @@ - @(#) $Id: HTInet.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTInet.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTInit.c xdvik-22.40o/libs/libwww/HTInit.c --- xdvik-22.40n/libs/libwww/HTInit.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTInit.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTInit.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTInit.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** General initialization functions. ** diff -Naur xdvik-22.40n/libs/libwww/HTInit.h xdvik-22.40o/libs/libwww/HTInit.h --- xdvik-22.40n/libs/libwww/HTInit.h Sat Sep 14 00:24:46 2002 +++ xdvik-22.40o/libs/libwww/HTInit.h Wed Oct 16 22:26:19 2002 @@ -286,6 +286,6 @@ - @(#) $Id: HTInit.h,v 1.1.1.1.8.2 2002/09/14 00:24:46 stefanulrich Exp $ + @(#) $Id: HTInit.h,v 1.1.1.1.8.3 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTLib.c xdvik-22.40o/libs/libwww/HTLib.c --- xdvik-22.40n/libs/libwww/HTLib.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTLib.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTLib.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTLib.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Authors ** HFN Henrik Frystyk Nielsen, frystyk@w3.org diff -Naur xdvik-22.40n/libs/libwww/HTLib.h xdvik-22.40o/libs/libwww/HTLib.h --- xdvik-22.40n/libs/libwww/HTLib.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTLib.h Wed Oct 16 22:26:19 2002 @@ -131,6 +131,6 @@ - @(#) $Id: HTLib.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTLib.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTLink.c xdvik-22.40o/libs/libwww/HTLink.c --- xdvik-22.40n/libs/libwww/HTLink.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTLink.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTLink.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTLink.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** An anchor represents a region of a hypertext document which is ** linked to another anchor in the same or a different document. diff -Naur xdvik-22.40n/libs/libwww/HTLink.h xdvik-22.40o/libs/libwww/HTLink.h --- xdvik-22.40n/libs/libwww/HTLink.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTLink.h Wed Oct 16 22:26:19 2002 @@ -189,6 +189,6 @@ -@(#) $Id: HTLink.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTLink.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTList.c xdvik-22.40o/libs/libwww/HTList.c --- xdvik-22.40n/libs/libwww/HTList.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTList.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTList.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTList.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** A list is represented as a sequence of linked nodes of type HTList. ** The first node is a header which contains no object. diff -Naur xdvik-22.40n/libs/libwww/HTList.h xdvik-22.40o/libs/libwww/HTList.h --- xdvik-22.40n/libs/libwww/HTList.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTList.h Wed Oct 16 22:26:19 2002 @@ -183,6 +183,6 @@ - @(#) $Id: HTList.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTList.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTLocal.c xdvik-22.40o/libs/libwww/HTLocal.c --- xdvik-22.40n/libs/libwww/HTLocal.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTLocal.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTLocal.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTLocal.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** History: ** HFN: Written diff -Naur xdvik-22.40n/libs/libwww/HTLocal.h xdvik-22.40o/libs/libwww/HTLocal.h --- xdvik-22.40n/libs/libwww/HTLocal.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTLocal.h Wed Oct 16 22:26:19 2002 @@ -104,6 +104,6 @@ - @(#) $Id: HTLocal.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTLocal.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTLog.c xdvik-22.40o/libs/libwww/HTLog.c --- xdvik-22.40n/libs/libwww/HTLog.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTLog.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTLog.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTLog.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module contains a simple logging mechanism for requests. ** The user must open and close the log file!!! diff -Naur xdvik-22.40n/libs/libwww/HTLog.h xdvik-22.40o/libs/libwww/HTLog.h --- xdvik-22.40n/libs/libwww/HTLog.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTLog.h Wed Oct 16 22:26:19 2002 @@ -113,7 +113,7 @@ -@(#) $Id: HTLog.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTLog.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMIME.c xdvik-22.40o/libs/libwww/HTMIME.c --- xdvik-22.40n/libs/libwww/HTMIME.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMIME.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMIME.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMIME.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This is RFC 1341-specific code. ** The input stream pushed into this parser is assumed to be diff -Naur xdvik-22.40n/libs/libwww/HTMIME.h xdvik-22.40o/libs/libwww/HTMIME.h --- xdvik-22.40n/libs/libwww/HTMIME.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMIME.h Wed Oct 16 22:26:19 2002 @@ -158,6 +158,6 @@ - @(#) $Id: HTMIME.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMIME.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMIMERq.c xdvik-22.40o/libs/libwww/HTMIMERq.c --- xdvik-22.40n/libs/libwww/HTMIMERq.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMIMERq.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMIMERq.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMIMERq.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module implements the output stream for MIME used for sending ** requests with a entity body to HTTP, NEWS, etc. or for generating diff -Naur xdvik-22.40n/libs/libwww/HTMIMERq.h xdvik-22.40o/libs/libwww/HTMIMERq.h --- xdvik-22.40n/libs/libwww/HTMIMERq.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMIMERq.h Wed Oct 16 22:26:19 2002 @@ -50,7 +50,7 @@ -@(#) $Id: HTMIMERq.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTMIMERq.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMIMImp.c xdvik-22.40o/libs/libwww/HTMIMImp.c --- xdvik-22.40n/libs/libwww/HTMIMImp.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMIMImp.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMIMImp.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMIMImp.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module contains the default MIME header parsers for the MIME ** parser in HTMIME.c. They are all initialized at run time and can hence diff -Naur xdvik-22.40n/libs/libwww/HTMIMImp.h xdvik-22.40o/libs/libwww/HTMIMImp.h --- xdvik-22.40n/libs/libwww/HTMIMImp.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMIMImp.h Wed Oct 16 22:26:19 2002 @@ -90,6 +90,6 @@ - @(#) $Id: HTMIMImp.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMIMImp.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMIMPrs.c xdvik-22.40o/libs/libwww/HTMIMPrs.c --- xdvik-22.40n/libs/libwww/HTMIMPrs.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMIMPrs.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1996. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMIMPrs.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMIMPrs.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** See HTHshLst.html for a description of HashLists. ** diff -Naur xdvik-22.40n/libs/libwww/HTMIMPrs.h xdvik-22.40o/libs/libwww/HTMIMPrs.h --- xdvik-22.40n/libs/libwww/HTMIMPrs.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMIMPrs.h Wed Oct 16 22:26:19 2002 @@ -107,6 +107,6 @@ - @(#) $Id: HTMIMPrs.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMIMPrs.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTML.c xdvik-22.40o/libs/libwww/HTML.c --- xdvik-22.40n/libs/libwww/HTML.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTML.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTML.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTML.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This generates of a hypertext object. It converts from the ** structured stream interface foo HTML events into the style- diff -Naur xdvik-22.40n/libs/libwww/HTML.h xdvik-22.40o/libs/libwww/HTML.h --- xdvik-22.40n/libs/libwww/HTML.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTML.h Wed Oct 16 22:26:19 2002 @@ -85,6 +85,6 @@ - @(#) $Id: HTML.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTML.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMLGen.c xdvik-22.40o/libs/libwww/HTMLGen.c --- xdvik-22.40n/libs/libwww/HTMLGen.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMLGen.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMLGen.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMLGen.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This version of the HTML object sends HTML markup to the output stream. ** diff -Naur xdvik-22.40n/libs/libwww/HTMLGen.h xdvik-22.40o/libs/libwww/HTMLGen.h --- xdvik-22.40n/libs/libwww/HTMLGen.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMLGen.h Wed Oct 16 22:26:19 2002 @@ -55,7 +55,7 @@ -@(#) $Id: HTMLGen.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTMLGen.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMLPDTD.c xdvik-22.40o/libs/libwww/HTMLPDTD.c --- xdvik-22.40n/libs/libwww/HTMLPDTD.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMLPDTD.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMLPDTD.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMLPDTD.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** 6 Nov 93 MD Increased size of img_attr array to make space ** for terminator. diff -Naur xdvik-22.40n/libs/libwww/HTMLPDTD.h xdvik-22.40o/libs/libwww/HTMLPDTD.h --- xdvik-22.40n/libs/libwww/HTMLPDTD.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMLPDTD.h Wed Oct 16 22:26:19 2002 @@ -1121,6 +1121,6 @@ - @(#) $Id: HTMLPDTD.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMLPDTD.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMemLog.c xdvik-22.40o/libs/libwww/HTMemLog.c --- xdvik-22.40n/libs/libwww/HTMemLog.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMemLog.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1996. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMemLog.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMemLog.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** 26 Nov 96 (EGP) started */ diff -Naur xdvik-22.40n/libs/libwww/HTMemLog.h xdvik-22.40o/libs/libwww/HTMemLog.h --- xdvik-22.40n/libs/libwww/HTMemLog.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMemLog.h Wed Oct 16 22:26:19 2002 @@ -51,6 +51,6 @@ - @(#) $Id: HTMemLog.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMemLog.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMemory.c xdvik-22.40o/libs/libwww/HTMemory.c --- xdvik-22.40n/libs/libwww/HTMemory.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMemory.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMemory.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMemory.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** History: ** 8 Feb 95 Written by Eric and Henrik diff -Naur xdvik-22.40n/libs/libwww/HTMemory.h xdvik-22.40o/libs/libwww/HTMemory.h --- xdvik-22.40n/libs/libwww/HTMemory.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMemory.h Wed Oct 16 22:26:19 2002 @@ -164,6 +164,6 @@ - @(#) $Id: HTMemory.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMemory.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMerge.c xdvik-22.40o/libs/libwww/HTMerge.c --- xdvik-22.40n/libs/libwww/HTMerge.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMerge.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMerge.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMerge.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** The Merge class just is a n entry stream. Easy. The reason for having ** this stream is that we must be able to handle free and abort in an diff -Naur xdvik-22.40n/libs/libwww/HTMerge.h xdvik-22.40o/libs/libwww/HTMerge.h --- xdvik-22.40n/libs/libwww/HTMerge.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMerge.h Wed Oct 16 22:26:19 2002 @@ -40,6 +40,6 @@ - @(#) $Id: HTMerge.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMerge.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMethod.c xdvik-22.40o/libs/libwww/HTMethod.c --- xdvik-22.40n/libs/libwww/HTMethod.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMethod.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMethod.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMethod.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** ** HISTORY: diff -Naur xdvik-22.40n/libs/libwww/HTMethod.h xdvik-22.40o/libs/libwww/HTMethod.h --- xdvik-22.40n/libs/libwww/HTMethod.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMethod.h Wed Oct 16 22:26:19 2002 @@ -158,6 +158,6 @@ - @(#) $Id: HTMethod.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMethod.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMulpar.h xdvik-22.40o/libs/libwww/HTMulpar.h --- xdvik-22.40n/libs/libwww/HTMulpar.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMulpar.h Wed Oct 16 22:26:19 2002 @@ -81,7 +81,7 @@ -@(#) $Id: HTMulpar.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTMulpar.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMulti.c xdvik-22.40o/libs/libwww/HTMulti.c --- xdvik-22.40n/libs/libwww/HTMulti.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMulti.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMulti.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMulti.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** History: ** March 94 AL Separated from HTFile.c because @@ -430,7 +430,7 @@ ** Finally get the best variant which is readable */ if (HTRank(req, variants)) { - void ** data = NULL; + void ** data; HTContentDescription * cd = HTArray_firstObject(variants, data); while (cd) { if (cd->filename) { diff -Naur xdvik-22.40n/libs/libwww/HTMulti.h xdvik-22.40o/libs/libwww/HTMulti.h --- xdvik-22.40n/libs/libwww/HTMulti.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMulti.h Wed Oct 16 22:26:19 2002 @@ -70,6 +70,6 @@ - @(#) $Id: HTMulti.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMulti.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMuxCh.c xdvik-22.40o/libs/libwww/HTMuxCh.c --- xdvik-22.40n/libs/libwww/HTMuxCh.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMuxCh.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMuxCh.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMuxCh.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Handles a MUX Channel with sessions and protocols ** diff -Naur xdvik-22.40n/libs/libwww/HTMuxCh.h xdvik-22.40o/libs/libwww/HTMuxCh.h --- xdvik-22.40n/libs/libwww/HTMuxCh.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMuxCh.h Wed Oct 16 22:26:19 2002 @@ -134,6 +134,6 @@ - @(#) $Id: HTMuxCh.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMuxCh.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMuxHeader.h xdvik-22.40o/libs/libwww/HTMuxHeader.h --- xdvik-22.40n/libs/libwww/HTMuxHeader.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMuxHeader.h Wed Oct 16 22:26:19 2002 @@ -145,6 +145,6 @@ - @(#) $Id: HTMuxHeader.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMuxHeader.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTMuxTx.c xdvik-22.40o/libs/libwww/HTMuxTx.c --- xdvik-22.40n/libs/libwww/HTMuxTx.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMuxTx.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTMuxTx.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTMuxTx.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** A buffered output MUX stream. ** diff -Naur xdvik-22.40n/libs/libwww/HTMuxTx.h xdvik-22.40o/libs/libwww/HTMuxTx.h --- xdvik-22.40n/libs/libwww/HTMuxTx.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTMuxTx.h Wed Oct 16 22:26:19 2002 @@ -48,6 +48,6 @@ - @(#) $Id: HTMuxTx.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTMuxTx.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTNDir.c xdvik-22.40o/libs/libwww/HTNDir.c --- xdvik-22.40n/libs/libwww/HTNDir.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNDir.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTNDir.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTNDir.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Creates listings for all kind of News output. ** @@ -358,8 +358,8 @@ int level2 = node2->refLevel; int level = HTMAX(level1, level2); int i; - HTNewsNode* parent1 = NULL; - HTNewsNode* parent2 = NULL; + HTNewsNode* parent1; + HTNewsNode* parent2; int diff = 0; for (i = level; i >= 0; i--) { @@ -391,7 +391,7 @@ { if (node && node->show) { HTStructured *target = dir->target; - char * escaped = NULL; + char * escaped; HTNewsDir_addLevelTags (dir, node->refLevel); /* Added by MP. */ START(HTML_LI); @@ -818,7 +818,7 @@ ** free the array. */ { - void ** data = NULL; + void ** data; HTNewsNode *node = (HTNewsNode *) HTArray_firstObject(array, data); while (node) { HTNewsNode_print(dir, node); diff -Naur xdvik-22.40n/libs/libwww/HTNDir.h xdvik-22.40o/libs/libwww/HTNDir.h --- xdvik-22.40n/libs/libwww/HTNDir.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNDir.h Wed Oct 16 22:26:19 2002 @@ -115,6 +115,6 @@ - @(#) $Id: HTNDir.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTNDir.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTNet.c xdvik-22.40o/libs/libwww/HTNet.c --- xdvik-22.40n/libs/libwww/HTNet.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNet.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTNet.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTNet.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This is the implementation of the internal library multithreading ** functions. This includes an interrupt handler and a event loop. diff -Naur xdvik-22.40n/libs/libwww/HTNet.h xdvik-22.40o/libs/libwww/HTNet.h --- xdvik-22.40n/libs/libwww/HTNet.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNet.h Wed Oct 16 22:26:19 2002 @@ -779,6 +779,6 @@ - @(#) $Id: HTNet.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTNet.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTNetMan.h xdvik-22.40o/libs/libwww/HTNetMan.h --- xdvik-22.40n/libs/libwww/HTNetMan.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNetMan.h Wed Oct 16 22:26:19 2002 @@ -146,6 +146,6 @@ - @(#) $Id: HTNetMan.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTNetMan.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTNetTxt.c xdvik-22.40o/libs/libwww/HTNetTxt.c --- xdvik-22.40n/libs/libwww/HTNetTxt.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNetTxt.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTNetTxt.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTNetTxt.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module provides two basic streams that converts from CRLF to ** an internal C representation (\n) and from the C representation to diff -Naur xdvik-22.40n/libs/libwww/HTNetTxt.h xdvik-22.40o/libs/libwww/HTNetTxt.h --- xdvik-22.40n/libs/libwww/HTNetTxt.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNetTxt.h Wed Oct 16 22:26:19 2002 @@ -38,6 +38,6 @@ - @(#) $Id: HTNetTxt.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTNetTxt.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTNews.h xdvik-22.40o/libs/libwww/HTNews.h --- xdvik-22.40n/libs/libwww/HTNews.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNews.h Wed Oct 16 22:26:19 2002 @@ -64,6 +64,6 @@ - @(#) $Id: HTNews.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTNews.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTNewsLs.c xdvik-22.40o/libs/libwww/HTNewsLs.c --- xdvik-22.40n/libs/libwww/HTNewsLs.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNewsLs.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTNewsLs.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTNewsLs.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Authors ** FTLO Felix Lo @@ -291,7 +291,7 @@ if (element) { char * title = GetNewsGroupTitle(request); HTNewsDir * dir = HTNewsDir_new(request, title, list_key, NO); - void ** data = NULL; + void ** data; char * line = (char *) HTArray_firstObject(element->cache, data); while (line) { HTNewsDir_addGroupElement(dir, line, NO); diff -Naur xdvik-22.40n/libs/libwww/HTNewsLs.h xdvik-22.40o/libs/libwww/HTNewsLs.h --- xdvik-22.40n/libs/libwww/HTNewsLs.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNewsLs.h Wed Oct 16 22:26:19 2002 @@ -53,6 +53,6 @@ - @(#) $Id: HTNewsLs.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTNewsLs.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTNewsRq.c xdvik-22.40o/libs/libwww/HTNewsRq.c --- xdvik-22.40n/libs/libwww/HTNewsRq.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNewsRq.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTNewsRq.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTNewsRq.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module implements the output stream for MIME used for sending ** requests with or without a entity body to HTTP, NEWS, etc. diff -Naur xdvik-22.40n/libs/libwww/HTNewsRq.h xdvik-22.40o/libs/libwww/HTNewsRq.h --- xdvik-22.40n/libs/libwww/HTNewsRq.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNewsRq.h Wed Oct 16 22:26:19 2002 @@ -48,7 +48,7 @@ -@(#) $Id: HTNewsRq.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTNewsRq.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTNoFree.c xdvik-22.40o/libs/libwww/HTNoFree.c --- xdvik-22.40n/libs/libwww/HTNoFree.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNoFree.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTNoFree.c,v 1.1.2.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTNoFree.c,v 1.1.2.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This stream is a throughline for all methods except FREE and ABORT ** diff -Naur xdvik-22.40n/libs/libwww/HTNoFree.h xdvik-22.40o/libs/libwww/HTNoFree.h --- xdvik-22.40n/libs/libwww/HTNoFree.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTNoFree.h Wed Oct 16 22:26:19 2002 @@ -42,7 +42,7 @@ -@(#) $Id: HTNoFree.h,v 1.1.2.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTNoFree.h,v 1.1.2.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTPEP.c xdvik-22.40o/libs/libwww/HTPEP.c --- xdvik-22.40n/libs/libwww/HTPEP.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTPEP.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTPEP.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTPEP.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** ** AUTHORS: diff -Naur xdvik-22.40n/libs/libwww/HTPEP.h xdvik-22.40o/libs/libwww/HTPEP.h --- xdvik-22.40n/libs/libwww/HTPEP.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTPEP.h Wed Oct 16 22:26:19 2002 @@ -177,6 +177,6 @@ - @(#) $Id: HTPEP.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTPEP.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTParse.c xdvik-22.40o/libs/libwww/HTParse.c --- xdvik-22.40n/libs/libwww/HTParse.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTParse.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTParse.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTParse.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** history: ** May 12 94 TAB added as legal char in HTCleanTelnetString diff -Naur xdvik-22.40n/libs/libwww/HTParse.h xdvik-22.40o/libs/libwww/HTParse.h --- xdvik-22.40n/libs/libwww/HTParse.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTParse.h Wed Oct 16 22:26:19 2002 @@ -200,6 +200,6 @@ - @(#) $Id: HTParse.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTParse.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTPlain.c xdvik-22.40o/libs/libwww/HTPlain.c --- xdvik-22.40n/libs/libwww/HTPlain.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTPlain.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTPlain.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTPlain.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This version of the stream object just writes to a socket. ** The socket is assumed open and left open. diff -Naur xdvik-22.40n/libs/libwww/HTPlain.h xdvik-22.40o/libs/libwww/HTPlain.h --- xdvik-22.40n/libs/libwww/HTPlain.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTPlain.h Wed Oct 16 22:26:19 2002 @@ -35,7 +35,7 @@ -@(#) $Id: HTPlain.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTPlain.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTProfil.c xdvik-22.40o/libs/libwww/HTProfil.c --- xdvik-22.40n/libs/libwww/HTProfil.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTProfil.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTProfil.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTProfil.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Defines a set of application profiles */ diff -Naur xdvik-22.40n/libs/libwww/HTProfil.h xdvik-22.40o/libs/libwww/HTProfil.h --- xdvik-22.40n/libs/libwww/HTProfil.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTProfil.h Wed Oct 16 22:26:19 2002 @@ -179,6 +179,6 @@ - @(#) $Id: HTProfil.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTProfil.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTProt.c xdvik-22.40o/libs/libwww/HTProt.c --- xdvik-22.40n/libs/libwww/HTProt.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTProt.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTProt.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTProt.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** ** HISTORY: diff -Naur xdvik-22.40n/libs/libwww/HTProt.h xdvik-22.40o/libs/libwww/HTProt.h --- xdvik-22.40n/libs/libwww/HTProt.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTProt.h Wed Oct 16 22:26:19 2002 @@ -165,6 +165,6 @@ -@(#) $Id: HTProt.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTProt.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTProxy.c xdvik-22.40o/libs/libwww/HTProxy.c --- xdvik-22.40n/libs/libwww/HTProxy.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTProxy.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTProxy.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTProxy.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Replaces the old env variables for gateways and proxies. However for ** backward compatibility there is a function that reads the env variables diff -Naur xdvik-22.40n/libs/libwww/HTProxy.h xdvik-22.40o/libs/libwww/HTProxy.h --- xdvik-22.40n/libs/libwww/HTProxy.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTProxy.h Wed Oct 16 22:26:19 2002 @@ -200,6 +200,6 @@ - @(#) $Id: HTProxy.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTProxy.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTRDF.c xdvik-22.40o/libs/libwww/HTRDF.c --- xdvik-22.40n/libs/libwww/HTRDF.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTRDF.c Wed Oct 16 22:26:19 2002 @@ -1,7 +1,7 @@ /* ** RDF PARSER ** -** @(#) $Id: HTRDF.c,v 1.1.2.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTRDF.c,v 1.1.2.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Copyright © 1995-1998 World Wide Web Consortium, (Massachusetts ** Institute of Technology, Institut National de Recherche en diff -Naur xdvik-22.40n/libs/libwww/HTRDF.h xdvik-22.40o/libs/libwww/HTRDF.h --- xdvik-22.40n/libs/libwww/HTRDF.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTRDF.h Wed Oct 16 22:26:19 2002 @@ -499,7 +499,7 @@ - @(#) $Id: HTRDF.h,v 1.1.2.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTRDF.h,v 1.1.2.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTReader.c xdvik-22.40o/libs/libwww/HTReader.c --- xdvik-22.40n/libs/libwww/HTReader.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTReader.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTReader.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTReader.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** HISTORY: ** 6 June 95 HFN Written diff -Naur xdvik-22.40n/libs/libwww/HTReader.h xdvik-22.40o/libs/libwww/HTReader.h --- xdvik-22.40n/libs/libwww/HTReader.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTReader.h Wed Oct 16 22:26:19 2002 @@ -68,6 +68,6 @@ - @(#) $Id: HTReader.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTReader.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTReq.h xdvik-22.40o/libs/libwww/HTReq.h --- xdvik-22.40n/libs/libwww/HTReq.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTReq.h Wed Oct 16 22:26:19 2002 @@ -1288,6 +1288,6 @@ - @(#) $Id: HTReq.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTReq.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTReqMan.c xdvik-22.40o/libs/libwww/HTReqMan.c --- xdvik-22.40n/libs/libwww/HTReqMan.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTReqMan.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTReqMan.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTReqMan.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Authors ** TBL Tim Berners-Lee timbl@w3.org diff -Naur xdvik-22.40n/libs/libwww/HTReqMan.h xdvik-22.40o/libs/libwww/HTReqMan.h --- xdvik-22.40n/libs/libwww/HTReqMan.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTReqMan.h Wed Oct 16 22:26:19 2002 @@ -444,6 +444,6 @@ - @(#) $Id: HTReqMan.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTReqMan.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTResMan.h xdvik-22.40o/libs/libwww/HTResMan.h --- xdvik-22.40n/libs/libwww/HTResMan.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTResMan.h Wed Oct 16 22:26:19 2002 @@ -249,6 +249,6 @@ - @(#) $Id: HTResMan.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTResMan.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTResponse.c xdvik-22.40o/libs/libwww/HTResponse.c --- xdvik-22.40n/libs/libwww/HTResponse.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTResponse.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTResponse.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTResponse.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Authors ** HFN Henrik Frystyk, frystyk@w3.org diff -Naur xdvik-22.40n/libs/libwww/HTResponse.h xdvik-22.40o/libs/libwww/HTResponse.h --- xdvik-22.40n/libs/libwww/HTResponse.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTResponse.h Wed Oct 16 22:26:19 2002 @@ -454,6 +454,6 @@ - @(#) $Id: HTResponse.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTResponse.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTRules.c xdvik-22.40o/libs/libwww/HTRules.c --- xdvik-22.40n/libs/libwww/HTRules.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTRules.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTRules.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTRules.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module manages rule files in the Library ** diff -Naur xdvik-22.40n/libs/libwww/HTRules.h xdvik-22.40o/libs/libwww/HTRules.h --- xdvik-22.40n/libs/libwww/HTRules.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTRules.h Wed Oct 16 22:26:19 2002 @@ -144,6 +144,6 @@ - @(#) $Id: HTRules.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTRules.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTSChunk.c xdvik-22.40o/libs/libwww/HTSChunk.c --- xdvik-22.40n/libs/libwww/HTSChunk.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTSChunk.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTSChunk.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTSChunk.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This stream converts a stream to a chunk object. */ diff -Naur xdvik-22.40n/libs/libwww/HTSChunk.h xdvik-22.40o/libs/libwww/HTSChunk.h --- xdvik-22.40n/libs/libwww/HTSChunk.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTSChunk.h Wed Oct 16 22:26:19 2002 @@ -50,6 +50,6 @@ - @(#) $Id: HTSChunk.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTSChunk.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTSQL.c xdvik-22.40o/libs/libwww/HTSQL.c --- xdvik-22.40n/libs/libwww/HTSQL.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTSQL.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTSQL.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTSQL.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module interacts with the MYSQL C client library to perform ** SQL operations. It is not intended as a complete SQL API but handles diff -Naur xdvik-22.40n/libs/libwww/HTSQL.h xdvik-22.40o/libs/libwww/HTSQL.h --- xdvik-22.40n/libs/libwww/HTSQL.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTSQL.h Wed Oct 16 22:26:19 2002 @@ -182,6 +182,6 @@ - @(#) $Id: HTSQL.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTSQL.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTSQLLog.c xdvik-22.40o/libs/libwww/HTSQLLog.c --- xdvik-22.40n/libs/libwww/HTSQLLog.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTSQLLog.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTSQLLog.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTSQLLog.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module contains a simple SQL based logging mechanism for requests ** and anything else you want to log diff -Naur xdvik-22.40n/libs/libwww/HTSQLLog.h xdvik-22.40o/libs/libwww/HTSQLLog.h --- xdvik-22.40n/libs/libwww/HTSQLLog.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTSQLLog.h Wed Oct 16 22:26:19 2002 @@ -128,6 +128,6 @@ - @(#) $Id: HTSQLLog.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTSQLLog.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTSocket.c xdvik-22.40o/libs/libwww/HTSocket.c --- xdvik-22.40n/libs/libwww/HTSocket.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTSocket.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTSocket.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTSocket.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** ** HISTORY: diff -Naur xdvik-22.40n/libs/libwww/HTSocket.h xdvik-22.40o/libs/libwww/HTSocket.h --- xdvik-22.40n/libs/libwww/HTSocket.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTSocket.h Wed Oct 16 22:26:19 2002 @@ -48,6 +48,6 @@ - @(#) $Id: HTSocket.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTSocket.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTStream.c xdvik-22.40o/libs/libwww/HTStream.c --- xdvik-22.40n/libs/libwww/HTStream.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTStream.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTStream.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTStream.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This version of the stream object just writes to a C file. ** The file is assumed open and left open. diff -Naur xdvik-22.40n/libs/libwww/HTStream.h xdvik-22.40o/libs/libwww/HTStream.h --- xdvik-22.40n/libs/libwww/HTStream.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTStream.h Wed Oct 16 22:26:19 2002 @@ -161,6 +161,6 @@ - @(#) $Id: HTStream.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTStream.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTString.c xdvik-22.40o/libs/libwww/HTString.c --- xdvik-22.40n/libs/libwww/HTString.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTString.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTString.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTString.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Original version came with listserv implementation. ** Version TBL Oct 91 replaces one which modified the strings. diff -Naur xdvik-22.40n/libs/libwww/HTString.h xdvik-22.40o/libs/libwww/HTString.h --- xdvik-22.40n/libs/libwww/HTString.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTString.h Wed Oct 16 22:26:19 2002 @@ -140,6 +140,6 @@ - @(#) $Id: HTString.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTString.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTStruct.h xdvik-22.40o/libs/libwww/HTStruct.h --- xdvik-22.40n/libs/libwww/HTStruct.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTStruct.h Wed Oct 16 22:26:19 2002 @@ -90,6 +90,6 @@ - @(#) $Id: HTStruct.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTStruct.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTStyle.c xdvik-22.40o/libs/libwww/HTStyle.c --- xdvik-22.40n/libs/libwww/HTStyle.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTStyle.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTStyle.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTStyle.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Styles allow the translation between a logical property ** of a piece of text and its physical representation. diff -Naur xdvik-22.40n/libs/libwww/HTStyle.h xdvik-22.40o/libs/libwww/HTStyle.h --- xdvik-22.40n/libs/libwww/HTStyle.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTStyle.h Wed Oct 16 22:26:19 2002 @@ -88,6 +88,6 @@ - @(#) $Id: HTStyle.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTStyle.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTCP.c xdvik-22.40o/libs/libwww/HTTCP.c --- xdvik-22.40n/libs/libwww/HTTCP.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTCP.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTCP.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTCP.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This code is in common between client and server sides. ** diff -Naur xdvik-22.40n/libs/libwww/HTTCP.h xdvik-22.40o/libs/libwww/HTTCP.h --- xdvik-22.40n/libs/libwww/HTTCP.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTCP.h Wed Oct 16 22:26:19 2002 @@ -99,6 +99,6 @@ - @(#) $Id: HTTCP.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTTCP.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTChunk.c xdvik-22.40o/libs/libwww/HTTChunk.c --- xdvik-22.40n/libs/libwww/HTTChunk.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTChunk.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTChunk.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTChunk.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This stream parses a chunked transfer encoding using multiple chunks. ** diff -Naur xdvik-22.40n/libs/libwww/HTTChunk.h xdvik-22.40o/libs/libwww/HTTChunk.h --- xdvik-22.40n/libs/libwww/HTTChunk.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTChunk.h Wed Oct 16 22:26:19 2002 @@ -54,6 +54,6 @@ - @(#) $Id: HTTChunk.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTTChunk.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTP.c xdvik-22.40o/libs/libwww/HTTP.c --- xdvik-22.40n/libs/libwww/HTTP.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTP.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTP.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTP.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module implements the HTTP protocol as a state machine ** diff -Naur xdvik-22.40n/libs/libwww/HTTP.h xdvik-22.40o/libs/libwww/HTTP.h --- xdvik-22.40n/libs/libwww/HTTP.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTP.h Wed Oct 16 22:26:19 2002 @@ -89,6 +89,6 @@ - @(#) $Id: HTTP.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTTP.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTPGen.c xdvik-22.40o/libs/libwww/HTTPGen.c --- xdvik-22.40n/libs/libwww/HTTPGen.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTPGen.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTPGen.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTPGen.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module implements the output stream for General HTTP headers ** diff -Naur xdvik-22.40n/libs/libwww/HTTPGen.h xdvik-22.40o/libs/libwww/HTTPGen.h --- xdvik-22.40n/libs/libwww/HTTPGen.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTPGen.h Wed Oct 16 22:26:19 2002 @@ -53,6 +53,6 @@ - @(#) $Id: HTTPGen.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTTPGen.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTPReq.c xdvik-22.40o/libs/libwww/HTTPReq.c --- xdvik-22.40n/libs/libwww/HTTPReq.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTPReq.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTPReq.c,v 1.3.6.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTPReq.c,v 1.3.6.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module implements the output stream for HTTP used for sending ** requests with or without a entity body. diff -Naur xdvik-22.40n/libs/libwww/HTTPReq.h xdvik-22.40o/libs/libwww/HTTPReq.h --- xdvik-22.40n/libs/libwww/HTTPReq.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTPReq.h Wed Oct 16 22:26:19 2002 @@ -54,7 +54,7 @@ -@(#) $Id: HTTPReq.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTTPReq.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTPRes.c xdvik-22.40o/libs/libwww/HTTPRes.c --- xdvik-22.40n/libs/libwww/HTTPRes.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTPRes.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTPRes.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTPRes.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module implements the output stream for HTTP used for sending ** responces with or without a entity body. It is the server equivalent diff -Naur xdvik-22.40n/libs/libwww/HTTPRes.h xdvik-22.40o/libs/libwww/HTTPRes.h --- xdvik-22.40n/libs/libwww/HTTPRes.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTPRes.h Wed Oct 16 22:26:19 2002 @@ -54,7 +54,7 @@ -@(#) $Id: HTTPRes.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTTPRes.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTPServ.c xdvik-22.40o/libs/libwww/HTTPServ.c --- xdvik-22.40n/libs/libwww/HTTPServ.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTPServ.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTPServ.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTPServ.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This module implments the HTTP protocol as a state machine ** diff -Naur xdvik-22.40n/libs/libwww/HTTPServ.h xdvik-22.40o/libs/libwww/HTTPServ.h --- xdvik-22.40n/libs/libwww/HTTPServ.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTPServ.h Wed Oct 16 22:26:19 2002 @@ -38,7 +38,7 @@ -@(#) $Id: HTTPServ.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTTPServ.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTPUtil.h xdvik-22.40o/libs/libwww/HTTPUtil.h --- xdvik-22.40n/libs/libwww/HTTPUtil.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTPUtil.h Wed Oct 16 22:26:19 2002 @@ -55,6 +55,6 @@ - @(#) $Id: HTTPUtil.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTTPUtil.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTeXGen.c xdvik-22.40o/libs/libwww/HTTeXGen.c --- xdvik-22.40n/libs/libwww/HTTeXGen.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTeXGen.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTeXGen.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTeXGen.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** This version of the HTML object sends LaTeX to the output stream. ** No attributes are considered in the translation! diff -Naur xdvik-22.40n/libs/libwww/HTTeXGen.h xdvik-22.40o/libs/libwww/HTTeXGen.h --- xdvik-22.40n/libs/libwww/HTTeXGen.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTeXGen.h Wed Oct 16 22:26:19 2002 @@ -52,7 +52,7 @@ -@(#) $Id: HTTeXGen.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTTeXGen.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTee.c xdvik-22.40o/libs/libwww/HTTee.c --- xdvik-22.40n/libs/libwww/HTTee.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTee.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTee.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTee.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** The Tee class just writes to two streams. Easy. ** See also the Black Hole stream which is even easier. diff -Naur xdvik-22.40n/libs/libwww/HTTee.h xdvik-22.40o/libs/libwww/HTTee.h --- xdvik-22.40n/libs/libwww/HTTee.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTee.h Wed Oct 16 22:26:19 2002 @@ -49,7 +49,7 @@ -@(#) $Id: HTTee.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTTee.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTelnet.c xdvik-22.40o/libs/libwww/HTTelnet.c --- xdvik-22.40n/libs/libwww/HTTelnet.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTelnet.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTelnet.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTelnet.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Authors ** TBL Tim Berners-Lee timbl@w3.org diff -Naur xdvik-22.40n/libs/libwww/HTTelnet.h xdvik-22.40o/libs/libwww/HTTelnet.h --- xdvik-22.40n/libs/libwww/HTTelnet.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTelnet.h Wed Oct 16 22:26:19 2002 @@ -35,7 +35,7 @@ -@(#) $Id: HTTelnet.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTTelnet.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTimer.c xdvik-22.40o/libs/libwww/HTTimer.c --- xdvik-22.40n/libs/libwww/HTTimer.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTimer.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTimer.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTimer.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Timers based on the X server timers ** diff -Naur xdvik-22.40n/libs/libwww/HTTimer.h xdvik-22.40o/libs/libwww/HTTimer.h --- xdvik-22.40n/libs/libwww/HTTimer.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTimer.h Wed Oct 16 22:26:19 2002 @@ -172,6 +172,6 @@ - @(#) $Id: HTTimer.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTTimer.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTTrace.c xdvik-22.40o/libs/libwww/HTTrace.c --- xdvik-22.40n/libs/libwww/HTTrace.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTrace.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1996. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTrace.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTrace.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** 26 Nov 96 (EGP) moved HTTrace stuff here from HTString.c and ** added HTTrace_data diff -Naur xdvik-22.40n/libs/libwww/HTTrans.c xdvik-22.40o/libs/libwww/HTTrans.c --- xdvik-22.40n/libs/libwww/HTTrans.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTrans.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTTrans.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTTrans.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** HISTORY: ** Marts 96 HFN Written diff -Naur xdvik-22.40n/libs/libwww/HTTrans.h xdvik-22.40o/libs/libwww/HTTrans.h --- xdvik-22.40n/libs/libwww/HTTrans.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTTrans.h Wed Oct 16 22:26:19 2002 @@ -148,6 +148,6 @@ - @(#) $Id: HTTrans.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTTrans.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTUTree.c xdvik-22.40o/libs/libwww/HTUTree.c --- xdvik-22.40n/libs/libwww/HTUTree.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTUTree.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTUTree.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTUTree.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** AUTHORS: ** HFN Henrik Frystyk Nielsen diff -Naur xdvik-22.40n/libs/libwww/HTUTree.h xdvik-22.40o/libs/libwww/HTUTree.h --- xdvik-22.40n/libs/libwww/HTUTree.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTUTree.h Wed Oct 16 22:26:19 2002 @@ -170,6 +170,6 @@ - @(#) $Id: HTUTree.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTUTree.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTUU.c xdvik-22.40o/libs/libwww/HTUU.c --- xdvik-22.40n/libs/libwww/HTUU.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTUU.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTUU.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTUU.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** ACKNOWLEDGEMENT: ** This code is taken from rpem distribution, and was originally diff -Naur xdvik-22.40n/libs/libwww/HTUU.h xdvik-22.40o/libs/libwww/HTUU.h --- xdvik-22.40n/libs/libwww/HTUU.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTUU.h Wed Oct 16 22:26:19 2002 @@ -47,7 +47,7 @@ -@(#) $Id: HTUU.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTUU.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTUser.c xdvik-22.40o/libs/libwww/HTUser.c --- xdvik-22.40n/libs/libwww/HTUser.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTUser.c Wed Oct 16 22:26:19 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTUser.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTUser.c,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ ** ** Contains information about local host, email, etc. ** diff -Naur xdvik-22.40n/libs/libwww/HTUser.h xdvik-22.40o/libs/libwww/HTUser.h --- xdvik-22.40n/libs/libwww/HTUser.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTUser.h Wed Oct 16 22:26:19 2002 @@ -159,6 +159,6 @@ - @(#) $Id: HTUser.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTUser.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTUtils.h xdvik-22.40o/libs/libwww/HTUtils.h --- xdvik-22.40n/libs/libwww/HTUtils.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTUtils.h Wed Oct 16 22:26:19 2002 @@ -413,6 +413,6 @@ - @(#) $Id: HTUtils.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTUtils.h,v 1.1.1.1.8.2 2002/10/16 22:26:19 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTWAIS.c xdvik-22.40o/libs/libwww/HTWAIS.c --- xdvik-22.40n/libs/libwww/HTWAIS.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTWAIS.c Wed Oct 16 22:26:20 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTWAIS.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTWAIS.c,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ ** ** This module allows a WWW server or client to read data from a ** remote WAIS server, and provide that data to a WWW client in diff -Naur xdvik-22.40n/libs/libwww/HTWAIS.h xdvik-22.40o/libs/libwww/HTWAIS.h --- xdvik-22.40n/libs/libwww/HTWAIS.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTWAIS.h Wed Oct 16 22:26:20 2002 @@ -69,6 +69,6 @@ - @(#) $Id: HTWAIS.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTWAIS.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTWSRC.c xdvik-22.40o/libs/libwww/HTWSRC.c --- xdvik-22.40n/libs/libwww/HTWSRC.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTWSRC.c Wed Oct 16 22:26:20 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTWSRC.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTWSRC.c,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ ** ** This module parses a stream with WAIS source file ** format information on it and creates a structured stream. diff -Naur xdvik-22.40n/libs/libwww/HTWSRC.h xdvik-22.40o/libs/libwww/HTWSRC.h --- xdvik-22.40n/libs/libwww/HTWSRC.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTWSRC.h Wed Oct 16 22:26:20 2002 @@ -55,7 +55,7 @@ -@(#) $Id: HTWSRC.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: HTWSRC.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTWWWStr.c xdvik-22.40o/libs/libwww/HTWWWStr.c --- xdvik-22.40n/libs/libwww/HTWWWStr.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTWWWStr.c Wed Oct 16 22:26:20 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTWWWStr.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTWWWStr.c,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ ** ** Now 13 95 Spwaned from HTString.c */ diff -Naur xdvik-22.40n/libs/libwww/HTWWWStr.h xdvik-22.40o/libs/libwww/HTWWWStr.h --- xdvik-22.40n/libs/libwww/HTWWWStr.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTWWWStr.h Wed Oct 16 22:26:20 2002 @@ -267,6 +267,6 @@ - @(#) $Id: HTWWWStr.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTWWWStr.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTWriter.c xdvik-22.40o/libs/libwww/HTWriter.c --- xdvik-22.40n/libs/libwww/HTWriter.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTWriter.c Wed Oct 16 22:26:20 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTWriter.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTWriter.c,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ ** ** This is a try with a non-buffered output stream which remembers ** state using the write_pointer. As normally we have a big buffer diff -Naur xdvik-22.40n/libs/libwww/HTWriter.h xdvik-22.40o/libs/libwww/HTWriter.h --- xdvik-22.40n/libs/libwww/HTWriter.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTWriter.h Wed Oct 16 22:26:20 2002 @@ -57,6 +57,6 @@ - @(#) $Id: HTWriter.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTWriter.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTXML.c xdvik-22.40o/libs/libwww/HTXML.c --- xdvik-22.40n/libs/libwww/HTXML.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTXML.c Wed Oct 16 22:26:20 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTXML.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTXML.c,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ ** ** This module requires expat in order to compile/link */ diff -Naur xdvik-22.40n/libs/libwww/HTXML.h xdvik-22.40o/libs/libwww/HTXML.h --- xdvik-22.40n/libs/libwww/HTXML.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTXML.h Wed Oct 16 22:26:20 2002 @@ -112,6 +112,6 @@ - @(#) $Id: HTXML.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTXML.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTXParse.c xdvik-22.40o/libs/libwww/HTXParse.c --- xdvik-22.40n/libs/libwww/HTXParse.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTXParse.c Wed Oct 16 22:26:20 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTXParse.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTXParse.c,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ ** ** AUTHORS: ** HWL 23/8/94 diff -Naur xdvik-22.40n/libs/libwww/HTZip.c xdvik-22.40o/libs/libwww/HTZip.c --- xdvik-22.40n/libs/libwww/HTZip.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTZip.c Wed Oct 16 22:26:20 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HTZip.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HTZip.c,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ ** ** This module requires zlib in order to compile/link */ diff -Naur xdvik-22.40n/libs/libwww/HTZip.h xdvik-22.40o/libs/libwww/HTZip.h --- xdvik-22.40n/libs/libwww/HTZip.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTZip.h Wed Oct 16 22:26:20 2002 @@ -46,6 +46,6 @@ - @(#) $Id: HTZip.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTZip.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HText.c xdvik-22.40o/libs/libwww/HText.c --- xdvik-22.40n/libs/libwww/HText.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HText.c Wed Oct 16 22:26:20 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1999. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: HText.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: HText.c,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ ** ** This generates of a hypertext object and calls the application ** via callbacks. diff -Naur xdvik-22.40n/libs/libwww/HText.h xdvik-22.40o/libs/libwww/HText.h --- xdvik-22.40n/libs/libwww/HText.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HText.h Wed Oct 16 22:26:20 2002 @@ -286,6 +286,6 @@ - @(#) $Id: HText.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HText.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/HTextImp.h xdvik-22.40o/libs/libwww/HTextImp.h --- xdvik-22.40n/libs/libwww/HTextImp.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/HTextImp.h Wed Oct 16 22:26:20 2002 @@ -88,6 +88,6 @@ - @(#) $Id: HTextImp.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: HTextImp.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/SGML.c xdvik-22.40o/libs/libwww/SGML.c --- xdvik-22.40n/libs/libwww/SGML.c Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/SGML.c Wed Oct 16 22:26:20 2002 @@ -3,7 +3,7 @@ ** ** (c) COPYRIGHT MIT 1995. ** Please first read the full copyright statement in the file COPYRIGH. -** @(#) $Id: SGML.c,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +** @(#) $Id: SGML.c,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ ** ** This module implements an HTStream object. To parse an ** SGML file, create this object which is a parser. The object diff -Naur xdvik-22.40n/libs/libwww/SGML.h xdvik-22.40o/libs/libwww/SGML.h --- xdvik-22.40n/libs/libwww/SGML.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/SGML.h Wed Oct 16 22:26:20 2002 @@ -144,6 +144,6 @@ - @(#) $Id: SGML.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: SGML.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWApp.h xdvik-22.40o/libs/libwww/WWWApp.h --- xdvik-22.40n/libs/libwww/WWWApp.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWApp.h Wed Oct 16 22:26:20 2002 @@ -187,6 +187,6 @@ - @(#) $Id: WWWApp.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWApp.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWCache.h xdvik-22.40o/libs/libwww/WWWCache.h --- xdvik-22.40n/libs/libwww/WWWCache.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWCache.h Wed Oct 16 22:26:20 2002 @@ -76,6 +76,6 @@ - @(#) $Id: WWWCache.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWCache.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWCore.h xdvik-22.40o/libs/libwww/WWWCore.h --- xdvik-22.40n/libs/libwww/WWWCore.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWCore.h Wed Oct 16 22:26:20 2002 @@ -379,6 +379,6 @@ - @(#) $Id: WWWCore.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWCore.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWDir.h xdvik-22.40o/libs/libwww/WWWDir.h --- xdvik-22.40n/libs/libwww/WWWDir.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWDir.h Wed Oct 16 22:26:20 2002 @@ -104,6 +104,6 @@ - @(#) $Id: WWWDir.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWDir.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWFTP.h xdvik-22.40o/libs/libwww/WWWFTP.h --- xdvik-22.40n/libs/libwww/WWWFTP.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWFTP.h Wed Oct 16 22:26:20 2002 @@ -77,6 +77,6 @@ - @(#) $Id: WWWFTP.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWFTP.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWFile.h xdvik-22.40o/libs/libwww/WWWFile.h --- xdvik-22.40n/libs/libwww/WWWFile.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWFile.h Wed Oct 16 22:26:20 2002 @@ -118,6 +118,6 @@ - @(#) $Id: WWWFile.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWFile.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWGophe.h xdvik-22.40o/libs/libwww/WWWGophe.h --- xdvik-22.40n/libs/libwww/WWWGophe.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWGophe.h Wed Oct 16 22:26:20 2002 @@ -73,7 +73,7 @@ -@(#) $Id: WWWGophe.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ +@(#) $Id: WWWGophe.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWHTML.h xdvik-22.40o/libs/libwww/WWWHTML.h --- xdvik-22.40n/libs/libwww/WWWHTML.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWHTML.h Wed Oct 16 22:26:20 2002 @@ -73,6 +73,6 @@ - @(#) $Id: WWWHTML.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWHTML.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWHTTP.h xdvik-22.40o/libs/libwww/WWWHTTP.h --- xdvik-22.40n/libs/libwww/WWWHTTP.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWHTTP.h Wed Oct 16 22:26:20 2002 @@ -185,6 +185,6 @@ - @(#) $Id: WWWHTTP.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWHTTP.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWInit.h xdvik-22.40o/libs/libwww/WWWInit.h --- xdvik-22.40n/libs/libwww/WWWInit.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWInit.h Wed Oct 16 22:26:20 2002 @@ -80,6 +80,6 @@ - @(#) $Id: WWWInit.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWInit.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWLib.h xdvik-22.40o/libs/libwww/WWWLib.h --- xdvik-22.40n/libs/libwww/WWWLib.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWLib.h Wed Oct 16 22:26:20 2002 @@ -87,6 +87,6 @@ - @(#) $Id: WWWLib.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWLib.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWMIME.h xdvik-22.40o/libs/libwww/WWWMIME.h --- xdvik-22.40n/libs/libwww/WWWMIME.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWMIME.h Wed Oct 16 22:26:20 2002 @@ -123,6 +123,6 @@ - @(#) $Id: WWWMIME.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWMIME.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWMux.h xdvik-22.40o/libs/libwww/WWWMux.h --- xdvik-22.40n/libs/libwww/WWWMux.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWMux.h Wed Oct 16 22:26:20 2002 @@ -60,6 +60,6 @@ - @(#) $Id: WWWMux.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWMux.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWNews.h xdvik-22.40o/libs/libwww/WWWNews.h --- xdvik-22.40n/libs/libwww/WWWNews.h Fri Sep 13 00:23:46 2002 +++ xdvik-22.40o/libs/libwww/WWWNews.h Wed Oct 16 22:26:20 2002 @@ -99,6 +99,6 @@ - @(#) $Id: WWWNews.h,v 1.1.1.1.8.1 2002/09/13 00:23:46 stefanulrich Exp $ + @(#) $Id: WWWNews.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWSQL.h xdvik-22.40o/libs/libwww/WWWSQL.h --- xdvik-22.40n/libs/libwww/WWWSQL.h Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/WWWSQL.h Wed Oct 16 22:26:20 2002 @@ -84,6 +84,6 @@ - @(#) $Id: WWWSQL.h,v 1.1.1.1.8.1 2002/09/13 00:23:47 stefanulrich Exp $ + @(#) $Id: WWWSQL.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWStream.h xdvik-22.40o/libs/libwww/WWWStream.h --- xdvik-22.40n/libs/libwww/WWWStream.h Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/WWWStream.h Wed Oct 16 22:26:20 2002 @@ -163,6 +163,6 @@ - @(#) $Id: WWWStream.h,v 1.1.1.1.8.1 2002/09/13 00:23:47 stefanulrich Exp $ + @(#) $Id: WWWStream.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWTelnt.h xdvik-22.40o/libs/libwww/WWWTelnt.h --- xdvik-22.40n/libs/libwww/WWWTelnt.h Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/WWWTelnt.h Wed Oct 16 22:26:20 2002 @@ -73,7 +73,7 @@ -@(#) $Id: WWWTelnt.h,v 1.1.1.1.8.1 2002/09/13 00:23:47 stefanulrich Exp $ +@(#) $Id: WWWTelnt.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWTrans.h xdvik-22.40o/libs/libwww/WWWTrans.h --- xdvik-22.40n/libs/libwww/WWWTrans.h Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/WWWTrans.h Wed Oct 16 22:26:20 2002 @@ -77,6 +77,6 @@ - @(#) $Id: WWWTrans.h,v 1.1.1.1.8.1 2002/09/13 00:23:47 stefanulrich Exp $ + @(#) $Id: WWWTrans.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWUtil.h xdvik-22.40o/libs/libwww/WWWUtil.h --- xdvik-22.40n/libs/libwww/WWWUtil.h Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/WWWUtil.h Wed Oct 16 22:26:20 2002 @@ -176,6 +176,6 @@ - @(#) $Id: WWWUtil.h,v 1.1.1.1.8.1 2002/09/13 00:23:47 stefanulrich Exp $ + @(#) $Id: WWWUtil.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWWAIS.h xdvik-22.40o/libs/libwww/WWWWAIS.h --- xdvik-22.40n/libs/libwww/WWWWAIS.h Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/WWWWAIS.h Wed Oct 16 22:26:20 2002 @@ -68,6 +68,6 @@ - @(#) $Id: WWWWAIS.h,v 1.1.1.1.8.1 2002/09/13 00:23:47 stefanulrich Exp $ + @(#) $Id: WWWWAIS.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWXML.h xdvik-22.40o/libs/libwww/WWWXML.h --- xdvik-22.40n/libs/libwww/WWWXML.h Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/WWWXML.h Wed Oct 16 22:26:20 2002 @@ -87,6 +87,6 @@ - @(#) $Id: WWWXML.h,v 1.1.2.1 2002/09/13 00:23:47 stefanulrich Exp $ + @(#) $Id: WWWXML.h,v 1.1.2.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/WWWZip.h xdvik-22.40o/libs/libwww/WWWZip.h --- xdvik-22.40n/libs/libwww/WWWZip.h Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/WWWZip.h Wed Oct 16 22:26:20 2002 @@ -65,6 +65,6 @@ - @(#) $Id: WWWZip.h,v 1.1.1.1.8.1 2002/09/13 00:23:47 stefanulrich Exp $ + @(#) $Id: WWWZip.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/libwww/config/CVS/Entries xdvik-22.40o/libs/libwww/config/CVS/Entries --- xdvik-22.40n/libs/libwww/config/CVS/Entries Mon Sep 16 17:44:49 2002 +++ xdvik-22.40o/libs/libwww/config/CVS/Entries Wed Oct 16 23:43:35 2002 @@ -2,9 +2,9 @@ /config.sub/1.1.2.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE /install-sh/1.1.2.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE /install.sh/1.1.2.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE -/klibtool/1.1.2.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE +/klibtool/1.1.2.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE /ltconfig/1.1.2.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE /ltmain.sh/1.1.2.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE /missing/1.1.2.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE -/mkinstalldirs/1.1.2.1/Fri Sep 13 00:23:47 2002//Txdvik_22_40_STABLE +/mkinstalldirs/1.1.2.2/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE D diff -Naur xdvik-22.40n/libs/libwww/config/klibtool xdvik-22.40o/libs/libwww/config/klibtool --- xdvik-22.40n/libs/libwww/config/klibtool Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/config/klibtool Wed Oct 16 22:26:20 2002 @@ -16,7 +16,7 @@ # the binary, etc.) See the configure mode. I can send you the # hello,world Makefile I used for testing if you want it. # -rcs_version='$Id: klibtool,v 1.1.2.1 2002/09/13 00:23:47 stefanulrich Exp $' +rcs_version='$Id: klibtool,v 1.1.2.2 2002/10/16 22:26:20 stefanulrich Exp $' version=0.1 maint=tex-k@mail.tug.org help="Usage: $0 [OPTION]... MODE [ARG]... diff -Naur xdvik-22.40n/libs/libwww/config/mkinstalldirs xdvik-22.40o/libs/libwww/config/mkinstalldirs --- xdvik-22.40n/libs/libwww/config/mkinstalldirs Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/config/mkinstalldirs Wed Oct 16 22:26:20 2002 @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1.2.1 2002/09/13 00:23:47 stefanulrich Exp $ +# $Id: mkinstalldirs,v 1.1.2.2 2002/10/16 22:26:20 stefanulrich Exp $ errstatus=0 diff -Naur xdvik-22.40n/libs/libwww/configure xdvik-22.40o/libs/libwww/configure --- xdvik-22.40n/libs/libwww/configure Mon Sep 16 17:45:27 2002 +++ xdvik-22.40o/libs/libwww/configure Wed Oct 16 22:26:20 2002 @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Id: configure.in,v 1.1.1.1.8.1 2002/09/13 00:23:47 stefanulrich Exp +# From configure.in Id: configure.in,v 1.96 2002/06/12 09:26:46 kahan Exp @@ -199,6 +199,10 @@ ac_help="$ac_help --without-mkofm-default do not run mkofm if OFM file missing" ac_help="$ac_help + --with-mktexfmt-default run mktexfmt if format file missing" +ac_help="$ac_help + --with-mktextex-default run mktextex if TeX source missing" +ac_help="$ac_help --enable-multiplatform put executables in bin/PLATFORM" ac_help="$ac_help --enable-static[=PKGS] build static libraries [default=yes]" @@ -807,7 +811,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:811: checking host system type" >&5 +echo "configure:815: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -828,7 +832,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:832: checking target system type" >&5 +echo "configure:836: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -846,7 +850,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:850: checking build system type" >&5 +echo "configure:854: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -918,7 +922,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:922: checking for a BSD compatible install" >&5 +echo "configure:926: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -973,7 +977,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:977: checking whether build environment is sane" >&5 +echo "configure:981: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -1011,7 +1015,7 @@ rm -f conftest* echo "$ac_t""yes" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1015: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1019: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1057,7 +1061,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1061: checking for working aclocal" >&5 +echo "configure:1065: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1070,7 +1074,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1074: checking for working autoconf" >&5 +echo "configure:1078: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1083,7 +1087,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1087: checking for working automake" >&5 +echo "configure:1091: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1096,7 +1100,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1100: checking for working autoheader" >&5 +echo "configure:1104: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1109,7 +1113,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1113: checking for working makeinfo" >&5 +echo "configure:1117: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1126,7 +1130,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1130: checking for $ac_word" >&5 +echo "configure:1134: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1157,7 +1161,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1161: checking for $ac_word" >&5 +echo "configure:1165: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1209,7 +1213,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1213: checking for $ac_word" >&5 +echo "configure:1217: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1242,7 +1246,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1246: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1250: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1253,12 +1257,12 @@ cat > conftest.$ac_ext << EOF -#line 1257 "configure" +#line 1261 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1284,12 +1288,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1288: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1292: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1293: checking whether we are using GNU C" >&5 +echo "configure:1297: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1298,7 +1302,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1317,7 +1321,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1321: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1325: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1350,7 +1354,7 @@ if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1354: checking for POSIXized ISC" >&5 +echo "configure:1358: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1371,12 +1375,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1375: checking for Cygwin environment" >&5 +echo "configure:1379: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1404,19 +1408,19 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1408: checking for mingw32 environment" >&5 +echo "configure:1412: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1435,7 +1439,7 @@ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1439: checking for executable suffix" >&5 +echo "configure:1443: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1445,7 +1449,7 @@ rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1504,7 +1508,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1508: checking for $ac_word" >&5 +echo "configure:1512: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1535,7 +1539,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1539: checking for $ac_word" >&5 +echo "configure:1543: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1587,7 +1591,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1591: checking for $ac_word" >&5 +echo "configure:1595: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1620,7 +1624,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1624: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1628: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1631,12 +1635,12 @@ cat > conftest.$ac_ext << EOF -#line 1635 "configure" +#line 1639 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1662,12 +1666,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1666: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1670: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1671: checking whether we are using GNU C" >&5 +echo "configure:1675: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1676,7 +1680,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1695,7 +1699,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1699: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1703: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1738,7 +1742,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1742: checking for a BSD compatible install" >&5 +echo "configure:1746: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1793,7 +1797,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1797: checking whether ln -s works" >&5 +echo "configure:1801: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1816,7 +1820,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1820: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1824: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1848,12 +1852,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1852: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1856: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1861,7 +1865,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1886,7 +1890,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1890: checking for opendir in -ldir" >&5 +echo "configure:1894: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1894,7 +1898,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1927,7 +1931,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1931: checking for opendir in -lx" >&5 +echo "configure:1935: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1935,7 +1939,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1969,7 +1973,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1973: checking how to run the C preprocessor" >&5 +echo "configure:1977: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1984,13 +1988,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2001,13 +2005,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2018,13 +2022,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2049,12 +2053,12 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2053: checking for ANSI C header files" >&5 +echo "configure:2057: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2062,7 +2066,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2079,7 +2083,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2097,7 +2101,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2118,7 +2122,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2129,7 +2133,7 @@ exit (0); } EOF -if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2153,7 +2157,7 @@ fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:2157: checking whether closedir returns void" >&5 +echo "configure:2161: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2161,13 +2165,13 @@ ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF -if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else @@ -2194,17 +2198,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2198: checking for $ac_hdr" >&5 +echo "configure:2202: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2236,7 +2240,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2240: checking for $ac_word" >&5 +echo "configure:2244: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2268,7 +2272,7 @@ # echo $ac_n "checking for libtool object types""... $ac_c" 1>&6 -echo "configure:2272: checking for libtool object types" >&5 +echo "configure:2276: checking for libtool object types" >&5 # ## Check that the klibtool script is in ac_aux_dir. Don't bother to # scan PATH. For one thing, if we found it somewhere there, we couldn't @@ -2320,12 +2324,12 @@ for ac_func in putenv strcasecmp strtol strstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2324: checking for $ac_func" >&5 +echo "configure:2328: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2378,12 +2382,12 @@ for ac_func in bcmp bcopy bzero getcwd getwd index memcmp memcpy rindex strchr strrchr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_func" >&5 +echo "configure:2386: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2432,12 +2436,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2436: checking for working const" >&5 +echo "configure:2440: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2509,19 +2513,19 @@ # Check whether prototypes work. echo $ac_n "checking whether the compiler accepts prototypes""... $ac_c" 1>&6 -echo "configure:2513: checking whether the compiler accepts prototypes" >&5 +echo "configure:2517: checking whether the compiler accepts prototypes" >&5 if eval "test \"`echo '$''{'kb_cv_c_prototypes'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { extern void foo(int i,...); ; return 0; } EOF -if { (eval echo configure:2525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* kb_cv_c_prototypes=yes else @@ -2542,19 +2546,19 @@ # This is a GNU libc invention. echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&6 -echo "configure:2546: checking whether program_invocation_name is predefined" >&5 +echo "configure:2550: checking whether program_invocation_name is predefined" >&5 if eval "test \"`echo '$''{'kb_cv_var_program_inv_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* kb_cv_var_program_inv_name=yes else @@ -2578,7 +2582,7 @@ # We don't actually need to run this if we don't have putenv, but it # doesn't hurt. echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6 -echo "configure:2582: checking whether putenv uses malloc" >&5 +echo "configure:2586: checking whether putenv uses malloc" >&5 if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2586,13 +2590,14 @@ kb_cv_func_putenv_malloc=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then kb_cv_func_putenv_malloc=yes else @@ -2663,7 +2668,7 @@ if test $ac_cv_func_getcwd = yes; then # We only need to run this if we have getcwd. echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6 -echo "configure:2667: checking whether getcwd uses fork or vfork" >&5 +echo "configure:2672: checking whether getcwd uses fork or vfork" >&5 if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2671,7 +2676,7 @@ kb_cv_func_getcwd_forks=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then kb_cv_func_getcwd_forks=no else @@ -2708,7 +2713,7 @@ # Common --with and --enable options. echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:2712: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:2717: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -2727,7 +2732,7 @@ echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6 -echo "configure:2731: checking for loader (symbol LD)" >&5 +echo "configure:2736: checking for loader (symbol LD)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2741,7 +2746,7 @@ echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6 -echo "configure:2745: checking for archiver (symbol AR)" >&5 +echo "configure:2750: checking for archiver (symbol AR)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2754,18 +2759,18 @@ echo "$ac_t""$AR" 1>&6 -echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 -echo "configure:2759: checking for archiver options (symbol AR_OPTS)" >&5 -if eval "test \"`echo '$''{'cf_cv_subst_AR_OPTS'+set}'`\" = set"; then +echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6 +echo "configure:2764: checking for archiver options (symbol ARFLAGS)" >&5 +if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -test -z "$AR_OPTS" && AR_OPTS=rc -cf_cv_subst_AR_OPTS=$AR_OPTS +test -z "$ARFLAGS" && ARFLAGS=rc +cf_cv_subst_ARFLAGS=$ARFLAGS fi -AR_OPTS=${cf_cv_subst_AR_OPTS} -echo "$ac_t""$AR_OPTS" 1>&6 +ARFLAGS=${cf_cv_subst_ARFLAGS} +echo "$ac_t""$ARFLAGS" 1>&6 @@ -2774,80 +2779,64 @@ withval="$with_mktexmf_default" : else - withval=yes + with_mktexmf_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_MF_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktexpk-default or --without-mktexpk-default was given. if test "${with_mktexpk_default+set}" = set; then withval="$with_mktexpk_default" : else - withval=yes + with_mktexpk_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_PK_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktextfm-default or --without-mktextfm-default was given. if test "${with_mktextfm_default+set}" = set; then withval="$with_mktextfm_default" : else - withval=yes + with_mktextfm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_TFM_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkocp-default or --without-mkocp-default was given. if test "${with_mkocp_default+set}" = set; then withval="$with_mkocp_default" : else - withval=yes + with_mkocp_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OCP_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkofm-default or --without-mkofm-default was given. if test "${with_mkofm_default+set}" = set; then withval="$with_mkofm_default" : else - withval=yes + with_mkofm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OFM_BY_DEFAULT 1 -EOF +# Check whether --with-mktexfmt-default or --without-mktexfmt-default was given. +if test "${with_mktexfmt_default+set}" = set; then + withval="$with_mktexfmt_default" + : +fi +# Check whether --with-mktextex-default or --without-mktextex-default was given. +if test "${with_mktextex_default+set}" = set; then + withval="$with_mktextex_default" + with_mktextex_default=yes +else + with_mktextex_default=no fi + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:2851: checking host system type" >&5 +echo "configure:2840: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -2879,7 +2868,7 @@ echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 -echo "configure:2883: checking where the main texmf tree is located" >&5 +echo "configure:2872: checking where the main texmf tree is located" >&5 texmfmain= if test "x$datadir" != 'x${prefix}/share'; then # First case, datadir is defined... @@ -2913,6 +2902,13 @@ if test -n "$texmfmain"; then echo "$ac_t"""$texmfmain"" 1>&6 else + ### SU: added using `kpsewhich' as last fallback before giving up; since + ### xdvik is most likely to be installed with an *existing* kpathsearch + ### system, this seemed reasonable to me. + texmfmain=`kpsewhich --expand-path='$TEXMFMAIN' 2>/dev/null | sed 's,//*,/,g'` + if test -d "$texmfmain"; then + echo "$ac_t"""$texmfmain"" 1>&6 + else eval texmfmain="$datadir/texmf" echo "$ac_t""not found" 1>&6 echo "configure: warning: The main texmf tree was not found. @@ -2922,10 +2918,100 @@ in systems/web2c. Winging it by using the default location $texmfmain." 1>&2 fi + fi fi +# Implementation of those options. +if test "x$with_mktexmf_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_TEX_MF_BY_DEFAULT 1 +EOF + +fi +if test "x$with_mktexpk_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_TEX_PK_BY_DEFAULT 1 +EOF + +fi +if test "x$with_mktextex_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_TEX_TEX_BY_DEFAULT 1 +EOF + +fi +if test "x$with_mktexfmt_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_TEX_FMT_BY_DEFAULT 1 +EOF + +fi +if test "x$with_mktextfm_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_TEX_TFM_BY_DEFAULT 1 +EOF + +fi +if test "x$with_mkocp_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_OMEGA_OCP_BY_DEFAULT 1 +EOF + +fi +if test "x$with_mkofm_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_OMEGA_OFM_BY_DEFAULT 1 +EOF + +fi + +# Is libm present. FIXME: do we need it at all? +echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 +echo "configure:2973: checking for main in -lm" >&5 +ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + @@ -2989,7 +3075,7 @@ if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2993: checking for ld used by GCC" >&5 +echo "configure:3079: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -3013,10 +3099,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:3017: checking for GNU ld" >&5 +echo "configure:3103: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:3020: checking for non-GNU ld" >&5 +echo "configure:3106: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3052,7 +3138,7 @@ test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:3056: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:3142: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3068,7 +3154,7 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:3072: checking for BSD-compatible nm" >&5 +echo "configure:3158: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3128,8 +3214,8 @@ case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3132 "configure"' > conftest.$ac_ext - if { (eval echo configure:3133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 3218 "configure"' > conftest.$ac_ext + if { (eval echo configure:3219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -3150,7 +3236,7 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:3154: checking whether the C compiler needs -belf" >&5 +echo "configure:3240: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3163,14 +3249,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -3279,7 +3365,7 @@ exec 5>>./config.log echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:3283: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:3369: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3317,7 +3403,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3321: checking for a BSD compatible install" >&5 +echo "configure:3407: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3377,7 +3463,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3381: checking for X" >&5 +echo "configure:3467: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3439,12 +3525,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3513,14 +3599,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -3614,7 +3700,7 @@ echo $ac_n "checking whether to define additional compiler specific flags""... $ac_c" 1>&6 -echo "configure:3618: checking whether to define additional compiler specific flags" >&5 +echo "configure:3704: checking whether to define additional compiler specific flags" >&5 case "$target" in alpha-dec*) if test "$CC" = "cc"; then @@ -3642,7 +3728,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3646: checking for $ac_word" >&5 +echo "configure:3732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_have_telnet'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3683,7 +3769,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3687: checking for $ac_word" >&5 +echo "configure:3773: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_have_rlogin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3724,7 +3810,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3728: checking for $ac_word" >&5 +echo "configure:3814: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_have_tn3270'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3765,7 +3851,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3769: checking for $ac_word" >&5 +echo "configure:3855: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_have_perl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3802,7 +3888,7 @@ # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3806: checking for $ac_word" >&5 +echo "configure:3892: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3839,7 +3925,7 @@ # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3843: checking for $ac_word" >&5 +echo "configure:3929: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3876,7 +3962,7 @@ # Extract the first word of "mkdir", so it can be a program name with args. set dummy mkdir; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3880: checking for $ac_word" >&5 +echo "configure:3966: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3913,7 +3999,7 @@ # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3917: checking for $ac_word" >&5 +echo "configure:4003: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3950,7 +4036,7 @@ # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3954: checking for $ac_word" >&5 +echo "configure:4040: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3987,7 +4073,7 @@ # Extract the first word of "tar", so it can be a program name with args. set dummy tar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3991: checking for $ac_word" >&5 +echo "configure:4077: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4024,7 +4110,7 @@ # Extract the first word of "cvs", so it can be a program name with args. set dummy cvs; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4028: checking for $ac_word" >&5 +echo "configure:4114: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CVS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4061,7 +4147,7 @@ # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4065: checking for $ac_word" >&5 +echo "configure:4151: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4100,7 +4186,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4104: checking for $ac_word" >&5 +echo "configure:4190: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4138,7 +4224,7 @@ test -n "$COMPRESS" || COMPRESS="compress" echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:4142: checking whether ln -s works" >&5 +echo "configure:4228: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4164,7 +4250,7 @@ # Extract the first word of "resolv.conf", so it can be a program name with args. set dummy resolv.conf; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4168: checking for $ac_word" >&5 +echo "configure:4254: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_have_resolv_conf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4213,17 +4299,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4217: checking for $ac_hdr" >&5 +echo "configure:4303: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4253,17 +4339,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4257: checking for $ac_hdr" >&5 +echo "configure:4343: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4293,17 +4379,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4297: checking for $ac_hdr" >&5 +echo "configure:4383: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4333,17 +4419,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4337: checking for $ac_hdr" >&5 +echo "configure:4423: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4373,17 +4459,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4377: checking for $ac_hdr" >&5 +echo "configure:4463: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4413,17 +4499,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4417: checking for $ac_hdr" >&5 +echo "configure:4503: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4453,17 +4539,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4457: checking for $ac_hdr" >&5 +echo "configure:4543: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4493,17 +4579,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4497: checking for $ac_hdr" >&5 +echo "configure:4583: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4533,17 +4619,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4537: checking for $ac_hdr" >&5 +echo "configure:4623: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4573,17 +4659,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4577: checking for $ac_hdr" >&5 +echo "configure:4663: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4613,17 +4699,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4617: checking for $ac_hdr" >&5 +echo "configure:4703: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4653,17 +4739,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4657: checking for $ac_hdr" >&5 +echo "configure:4743: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4693,17 +4779,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4697: checking for $ac_hdr" >&5 +echo "configure:4783: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4733,17 +4819,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4737: checking for $ac_hdr" >&5 +echo "configure:4823: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4773,17 +4859,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4777: checking for $ac_hdr" >&5 +echo "configure:4863: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4813,17 +4899,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4817: checking for $ac_hdr" >&5 +echo "configure:4903: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4853,17 +4939,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4857: checking for $ac_hdr" >&5 +echo "configure:4943: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4893,17 +4979,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4897: checking for $ac_hdr" >&5 +echo "configure:4983: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4933,17 +5019,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4937: checking for $ac_hdr" >&5 +echo "configure:5023: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4973,17 +5059,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4977: checking for $ac_hdr" >&5 +echo "configure:5063: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5013,17 +5099,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5017: checking for $ac_hdr" >&5 +echo "configure:5103: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5053,17 +5139,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5057: checking for $ac_hdr" >&5 +echo "configure:5143: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5093,17 +5179,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5097: checking for $ac_hdr" >&5 +echo "configure:5183: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5133,17 +5219,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5137: checking for $ac_hdr" >&5 +echo "configure:5223: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5173,17 +5259,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5177: checking for $ac_hdr" >&5 +echo "configure:5263: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5213,17 +5299,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5217: checking for $ac_hdr" >&5 +echo "configure:5303: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5253,17 +5339,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5257: checking for $ac_hdr" >&5 +echo "configure:5343: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5293,17 +5379,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5297: checking for $ac_hdr" >&5 +echo "configure:5383: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5333,17 +5419,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5337: checking for $ac_hdr" >&5 +echo "configure:5423: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5373,17 +5459,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5377: checking for $ac_hdr" >&5 +echo "configure:5463: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5413,17 +5499,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5417: checking for $ac_hdr" >&5 +echo "configure:5503: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5453,17 +5539,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5457: checking for $ac_hdr" >&5 +echo "configure:5543: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5493,17 +5579,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5497: checking for $ac_hdr" >&5 +echo "configure:5583: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5533,17 +5619,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5537: checking for $ac_hdr" >&5 +echo "configure:5623: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5573,17 +5659,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5577: checking for $ac_hdr" >&5 +echo "configure:5663: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5613,17 +5699,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5617: checking for $ac_hdr" >&5 +echo "configure:5703: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5653,17 +5739,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5657: checking for $ac_hdr" >&5 +echo "configure:5743: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5693,17 +5779,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5697: checking for $ac_hdr" >&5 +echo "configure:5783: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5733,17 +5819,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5737: checking for $ac_hdr" >&5 +echo "configure:5823: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5773,17 +5859,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5777: checking for $ac_hdr" >&5 +echo "configure:5863: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5813,17 +5899,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5817: checking for $ac_hdr" >&5 +echo "configure:5903: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5854,12 +5940,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:5858: checking for $ac_hdr that defines DIR" >&5 +echo "configure:5944: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -5867,7 +5953,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:5871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -5892,7 +5978,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:5896: checking for opendir in -ldir" >&5 +echo "configure:5982: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5900,7 +5986,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5933,7 +6019,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:5937: checking for opendir in -lx" >&5 +echo "configure:6023: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5941,7 +6027,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5978,17 +6064,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5982: checking for $ac_hdr" >&5 +echo "configure:6068: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6014,12 +6100,12 @@ fi done echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:6018: checking for ANSI C header files" >&5 +echo "configure:6104: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6027,7 +6113,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6044,7 +6130,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -6062,7 +6148,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -6083,7 +6169,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6094,7 +6180,7 @@ exit (0); } EOF -if { (eval echo configure:6098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6118,12 +6204,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:6122: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:6208: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6139,7 +6225,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:6143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -6160,12 +6246,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:6164: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:6250: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6174,7 +6260,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:6178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -6195,12 +6281,12 @@ fi echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:6199: checking whether stat file-mode macros are broken" >&5 +echo "configure:6285: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6252,12 +6338,12 @@ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:6256: checking for uid_t in sys/types.h" >&5 +echo "configure:6342: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -6286,12 +6372,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6290: checking for pid_t" >&5 +echo "configure:6376: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6319,7 +6405,7 @@ fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:6323: checking type of array argument to getgroups" >&5 +echo "configure:6409: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6327,7 +6413,7 @@ ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -6366,7 +6452,7 @@ if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -6390,12 +6476,12 @@ echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:6394: checking for mode_t" >&5 +echo "configure:6480: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6423,12 +6509,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6427: checking for size_t" >&5 +echo "configure:6513: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6456,12 +6542,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:6460: checking return type of signal handlers" >&5 +echo "configure:6546: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6478,7 +6564,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:6482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -6499,12 +6585,12 @@ if test "$MINGW32" != "yes"; then echo $ac_n "checking for BOOLEAN""... $ac_c" 1>&6 -echo "configure:6503: checking for BOOLEAN" >&5 +echo "configure:6589: checking for BOOLEAN" >&5 if eval "test \"`echo '$''{'ac_cv_type_BOOLEAN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6532,12 +6618,12 @@ fi echo $ac_n "checking for u_char""... $ac_c" 1>&6 -echo "configure:6536: checking for u_char" >&5 +echo "configure:6622: checking for u_char" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6565,12 +6651,12 @@ fi echo $ac_n "checking for u_short""... $ac_c" 1>&6 -echo "configure:6569: checking for u_short" >&5 +echo "configure:6655: checking for u_short" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6598,12 +6684,12 @@ fi echo $ac_n "checking for u_long""... $ac_c" 1>&6 -echo "configure:6602: checking for u_long" >&5 +echo "configure:6688: checking for u_long" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6633,7 +6719,7 @@ fi echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:6637: checking size of char" >&5 +echo "configure:6723: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6641,7 +6727,7 @@ ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -6652,7 +6738,7 @@ exit(0); } EOF -if { (eval echo configure:6656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -6672,7 +6758,7 @@ echo $ac_n "checking size of char *""... $ac_c" 1>&6 -echo "configure:6676: checking size of char *" >&5 +echo "configure:6762: checking size of char *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6680,7 +6766,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -6691,7 +6777,7 @@ exit(0); } EOF -if { (eval echo configure:6695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char_p=`cat conftestval` else @@ -6711,7 +6797,7 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:6715: checking size of int" >&5 +echo "configure:6801: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6719,7 +6805,7 @@ ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -6730,7 +6816,7 @@ exit(0); } EOF -if { (eval echo configure:6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -6750,7 +6836,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:6754: checking size of long" >&5 +echo "configure:6840: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6758,7 +6844,7 @@ ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -6769,7 +6855,7 @@ exit(0); } EOF -if { (eval echo configure:6773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -6789,7 +6875,7 @@ echo $ac_n "checking for whether time_t is long""... $ac_c" 1>&6 -echo "configure:6793: checking for whether time_t is long" >&5 +echo "configure:6879: checking for whether time_t is long" >&5 if eval "test \"`echo '$''{'ac_cv_c_long_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6797,13 +6883,13 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < int main() { exit(sizeof(time_t) == sizeof(long)); } EOF -if { (eval echo configure:6807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_long_time_t=no else @@ -6827,7 +6913,7 @@ fi echo $ac_n "checking for whether size_t is long""... $ac_c" 1>&6 -echo "configure:6831: checking for whether size_t is long" >&5 +echo "configure:6917: checking for whether size_t is long" >&5 if eval "test \"`echo '$''{'ac_cv_c_long_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6835,13 +6921,13 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < int main() { exit(sizeof(size_t) == sizeof(int)); } EOF -if { (eval echo configure:6845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_long_size_t=yes else @@ -6866,12 +6952,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6870: checking for working const" >&5 +echo "configure:6956: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6941,14 +7027,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:6945: checking whether byte ordering is bigendian" >&5 +echo "configure:7031: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -6959,11 +7045,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:6963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -6974,7 +7060,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:6978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -6994,7 +7080,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -7031,14 +7117,14 @@ fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:7035: checking whether char is unsigned" >&5 +echo "configure:7121: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -7094,7 +7180,7 @@ fi echo $ac_n "checking for long double""... $ac_c" 1>&6 -echo "configure:7098: checking for long double" >&5 +echo "configure:7184: checking for long double" >&5 if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7105,7 +7191,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_long_double=yes else @@ -7138,12 +7224,12 @@ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:7142: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:7228: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7151,7 +7237,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:7155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -7172,12 +7258,12 @@ fi echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:7176: checking for tm_gmtoff in struct tm" >&5 +echo "configure:7262: checking for tm_gmtoff in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -7185,7 +7271,7 @@ struct tm tm; tm.tm_gmtoff; ; return 0; } EOF -if { (eval echo configure:7189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_gmtoff=yes else @@ -7206,19 +7292,19 @@ fi echo $ac_n "checking for time.h that defines timezone""... $ac_c" 1>&6 -echo "configure:7210: checking for time.h that defines timezone" >&5 +echo "configure:7296: checking for time.h that defines timezone" >&5 if eval "test \"`echo '$''{'ac_cv_extern_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return timezone; ; return 0; } EOF -if { (eval echo configure:7222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_extern_timezone=yes else @@ -7239,19 +7325,19 @@ fi echo $ac_n "checking for time.h that defines altzone""... $ac_c" 1>&6 -echo "configure:7243: checking for time.h that defines altzone" >&5 +echo "configure:7329: checking for time.h that defines altzone" >&5 if eval "test \"`echo '$''{'ac_cv_extern_altzone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return altzone; ; return 0; } EOF -if { (eval echo configure:7255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_extern_altzone=yes else @@ -7272,19 +7358,19 @@ fi echo $ac_n "checking for time.h that defines daylight""... $ac_c" 1>&6 -echo "configure:7276: checking for time.h that defines daylight" >&5 +echo "configure:7362: checking for time.h that defines daylight" >&5 if eval "test \"`echo '$''{'ac_cv_extern_daylight'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return daylight; ; return 0; } EOF -if { (eval echo configure:7288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_extern_daylight=yes else @@ -7306,7 +7392,7 @@ if test $ac_cv_extern_timezone = yes; then echo $ac_n "checking if timezone is backwards""... $ac_c" 1>&6 -echo "configure:7310: checking if timezone is backwards" >&5 +echo "configure:7396: checking if timezone is backwards" >&5 if eval "test \"`echo '$''{'ac_cv_backwards_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7314,7 +7400,7 @@ ac_cv_backwards_timezone=cross-compiling else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_backwards_timezone=no else @@ -7357,12 +7443,12 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:7361: checking for tm_zone in struct tm" >&5 +echo "configure:7447: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -7370,7 +7456,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:7374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -7390,12 +7476,12 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:7394: checking for tzname" >&5 +echo "configure:7480: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -7405,7 +7491,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:7409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -7427,12 +7513,12 @@ fi echo $ac_n "checking for winsize structure""... $ac_c" 1>&6 -echo "configure:7431: checking for winsize structure" >&5 +echo "configure:7517: checking for winsize structure" >&5 if eval "test \"`echo '$''{'ac_cv_struct_winsize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_winsize=yes else @@ -7468,12 +7554,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:7472: checking for vprintf" >&5 +echo "configure:7558: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -7520,12 +7606,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:7524: checking for _doprnt" >&5 +echo "configure:7610: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -7573,12 +7659,12 @@ fi echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:7577: checking for strftime" >&5 +echo "configure:7663: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -7623,7 +7709,7 @@ echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:7627: checking for strftime in -lintl" >&5 +echo "configure:7713: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7631,7 +7717,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7675,12 +7761,12 @@ gettimeofday mktime timegm tzset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7679: checking for $ac_func" >&5 +echo "configure:7765: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7730,12 +7816,12 @@ # AC_CHECK_FUNC(unlink, , AC_CHECK_FUNC(remove, AC_DEFINE(unlink, remove))) ## Path submitted by thurog@gmx.de for autoconf 2.53 echo $ac_n "checking for unlink""... $ac_c" 1>&6 -echo "configure:7734: checking for unlink" >&5 +echo "configure:7820: checking for unlink" >&5 if eval "test \"`echo '$''{'ac_cv_func_unlink'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_unlink=yes" else @@ -7779,12 +7865,12 @@ if test "$ac_cv_func_unlink" != yes ; then echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:7783: checking for remove" >&5 +echo "configure:7869: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -7845,7 +7931,7 @@ echo $ac_n "checking whether to support POSIX regex""... $ac_c" 1>&6 -echo "configure:7849: checking whether to support POSIX regex" >&5 +echo "configure:7935: checking whether to support POSIX regex" >&5 # Check whether --with-regex or --without-regex was given. if test "${with_regex+set}" = set; then withval="$with_regex" @@ -7861,7 +7947,7 @@ if test "x$withval" = "xyes"; then echo $ac_n "checking for regexec in -lrx""... $ac_c" 1>&6 -echo "configure:7865: checking for regexec in -lrx" >&5 +echo "configure:7951: checking for regexec in -lrx" >&5 ac_lib_var=`echo rx'_'regexec | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7869,7 +7955,7 @@ ac_save_LIBS="$LIBS" LIBS="-lrx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7902,21 +7988,21 @@ else echo $ac_n "checking for $withval""... $ac_c" 1>&6 -echo "configure:7906: checking for $withval" >&5 +echo "configure:7992: checking for $withval" >&5 LP=`dirname $withval` LN=`basename $withval | sed 's/lib\(.*\)\.a/\1/g'` echo "$ac_t""-L$LP -l$LN" 1>&6 LIBS="$LIBS -L$LP -l$LN" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -7936,7 +8022,7 @@ # borrowed from SSH - thanks! echo $ac_n "checking whether to support SOCKS""... $ac_c" 1>&6 -echo "configure:7940: checking whether to support SOCKS" >&5 +echo "configure:8026: checking whether to support SOCKS" >&5 # Check whether --with-socks or --without-socks was given. if test "${with_socks+set}" = set; then withval="$with_socks" @@ -7947,7 +8033,7 @@ yes) echo "$ac_t""yes" 1>&6 echo $ac_n "checking for SOCKSconnect in -lsocks5""... $ac_c" 1>&6 -echo "configure:7951: checking for SOCKSconnect in -lsocks5" >&5 +echo "configure:8037: checking for SOCKSconnect in -lsocks5" >&5 ac_lib_var=`echo socks5'_'SOCKSconnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7955,7 +8041,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocks5 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7988,7 +8074,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for Rconnect in -lsocks""... $ac_c" 1>&6 -echo "configure:7992: checking for Rconnect in -lsocks" >&5 +echo "configure:8078: checking for Rconnect in -lsocks" >&5 ac_lib_var=`echo socks'_'Rconnect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7996,7 +8082,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocks $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8043,7 +8129,7 @@ if test "x$socks" = "x"; then echo $ac_n "checking whether to support SOCKS5""... $ac_c" 1>&6 -echo "configure:8047: checking whether to support SOCKS5" >&5 +echo "configure:8133: checking whether to support SOCKS5" >&5 # Check whether --with-socks5 or --without-socks5 was given. if test "${with_socks5+set}" = set; then withval="$with_socks5" @@ -8059,7 +8145,7 @@ LIBS="$withval $LIBS" else echo $ac_n "checking for $withval""... $ac_c" 1>&6 -echo "configure:8063: checking for $withval" >&5 +echo "configure:8149: checking for $withval" >&5 LP=`dirname $withval` LN=`basename $withval | sed 's/lib\(.*\)\.a/\1/g'` echo "$ac_t""-L$LP -l$LN" 1>&6 @@ -8067,14 +8153,14 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -8094,7 +8180,7 @@ if test "x$socks" = "x"; then echo $ac_n "checking whether to support SOCKS4""... $ac_c" 1>&6 -echo "configure:8098: checking whether to support SOCKS4" >&5 +echo "configure:8184: checking whether to support SOCKS4" >&5 # Check whether --with-socks4 or --without-socks4 was given. if test "${with_socks4+set}" = set; then withval="$with_socks4" @@ -8110,7 +8196,7 @@ LIBS="$withval $LIBS" else echo $ac_n "checking for $withval""... $ac_c" 1>&6 -echo "configure:8114: checking for $withval" >&5 +echo "configure:8200: checking for $withval" >&5 LP=`dirname $withval` LN=`basename $withval | sed 's/lib\(.*\)\.a/\1/g'` echo "$ac_t""-L$LP -l$LN" 1>&6 @@ -8118,14 +8204,14 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -8166,7 +8252,7 @@ fi echo $ac_n "checking whether to support mysql access.""... $ac_c" 1>&6 -echo "configure:8170: checking whether to support mysql access." >&5 +echo "configure:8256: checking whether to support mysql access." >&5 # Check whether --with-mysql or --without-mysql was given. if test "${with_mysql+set}" = set; then withval="$with_mysql" @@ -8185,7 +8271,7 @@ if test "x$withval" = "xyes"; then if test -f '/usr/local/lib/mysql/libmysqlclient.a'; then echo $ac_n "checking for "/usr/local/lib/mysql/libmysqlclient.a"""... $ac_c" 1>&6 -echo "configure:8189: checking for "/usr/local/lib/mysql/libmysqlclient.a"" >&5 +echo "configure:8275: checking for "/usr/local/lib/mysql/libmysqlclient.a"" >&5 LP=`dirname "/usr/local/lib/mysql/libmysqlclient.a"` LN=`basename "/usr/local/lib/mysql/libmysqlclient.a" | sed 's/lib\(.*\)\.a/\1/g'` echo "$ac_t""-L$LP -l$LN" 1>&6 @@ -8193,7 +8279,7 @@ elif test -f '/usr/lib/mysql/libmysqlclient.a'; then echo $ac_n "checking for "/usr/lib/mysql/libmysqlclient.a"""... $ac_c" 1>&6 -echo "configure:8197: checking for "/usr/lib/mysql/libmysqlclient.a"" >&5 +echo "configure:8283: checking for "/usr/lib/mysql/libmysqlclient.a"" >&5 LP=`dirname "/usr/lib/mysql/libmysqlclient.a"` LN=`basename "/usr/lib/mysql/libmysqlclient.a" | sed 's/lib\(.*\)\.a/\1/g'` echo "$ac_t""-L$LP -l$LN" 1>&6 @@ -8204,7 +8290,7 @@ fi else echo $ac_n "checking for $withval""... $ac_c" 1>&6 -echo "configure:8208: checking for $withval" >&5 +echo "configure:8294: checking for $withval" >&5 LP=`dirname $withval` LN=`basename $withval | sed 's/lib\(.*\)\.a/\1/g'` echo "$ac_t""-L$LP -l$LN" 1>&6 @@ -8242,7 +8328,7 @@ echo $ac_n "checking whether we include the Expat XML parser.""... $ac_c" 1>&6 -echo "configure:8246: checking whether we include the Expat XML parser." >&5 +echo "configure:8332: checking whether we include the Expat XML parser." >&5 # Check whether --with-expat or --without-expat was given. if test "${with_expat+set}" = set; then withval="$with_expat" @@ -8301,7 +8387,7 @@ echo $ac_n "checking whether we include MD5 support for HTTP Digest Authentication.""... $ac_c" 1>&6 -echo "configure:8305: checking whether we include MD5 support for HTTP Digest Authentication." >&5 +echo "configure:8391: checking whether we include MD5 support for HTTP Digest Authentication." >&5 # Check whether --with-md5 or --without-md5 was given. if test "${with_md5+set}" = set; then withval="$with_md5" @@ -8349,7 +8435,7 @@ echo $ac_n "checking whether we can find OpenSSL""... $ac_c" 1>&6 -echo "configure:8353: checking whether we can find OpenSSL" >&5 +echo "configure:8439: checking whether we can find OpenSSL" >&5 if test -d '/usr/local/ssl/lib'; then ssllib="-L/usr/local/ssl/lib -lssl -lcrypto" else @@ -8388,14 +8474,14 @@ fi LIBS="$LIBS $withval" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -8422,7 +8508,7 @@ echo $ac_n "checking whether to use internal signal handlers""... $ac_c" 1>&6 -echo "configure:8426: checking whether to use internal signal handlers" >&5 +echo "configure:8512: checking whether to use internal signal handlers" >&5 # Check whether --enable-signals or --disable-signals was given. if test "${enable_signals+set}" = set; then enableval="$enable_signals" @@ -8445,7 +8531,7 @@ echo $ac_n "checking whether to disable Nagle's algorithm""... $ac_c" 1>&6 -echo "configure:8449: checking whether to disable Nagle's algorithm" >&5 +echo "configure:8535: checking whether to disable Nagle's algorithm" >&5 # Check whether --enable-nagle or --disable-nagle was given. if test "${enable_nagle+set}" = set; then enableval="$enable_nagle" @@ -8472,7 +8558,7 @@ echo $ac_n "checking whether to accept new rule files without asking an end user.""... $ac_c" 1>&6 -echo "configure:8476: checking whether to accept new rule files without asking an end user." >&5 +echo "configure:8562: checking whether to accept new rule files without asking an end user." >&5 # Check whether --enable-autorules or --disable-autorules was given. if test "${enable_autorules+set}" = set; then enableval="$enable_autorules" @@ -8495,7 +8581,7 @@ echo $ac_n "checking whether to disable HTTP/1.1 pipelining""... $ac_c" 1>&6 -echo "configure:8499: checking whether to disable HTTP/1.1 pipelining" >&5 +echo "configure:8585: checking whether to disable HTTP/1.1 pipelining" >&5 # Check whether --enable-pipelining or --disable-pipelining was given. if test "${enable_pipelining+set}" = set; then enableval="$enable_pipelining" @@ -8519,7 +8605,7 @@ echo $ac_n "checking whether to use MUX as transport for HTTP.""... $ac_c" 1>&6 -echo "configure:8523: checking whether to use MUX as transport for HTTP." >&5 +echo "configure:8609: checking whether to use MUX as transport for HTTP." >&5 # Check whether --enable-mux or --disable-mux was given. if test "${enable_mux+set}" = set; then enableval="$enable_mux" @@ -8542,7 +8628,7 @@ echo $ac_n "checking whether to define _REENTRANT""... $ac_c" 1>&6 -echo "configure:8546: checking whether to define _REENTRANT" >&5 +echo "configure:8632: checking whether to define _REENTRANT" >&5 # Check whether --enable-reentrant or --disable-reentrant was given. if test "${enable_reentrant+set}" = set; then enableval="$enable_reentrant" @@ -8569,10 +8655,10 @@ if test "$ac_cv_reentrant" = "yes"; then echo $ac_n "checking for ctime_r""... $ac_c" 1>&6 -echo "configure:8573: checking for ctime_r" >&5 +echo "configure:8659: checking for ctime_r" >&5 if test -z "$ac_cv_ctime_args"; then cat > conftest.$ac_ext < int main() { @@ -8583,7 +8669,7 @@ ; return 0; } EOF -if { (eval echo configure:8587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ctime_args=2 else @@ -8594,7 +8680,7 @@ fi if test -z "$ac_cv_ctime_args" ; then cat > conftest.$ac_ext < int main() { @@ -8605,7 +8691,7 @@ ; return 0; } EOF -if { (eval echo configure:8609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ctime_args=3 else @@ -8633,10 +8719,10 @@ fi echo $ac_n "checking for readdir_r""... $ac_c" 1>&6 -echo "configure:8637: checking for readdir_r" >&5 +echo "configure:8723: checking for readdir_r" >&5 if test -z "$ac_cv_readdir_args"; then cat > conftest.$ac_ext < @@ -8665,7 +8751,7 @@ ; return 0; } EOF -if { (eval echo configure:8669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_readdir_args=2 else @@ -8677,7 +8763,7 @@ if test -z "$ac_cv_readdir_args"; then cat > conftest.$ac_ext < @@ -8706,7 +8792,7 @@ ; return 0; } EOF -if { (eval echo configure:8710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_readdir_args=3 else @@ -8735,10 +8821,10 @@ fi echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6 -echo "configure:8739: checking for gethostbyname_r" >&5 +echo "configure:8825: checking for gethostbyname_r" >&5 if test -z "$ac_cv_gethostbyname_args"; then cat > conftest.$ac_ext < @@ -8753,7 +8839,7 @@ hp = gethostbyname_r(name, &h, buffer, 10, &h_errno); ; return 0; } EOF -if { (eval echo configure:8757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gethostbyname_args=5 else @@ -8764,7 +8850,7 @@ fi if test -z "$ac_cv_gethostbyname_args"; then cat > conftest.$ac_ext < @@ -8778,7 +8864,7 @@ rc = gethostbyname_r(name, &h, &hdata); ; return 0; } EOF -if { (eval echo configure:8782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gethostbyname_args=3 else @@ -8789,7 +8875,7 @@ fi if test -z "$ac_cv_gethostbyname_args"; then cat > conftest.$ac_ext < @@ -8807,7 +8893,7 @@ ; return 0; } EOF -if { (eval echo configure:8811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gethostbyname_args=6 else @@ -8840,10 +8926,10 @@ fi echo $ac_n "checking for gethostbyaddr_r""... $ac_c" 1>&6 -echo "configure:8844: checking for gethostbyaddr_r" >&5 +echo "configure:8930: checking for gethostbyaddr_r" >&5 if test -z "$ac_cv_gethostbyaddr_args"; then cat > conftest.$ac_ext < @@ -8860,7 +8946,7 @@ ; return 0; } EOF -if { (eval echo configure:8864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gethostbyaddr_args=5 else @@ -8872,7 +8958,7 @@ fi if test -z "$ac_cv_gethostbyaddr_args"; then cat > conftest.$ac_ext < @@ -8893,7 +8979,7 @@ ; return 0; } EOF -if { (eval echo configure:8897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gethostbyaddr_args=7 else @@ -8905,7 +8991,7 @@ if test -z "$ac_cv_gethostbyaddr_args"; then cat > conftest.$ac_ext < @@ -8927,7 +9013,7 @@ ; return 0; } EOF -if { (eval echo configure:8931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gethostbyaddr_args=8 else @@ -8960,7 +9046,7 @@ fi echo $ac_n "checking for getlogin_r""... $ac_c" 1>&6 -echo "configure:8964: checking for getlogin_r" >&5 +echo "configure:9050: checking for getlogin_r" >&5 if test -z "$ac_cv_getlogin_r_style"; then if test "$cross_compiling" = yes; then @@ -8968,7 +9054,7 @@ else cat > conftest.$ac_ext < @@ -9002,7 +9088,7 @@ } EOF -if { (eval echo configure:9006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_getlogin_r_style=1 @@ -9046,7 +9132,7 @@ fi echo $ac_n "checking whether to define _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:9050: checking whether to define _POSIX_SOURCE" >&5 +echo "configure:9136: checking whether to define _POSIX_SOURCE" >&5 # Check whether --enable-posix or --disable-posix was given. if test "${enable_posix+set}" = set; then enableval="$enable_posix" @@ -9253,7 +9339,7 @@ s%@MAINT@%$MAINT%g s%@LD@%$LD%g s%@AR@%$AR%g -s%@AR_OPTS@%$AR_OPTS%g +s%@ARFLAGS@%$ARFLAGS%g s%@texmfmain@%$texmfmain%g s%@NM@%$NM%g s%@icondir@%$icondir%g diff -Naur xdvik-22.40n/libs/libwww/configure.in xdvik-22.40o/libs/libwww/configure.in --- xdvik-22.40n/libs/libwww/configure.in Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/configure.in Wed Oct 16 22:26:20 2002 @@ -1,9 +1,9 @@ dnl Process this file with Autoconf to create configure dnl (c) COPYRIGHT MIT 1995. dnl Please first read the full copyright statement in the file COPYRIGH. -dnl @(#) $Id: configure.in,v 1.1.1.1.8.1 2002/09/13 00:23:47 stefanulrich Exp $ +dnl @(#) $Id: configure.in,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ -AC_REVISION([$Id: configure.in,v 1.1.1.1.8.1 2002/09/13 00:23:47 stefanulrich Exp $]) +AC_REVISION([$Id: configure.in,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $]) AC_PREREQ(2.13) AC_INIT(HTAABrow.c) diff -Naur xdvik-22.40n/libs/libwww/wwwsys.h xdvik-22.40o/libs/libwww/wwwsys.h --- xdvik-22.40n/libs/libwww/wwwsys.h Fri Sep 13 00:23:47 2002 +++ xdvik-22.40o/libs/libwww/wwwsys.h Wed Oct 16 22:26:20 2002 @@ -1578,6 +1578,6 @@ - @(#) $Id: wwwsys.h,v 1.1.1.1.8.1 2002/09/13 00:23:47 stefanulrich Exp $ + @(#) $Id: wwwsys.h,v 1.1.1.1.8.2 2002/10/16 22:26:20 stefanulrich Exp $ */ diff -Naur xdvik-22.40n/libs/t1lib/CVS/Entries xdvik-22.40o/libs/t1lib/CVS/Entries --- xdvik-22.40n/libs/t1lib/CVS/Entries Mon Sep 16 17:45:07 2002 +++ xdvik-22.40o/libs/t1lib/CVS/Entries Wed Oct 16 23:45:11 2002 @@ -6,7 +6,7 @@ /README.t1lib-1.3.1/1.1.2.1/Mon Jan 7 15:55:52 2002//Txdvik_22_40_STABLE /README.t1python/1.1.1.1/Wed Apr 18 14:23:31 2001//Txdvik_22_40_STABLE /README.win32/1.1/Wed Apr 18 23:23:15 2001//Txdvik_22_40_STABLE -/configure/1.3.8.5/Mon Sep 16 17:45:28 2002//Txdvik_22_40_STABLE +/configure/1.3.8.6/Wed Oct 16 22:26:20 2002//Txdvik_22_40_STABLE /configure.com/1.2/Wed Apr 18 23:23:15 2001//Txdvik_22_40_STABLE /configure.in/1.2.8.4/Sat Sep 14 00:07:32 2002//Txdvik_22_40_STABLE /libtool/1.1.2.1/Sat Sep 14 00:24:47 2002//Txdvik_22_40_STABLE diff -Naur xdvik-22.40n/libs/t1lib/configure xdvik-22.40o/libs/t1lib/configure --- xdvik-22.40n/libs/t1lib/configure Mon Sep 16 17:45:28 2002 +++ xdvik-22.40o/libs/t1lib/configure Wed Oct 16 22:26:20 2002 @@ -44,6 +44,10 @@ ac_help="$ac_help --without-mkofm-default do not run mkofm if OFM file missing" ac_help="$ac_help + --with-mktexfmt-default run mktexfmt if format file missing" +ac_help="$ac_help + --with-mktextex-default run mktextex if TeX source missing" +ac_help="$ac_help --enable-multiplatform put executables in bin/PLATFORM" # Initialize some variables set by options. @@ -594,7 +598,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:598: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:602: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -623,7 +627,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:627: checking for $ac_word" >&5 +echo "configure:631: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -654,7 +658,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:658: checking for $ac_word" >&5 +echo "configure:662: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -706,7 +710,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:710: checking for $ac_word" >&5 +echo "configure:714: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -739,7 +743,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:743: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:747: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -750,12 +754,12 @@ cat > conftest.$ac_ext << EOF -#line 754 "configure" +#line 758 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -781,12 +785,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:785: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:789: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:790: checking whether we are using GNU C" >&5 +echo "configure:794: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -795,7 +799,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -814,7 +818,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:818: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:822: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -846,7 +850,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:850: checking how to run the C preprocessor" >&5 +echo "configure:854: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -861,13 +865,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -878,13 +882,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -895,13 +899,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -930,7 +934,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:934: checking for X" >&5 +echo "configure:938: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -992,12 +996,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1066,14 +1070,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1181,17 +1185,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:1185: checking whether -R must be followed by a space" >&5 +echo "configure:1189: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -1207,14 +1211,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -1252,7 +1256,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:1256: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1260: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1260,7 +1264,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1293,7 +1297,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:1297: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1301: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1301,7 +1305,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1341,12 +1345,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1345: checking for gethostbyname" >&5 +echo "configure:1349: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1390,7 +1394,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1394: checking for gethostbyname in -lnsl" >&5 +echo "configure:1398: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1398,7 +1402,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1439,12 +1443,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1443: checking for connect" >&5 +echo "configure:1447: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1488,7 +1492,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1492: checking for connect in -lsocket" >&5 +echo "configure:1496: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1496,7 +1500,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1531,12 +1535,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:1535: checking for remove" >&5 +echo "configure:1539: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -1580,7 +1584,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1584: checking for remove in -lposix" >&5 +echo "configure:1588: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1588,7 +1592,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1623,12 +1627,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:1627: checking for shmat" >&5 +echo "configure:1631: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -1672,7 +1676,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:1676: checking for shmat in -lipc" >&5 +echo "configure:1680: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1680,7 +1684,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1724,7 +1728,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:1728: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:1732: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1732,7 +1736,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1779,7 +1783,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1783: checking for a BSD compatible install" >&5 +echo "configure:1787: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1836,7 +1840,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1840: checking for $ac_word" >&5 +echo "configure:1844: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1867,7 +1871,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1871: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1875: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1886,7 +1890,7 @@ echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6 -echo "configure:1890: checking for loader (symbol LD)" >&5 +echo "configure:1894: checking for loader (symbol LD)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1900,7 +1904,7 @@ echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6 -echo "configure:1904: checking for archiver (symbol AR)" >&5 +echo "configure:1908: checking for archiver (symbol AR)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1913,18 +1917,18 @@ echo "$ac_t""$AR" 1>&6 -echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 -echo "configure:1918: checking for archiver options (symbol AR_OPTS)" >&5 -if eval "test \"`echo '$''{'cf_cv_subst_AR_OPTS'+set}'`\" = set"; then +echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6 +echo "configure:1922: checking for archiver options (symbol ARFLAGS)" >&5 +if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -test -z "$AR_OPTS" && AR_OPTS=rc -cf_cv_subst_AR_OPTS=$AR_OPTS +test -z "$ARFLAGS" && ARFLAGS=rc +cf_cv_subst_ARFLAGS=$ARFLAGS fi -AR_OPTS=${cf_cv_subst_AR_OPTS} -echo "$ac_t""$AR_OPTS" 1>&6 +ARFLAGS=${cf_cv_subst_ARFLAGS} +echo "$ac_t""$ARFLAGS" 1>&6 @@ -1933,80 +1937,64 @@ withval="$with_mktexmf_default" : else - withval=yes + with_mktexmf_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_MF_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktexpk-default or --without-mktexpk-default was given. if test "${with_mktexpk_default+set}" = set; then withval="$with_mktexpk_default" : else - withval=yes + with_mktexpk_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_PK_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktextfm-default or --without-mktextfm-default was given. if test "${with_mktextfm_default+set}" = set; then withval="$with_mktextfm_default" : else - withval=yes + with_mktextfm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_TFM_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkocp-default or --without-mkocp-default was given. if test "${with_mkocp_default+set}" = set; then withval="$with_mkocp_default" : else - withval=yes + with_mkocp_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OCP_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkofm-default or --without-mkofm-default was given. if test "${with_mkofm_default+set}" = set; then withval="$with_mkofm_default" : else - withval=yes + with_mkofm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OFM_BY_DEFAULT 1 -EOF +# Check whether --with-mktexfmt-default or --without-mktexfmt-default was given. +if test "${with_mktexfmt_default+set}" = set; then + withval="$with_mktexfmt_default" + : +fi +# Check whether --with-mktextex-default or --without-mktextex-default was given. +if test "${with_mktextex_default+set}" = set; then + withval="$with_mktextex_default" + with_mktextex_default=yes +else + with_mktextex_default=no fi + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:2010: checking host system type" >&5 +echo "configure:1998: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -2038,7 +2026,7 @@ echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 -echo "configure:2042: checking where the main texmf tree is located" >&5 +echo "configure:2030: checking where the main texmf tree is located" >&5 texmfmain= if test "x$datadir" != 'x${prefix}/share'; then # First case, datadir is defined... @@ -2072,6 +2060,13 @@ if test -n "$texmfmain"; then echo "$ac_t"""$texmfmain"" 1>&6 else + ### SU: added using `kpsewhich' as last fallback before giving up; since + ### xdvik is most likely to be installed with an *existing* kpathsearch + ### system, this seemed reasonable to me. + texmfmain=`kpsewhich --expand-path='$TEXMFMAIN' 2>/dev/null | sed 's,//*,/,g'` + if test -d "$texmfmain"; then + echo "$ac_t"""$texmfmain"" 1>&6 + else eval texmfmain="$datadir/texmf" echo "$ac_t""not found" 1>&6 echo "configure: warning: The main texmf tree was not found. @@ -2081,19 +2076,20 @@ in systems/web2c. Winging it by using the default location $texmfmain." 1>&2 fi + fi fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:2090: checking whether char is unsigned" >&5 +echo "configure:2086: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -2149,7 +2145,7 @@ fi echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:2153: checking size of char" >&5 +echo "configure:2149: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2157,7 +2153,7 @@ ac_cv_sizeof_char=0 else cat > conftest.$ac_ext < main() @@ -2168,7 +2164,7 @@ exit(0); } EOF -if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -2188,7 +2184,7 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:2192: checking size of short" >&5 +echo "configure:2188: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2196,7 +2192,7 @@ ac_cv_sizeof_short=0 else cat > conftest.$ac_ext < main() @@ -2207,7 +2203,7 @@ exit(0); } EOF -if { (eval echo configure:2211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -2227,7 +2223,7 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:2231: checking size of int" >&5 +echo "configure:2227: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2235,7 +2231,7 @@ ac_cv_sizeof_int=0 else cat > conftest.$ac_ext < main() @@ -2246,7 +2242,7 @@ exit(0); } EOF -if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -2266,7 +2262,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:2270: checking size of long" >&5 +echo "configure:2266: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2274,7 +2270,7 @@ ac_cv_sizeof_long=0 else cat > conftest.$ac_ext < main() @@ -2285,7 +2281,7 @@ exit(0); } EOF -if { (eval echo configure:2289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -2305,7 +2301,7 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:2309: checking size of long long" >&5 +echo "configure:2305: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2313,7 +2309,7 @@ ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -2324,7 +2320,7 @@ exit(0); } EOF -if { (eval echo configure:2328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -2344,7 +2340,7 @@ echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:2348: checking size of float" >&5 +echo "configure:2344: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2352,7 +2348,7 @@ ac_cv_sizeof_float=0 else cat > conftest.$ac_ext < main() @@ -2363,7 +2359,7 @@ exit(0); } EOF -if { (eval echo configure:2367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -2383,7 +2379,7 @@ echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:2387: checking size of double" >&5 +echo "configure:2383: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2391,7 +2387,7 @@ ac_cv_sizeof_double=0 else cat > conftest.$ac_ext < main() @@ -2402,7 +2398,7 @@ exit(0); } EOF -if { (eval echo configure:2406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -2422,7 +2418,7 @@ echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:2426: checking size of long double" >&5 +echo "configure:2422: checking size of long double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2430,7 +2426,7 @@ ac_cv_sizeof_long_double=0 else cat > conftest.$ac_ext < main() @@ -2441,7 +2437,7 @@ exit(0); } EOF -if { (eval echo configure:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_double=`cat conftestval` else @@ -2461,7 +2457,7 @@ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:2465: checking size of void *" >&5 +echo "configure:2461: checking size of void *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2469,7 +2465,7 @@ ac_cv_sizeof_void_p=0 else cat > conftest.$ac_ext < main() @@ -2480,7 +2476,7 @@ exit(0); } EOF -if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_void_p=`cat conftestval` else @@ -2504,7 +2500,7 @@ then CFLAGS="$CFLAGS" echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6 -echo "configure:2508: checking "for gcc strength-reduce bug"" >&5 +echo "configure:2504: checking "for gcc strength-reduce bug"" >&5 if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2512,7 +2508,7 @@ ac_cv_c_gcc_strength_bug="yes" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_gcc_strength_bug="no" else @@ -2545,7 +2541,7 @@ fi echo $ac_n "checking "which ANSI integer type is 16 bit"""... $ac_c" 1>&6 -echo "configure:2549: checking "which ANSI integer type is 16 bit"" >&5 +echo "configure:2545: checking "which ANSI integer type is 16 bit"" >&5 if eval "test \"`echo '$''{'ac_16bit_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2553,7 +2549,7 @@ ac_16bit_type= else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_16bit_type="short" else @@ -2589,7 +2585,7 @@ echo $ac_n "checking "which ANSI integer type is 32 bit"""... $ac_c" 1>&6 -echo "configure:2593: checking "which ANSI integer type is 32 bit"" >&5 +echo "configure:2589: checking "which ANSI integer type is 32 bit"" >&5 if eval "test \"`echo '$''{'ac_32bit_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2597,7 +2593,7 @@ ac_32bit_type= else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_32bit_type="int" else @@ -2633,7 +2629,7 @@ echo $ac_n "checking "which ANSI integer type is 64 bit"""... $ac_c" 1>&6 -echo "configure:2637: checking "which ANSI integer type is 64 bit"" >&5 +echo "configure:2633: checking "which ANSI integer type is 64 bit"" >&5 if eval "test \"`echo '$''{'ac_64bit_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2641,7 +2637,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_64bit_type="long" else @@ -2678,12 +2674,12 @@ echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:2682: checking whether stat file-mode macros are broken" >&5 +echo "configure:2678: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2734,12 +2730,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2738: checking for working const" >&5 +echo "configure:2734: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2809,12 +2805,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2813: checking for ANSI C header files" >&5 +echo "configure:2809: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2822,7 +2818,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2839,7 +2835,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2857,7 +2853,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2878,7 +2874,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2889,7 +2885,7 @@ exit (0); } EOF -if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2913,12 +2909,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2917: checking for size_t" >&5 +echo "configure:2913: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3096,7 +3092,7 @@ s%@MAINT@%$MAINT%g s%@LD@%$LD%g s%@AR@%$AR%g -s%@AR_OPTS@%$AR_OPTS%g +s%@ARFLAGS@%$ARFLAGS%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g diff -Naur xdvik-22.40n/libs/type1/CVS/Entries xdvik-22.40o/libs/type1/CVS/Entries --- xdvik-22.40n/libs/type1/CVS/Entries Mon Sep 16 17:44:59 2002 +++ xdvik-22.40o/libs/type1/CVS/Entries Wed Oct 16 23:43:56 2002 @@ -10,7 +10,7 @@ /bstring.c/1.1.2.1/Sat Sep 14 00:24:47 2002//Txdvik_22_40_STABLE /c-auto.in/1.1.2.1/Sat Sep 14 00:24:47 2002//Txdvik_22_40_STABLE /cluts.h/1.1.2.1/Sat Sep 14 00:24:47 2002//Txdvik_22_40_STABLE -/configure/1.1.2.2/Mon Sep 16 17:45:29 2002//Txdvik_22_40_STABLE +/configure/1.1.2.3/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE /configure.in/1.1.2.1/Sat Sep 14 00:24:47 2002//Txdvik_22_40_STABLE /curves.c/1.1.2.1/Sat Sep 14 00:24:47 2002//Txdvik_22_40_STABLE /curves.h/1.1.2.1/Sat Sep 14 00:24:47 2002//Txdvik_22_40_STABLE diff -Naur xdvik-22.40n/libs/type1/configure xdvik-22.40o/libs/type1/configure --- xdvik-22.40n/libs/type1/configure Mon Sep 16 17:45:29 2002 +++ xdvik-22.40o/libs/type1/configure Wed Oct 16 22:26:21 2002 @@ -42,6 +42,10 @@ ac_help="$ac_help --without-mkofm-default do not run mkofm if OFM file missing" ac_help="$ac_help + --with-mktexfmt-default run mktexfmt if format file missing" +ac_help="$ac_help + --with-mktextex-default run mktextex if TeX source missing" +ac_help="$ac_help --enable-multiplatform put executables in bin/PLATFORM" # Initialize some variables set by options. @@ -581,7 +585,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:585: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:589: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -610,7 +614,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:614: checking for $ac_word" >&5 +echo "configure:618: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -641,7 +645,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:645: checking for $ac_word" >&5 +echo "configure:649: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -693,7 +697,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:697: checking for $ac_word" >&5 +echo "configure:701: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -726,7 +730,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:730: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:734: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -737,12 +741,12 @@ cat > conftest.$ac_ext << EOF -#line 741 "configure" +#line 745 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -768,12 +772,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:776: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:777: checking whether we are using GNU C" >&5 +echo "configure:781: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -782,7 +786,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -801,7 +805,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:805: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:809: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -833,7 +837,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:837: checking how to run the C preprocessor" >&5 +echo "configure:841: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -848,13 +852,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -865,13 +869,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -882,13 +886,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -915,7 +919,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:919: checking for $ac_word" >&5 +echo "configure:923: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -946,12 +950,12 @@ for ac_func in memset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:950: checking for $ac_func" >&5 +echo "configure:954: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1001,7 +1005,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1005: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1009: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1020,7 +1024,7 @@ echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6 -echo "configure:1024: checking for loader (symbol LD)" >&5 +echo "configure:1028: checking for loader (symbol LD)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1034,7 +1038,7 @@ echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6 -echo "configure:1038: checking for archiver (symbol AR)" >&5 +echo "configure:1042: checking for archiver (symbol AR)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1047,18 +1051,18 @@ echo "$ac_t""$AR" 1>&6 -echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 -echo "configure:1052: checking for archiver options (symbol AR_OPTS)" >&5 -if eval "test \"`echo '$''{'cf_cv_subst_AR_OPTS'+set}'`\" = set"; then +echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6 +echo "configure:1056: checking for archiver options (symbol ARFLAGS)" >&5 +if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -test -z "$AR_OPTS" && AR_OPTS=rc -cf_cv_subst_AR_OPTS=$AR_OPTS +test -z "$ARFLAGS" && ARFLAGS=rc +cf_cv_subst_ARFLAGS=$ARFLAGS fi -AR_OPTS=${cf_cv_subst_AR_OPTS} -echo "$ac_t""$AR_OPTS" 1>&6 +ARFLAGS=${cf_cv_subst_ARFLAGS} +echo "$ac_t""$ARFLAGS" 1>&6 @@ -1067,80 +1071,64 @@ withval="$with_mktexmf_default" : else - withval=yes + with_mktexmf_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_MF_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktexpk-default or --without-mktexpk-default was given. if test "${with_mktexpk_default+set}" = set; then withval="$with_mktexpk_default" : else - withval=yes + with_mktexpk_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_PK_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktextfm-default or --without-mktextfm-default was given. if test "${with_mktextfm_default+set}" = set; then withval="$with_mktextfm_default" : else - withval=yes + with_mktextfm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_TFM_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkocp-default or --without-mkocp-default was given. if test "${with_mkocp_default+set}" = set; then withval="$with_mkocp_default" : else - withval=yes + with_mkocp_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OCP_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkofm-default or --without-mkofm-default was given. if test "${with_mkofm_default+set}" = set; then withval="$with_mkofm_default" : else - withval=yes + with_mkofm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OFM_BY_DEFAULT 1 -EOF +# Check whether --with-mktexfmt-default or --without-mktexfmt-default was given. +if test "${with_mktexfmt_default+set}" = set; then + withval="$with_mktexfmt_default" + : +fi +# Check whether --with-mktextex-default or --without-mktextex-default was given. +if test "${with_mktextex_default+set}" = set; then + withval="$with_mktextex_default" + with_mktextex_default=yes +else + with_mktextex_default=no fi + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1144: checking host system type" >&5 +echo "configure:1132: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1172,7 +1160,7 @@ echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 -echo "configure:1176: checking where the main texmf tree is located" >&5 +echo "configure:1164: checking where the main texmf tree is located" >&5 texmfmain= if test "x$datadir" != 'x${prefix}/share'; then # First case, datadir is defined... @@ -1206,6 +1194,13 @@ if test -n "$texmfmain"; then echo "$ac_t"""$texmfmain"" 1>&6 else + ### SU: added using `kpsewhich' as last fallback before giving up; since + ### xdvik is most likely to be installed with an *existing* kpathsearch + ### system, this seemed reasonable to me. + texmfmain=`kpsewhich --expand-path='$TEXMFMAIN' 2>/dev/null | sed 's,//*,/,g'` + if test -d "$texmfmain"; then + echo "$ac_t"""$texmfmain"" 1>&6 + else eval texmfmain="$datadir/texmf" echo "$ac_t""not found" 1>&6 echo "configure: warning: The main texmf tree was not found. @@ -1215,6 +1210,7 @@ in systems/web2c. Winging it by using the default location $texmfmain." 1>&2 fi + fi fi @@ -1223,7 +1219,7 @@ then CFLAGS="$CFLAGS" echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6 -echo "configure:1227: checking "for gcc strength-reduce bug"" >&5 +echo "configure:1223: checking "for gcc strength-reduce bug"" >&5 if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1231,7 +1227,7 @@ ac_cv_c_gcc_strength_bug="yes" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_gcc_strength_bug="no" else @@ -1402,7 +1398,7 @@ s%@MAINT@%$MAINT%g s%@LD@%$LD%g s%@AR@%$AR%g -s%@AR_OPTS@%$AR_OPTS%g +s%@ARFLAGS@%$ARFLAGS%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g diff -Naur xdvik-22.40n/texk/CVS/Entries xdvik-22.40o/texk/CVS/Entries --- xdvik-22.40n/texk/CVS/Entries Mon Sep 16 17:45:07 2002 +++ xdvik-22.40o/texk/CVS/Entries Wed Oct 16 23:45:31 2002 @@ -5,7 +5,7 @@ /add-info-toc/1.1.1.1/Wed Apr 18 14:24:16 2001//Txdvik_22_40_STABLE /config.guess/1.1.1.1.8.1/Tue Aug 20 22:27:12 2002//Txdvik_22_40_STABLE /config.sub/1.1.1.1.8.1/Tue Aug 20 22:27:17 2002//Txdvik_22_40_STABLE -/configure/1.3/Sun May 20 21:25:01 2001//Txdvik_22_40_STABLE +/configure/1.3.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE /configure.in/1.1.1.1/Wed Apr 18 14:24:17 2001//Txdvik_22_40_STABLE /dir/1.1.1.1/Wed Apr 18 14:24:17 2001//Txdvik_22_40_STABLE /install.sh/1.1.1.1/Wed Apr 18 14:24:17 2001//Txdvik_22_40_STABLE @@ -13,8 +13,6 @@ /mkinstalldirs/1.1.1.1/Wed Apr 18 14:24:17 2001//Txdvik_22_40_STABLE /rename/1.1.1.1/Wed Apr 18 14:24:17 2001//Txdvik_22_40_STABLE /testfont.dvi/1.1.1.1/Wed Apr 18 14:24:17 2001//Txdvik_22_40_STABLE -/testfont.log/1.1.1.1/Wed Apr 18 14:24:17 2001//Txdvik_22_40_STABLE -/testfont.ps/1.1.1.1/Wed Apr 18 14:24:18 2001//Txdvik_22_40_STABLE /unbackslsh.awk/1.1.1.1/Wed Apr 18 14:24:18 2001//Txdvik_22_40_STABLE /withenable.ac/1.1.1.1.8.1/Sun Sep 15 15:14:13 2002//Txdvik_22_40_STABLE D/contrib//// diff -Naur xdvik-22.40n/texk/configure xdvik-22.40o/texk/configure --- xdvik-22.40n/texk/configure Sun May 20 21:25:01 2001 +++ xdvik-22.40o/texk/configure Wed Oct 16 22:26:21 2002 @@ -12,40 +12,6 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --without-dtl do not build the dtl package" -ac_help="$ac_help - --without-dvidvi do not build the dvidvi package" -ac_help="$ac_help - --without-dviljk do not build the dviljk package" -ac_help="$ac_help - --without-dvipdfm do not build the dvipdfm package" -ac_help="$ac_help - --without-dvipsk do not build the dvipsk package" -ac_help="$ac_help - --without-gsftopk do not build the gsftopk package" -ac_help="$ac_help - --without-lacheck do not build the lacheck package" -ac_help="$ac_help - --without-makeindexk do not build the makeindexk package" -ac_help="$ac_help - --without-musixflx do not build the musixflx package" -ac_help="$ac_help - --without-odvipsk do not build the odvipsk package" -ac_help="$ac_help - --without-oxdvik do not build the oxdvik package" -ac_help="$ac_help - --without-ps2pkm do not build the ps2pkm package" -ac_help="$ac_help - --without-seetexk do not build the seetexk package" -ac_help="$ac_help - --without-tetex do not build the tetex package" -ac_help="$ac_help - --without-tex4htk do not build the tex4htk package" -ac_help="$ac_help - --without-tth do not build the tth package" -ac_help="$ac_help - --without-xdvik do not build the xdvik package" -ac_help="$ac_help --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer" ac_help="$ac_help @@ -59,6 +25,10 @@ ac_help="$ac_help --without-mkofm-default do not run mkofm if OFM file missing" ac_help="$ac_help + --with-mktexfmt-default run mktexfmt if format file missing" +ac_help="$ac_help + --with-mktextex-default run mktextex if TeX source missing" +ac_help="$ac_help --enable-multiplatform put executables in bin/PLATFORM" ac_help="$ac_help --with-ps=PS use PostScript; default gs (PS=no/yes/gs/dps/news)" @@ -74,9 +44,7 @@ ac_help="$ac_help --enable-gf enable gf format pixel files (in addition to pk)" ac_help="$ac_help - --enable-a4 set default paper size to A4 and default unit to cm" -ac_help="$ac_help - --disable-libwww don't use libwww (incompatible with K&R C), disables hypertex" + --disable-a4 set default paper size to letter and default unit to inch" ac_help="$ac_help --with-system-wwwlib check for installed libwww library" ac_help="$ac_help @@ -87,6 +55,9 @@ ac_help="$ac_help --with-libwww-include=DIR Specify the libwww header files location." +ac_help="$ac_help + --with-libwww-config=PROG + Use PROG as libwww-config program." # Initialize some variables set by options. # The variables have the same names as the options, with @@ -601,7 +572,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:605: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:576: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -631,7 +602,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:635: checking for $ac_word" >&5 +echo "configure:606: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -662,7 +633,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:666: checking for $ac_word" >&5 +echo "configure:637: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -714,7 +685,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:718: checking for $ac_word" >&5 +echo "configure:689: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -747,7 +718,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:751: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:722: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -758,12 +729,12 @@ cat > conftest.$ac_ext << EOF -#line 762 "configure" +#line 733 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -789,12 +760,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:793: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:798: checking whether we are using GNU C" >&5 +echo "configure:769: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -803,7 +774,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -822,7 +793,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:826: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:797: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -854,7 +825,7 @@ fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:858: checking for POSIXized ISC" >&5 +echo "configure:829: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -875,7 +846,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:879: checking whether ln -s works" >&5 +echo "configure:850: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -903,7 +874,7 @@ # Extract the first word of "tex", so it can be a program name with args. set dummy tex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:907: checking for $ac_word" >&5 +echo "configure:878: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -979,7 +950,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:983: checking for a BSD compatible install" >&5 +echo "configure:954: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1036,112 +1007,11 @@ -# Check whether --with-dtl or --without-dtl was given. -if test "${with_dtl+set}" = set; then - withval="$with_dtl" - : -fi - -# Check whether --with-dvidvi or --without-dvidvi was given. -if test "${with_dvidvi+set}" = set; then - withval="$with_dvidvi" - : -fi - -# Check whether --with-dviljk or --without-dviljk was given. -if test "${with_dviljk+set}" = set; then - withval="$with_dviljk" - : -fi - -# Check whether --with-dvipdfm or --without-dvipdfm was given. -if test "${with_dvipdfm+set}" = set; then - withval="$with_dvipdfm" - : -fi - -# Check whether --with-dvipsk or --without-dvipsk was given. -if test "${with_dvipsk+set}" = set; then - withval="$with_dvipsk" - : -fi - -# Check whether --with-gsftopk or --without-gsftopk was given. -if test "${with_gsftopk+set}" = set; then - withval="$with_gsftopk" - : -fi - -# Check whether --with-lacheck or --without-lacheck was given. -if test "${with_lacheck+set}" = set; then - withval="$with_lacheck" - : -fi - -# Check whether --with-makeindexk or --without-makeindexk was given. -if test "${with_makeindexk+set}" = set; then - withval="$with_makeindexk" - : -fi - -# Check whether --with-musixflx or --without-musixflx was given. -if test "${with_musixflx+set}" = set; then - withval="$with_musixflx" - : -fi - -# Check whether --with-odvipsk or --without-odvipsk was given. -if test "${with_odvipsk+set}" = set; then - withval="$with_odvipsk" - : -fi - -# Check whether --with-oxdvik or --without-oxdvik was given. -if test "${with_oxdvik+set}" = set; then - withval="$with_oxdvik" - : -fi - -# Check whether --with-ps2pkm or --without-ps2pkm was given. -if test "${with_ps2pkm+set}" = set; then - withval="$with_ps2pkm" - : -fi - -# Check whether --with-seetexk or --without-seetexk was given. -if test "${with_seetexk+set}" = set; then - withval="$with_seetexk" - : -fi - -# Check whether --with-tetex or --without-tetex was given. -if test "${with_tetex+set}" = set; then - withval="$with_tetex" - : -fi - -# Check whether --with-tex4htk or --without-tex4htk was given. -if test "${with_tex4htk+set}" = set; then - withval="$with_tex4htk" - : -fi - -# Check whether --with-tth or --without-tth was given. -if test "${with_tth+set}" = set; then - withval="$with_tth" - : -fi - -# Check whether --with-xdvik or --without-xdvik was given. -if test "${with_xdvik+set}" = set; then - withval="$with_xdvik" - : -fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1145: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1015: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1160,7 +1030,7 @@ echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6 -echo "configure:1164: checking for loader (symbol LD)" >&5 +echo "configure:1034: checking for loader (symbol LD)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1174,7 +1044,7 @@ echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6 -echo "configure:1178: checking for archiver (symbol AR)" >&5 +echo "configure:1048: checking for archiver (symbol AR)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1187,18 +1057,18 @@ echo "$ac_t""$AR" 1>&6 -echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 -echo "configure:1192: checking for archiver options (symbol AR_OPTS)" >&5 -if eval "test \"`echo '$''{'cf_cv_subst_AR_OPTS'+set}'`\" = set"; then +echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6 +echo "configure:1062: checking for archiver options (symbol ARFLAGS)" >&5 +if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -test -z "$AR_OPTS" && AR_OPTS=rc -cf_cv_subst_AR_OPTS=$AR_OPTS +test -z "$ARFLAGS" && ARFLAGS=rc +cf_cv_subst_ARFLAGS=$ARFLAGS fi -AR_OPTS=${cf_cv_subst_AR_OPTS} -echo "$ac_t""$AR_OPTS" 1>&6 +ARFLAGS=${cf_cv_subst_ARFLAGS} +echo "$ac_t""$ARFLAGS" 1>&6 @@ -1207,80 +1077,64 @@ withval="$with_mktexmf_default" : else - withval=yes + with_mktexmf_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_MF_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktexpk-default or --without-mktexpk-default was given. if test "${with_mktexpk_default+set}" = set; then withval="$with_mktexpk_default" : else - withval=yes + with_mktexpk_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_PK_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktextfm-default or --without-mktextfm-default was given. if test "${with_mktextfm_default+set}" = set; then withval="$with_mktextfm_default" : else - withval=yes + with_mktextfm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_TFM_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkocp-default or --without-mkocp-default was given. if test "${with_mkocp_default+set}" = set; then withval="$with_mkocp_default" : else - withval=yes + with_mkocp_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OCP_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkofm-default or --without-mkofm-default was given. if test "${with_mkofm_default+set}" = set; then withval="$with_mkofm_default" : else - withval=yes + with_mkofm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OFM_BY_DEFAULT 1 -EOF +# Check whether --with-mktexfmt-default or --without-mktexfmt-default was given. +if test "${with_mktexfmt_default+set}" = set; then + withval="$with_mktexfmt_default" + : +fi +# Check whether --with-mktextex-default or --without-mktextex-default was given. +if test "${with_mktextex_default+set}" = set; then + withval="$with_mktextex_default" + with_mktextex_default=yes +else + with_mktextex_default=no fi + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1284: checking host system type" >&5 +echo "configure:1138: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1312,7 +1166,7 @@ echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 -echo "configure:1316: checking where the main texmf tree is located" >&5 +echo "configure:1170: checking where the main texmf tree is located" >&5 texmfmain= if test "x$datadir" != 'x${prefix}/share'; then # First case, datadir is defined... @@ -1346,6 +1200,13 @@ if test -n "$texmfmain"; then echo "$ac_t"""$texmfmain"" 1>&6 else + ### SU: added using `kpsewhich' as last fallback before giving up; since + ### xdvik is most likely to be installed with an *existing* kpathsearch + ### system, this seemed reasonable to me. + texmfmain=`kpsewhich --expand-path='$TEXMFMAIN' 2>/dev/null | sed 's,//*,/,g'` + if test -d "$texmfmain"; then + echo "$ac_t"""$texmfmain"" 1>&6 + else eval texmfmain="$datadir/texmf" echo "$ac_t""not found" 1>&6 echo "configure: warning: The main texmf tree was not found. @@ -1355,6 +1216,7 @@ in systems/web2c. Winging it by using the default location $texmfmain." 1>&2 fi + fi fi @@ -1378,11 +1240,8 @@ # Check whether --enable-grey or --disable-grey was given. if test "${enable_grey+set}" = set; then enableval="$enable_grey" - if test "$enableval" = yes; then - cat >> confdefs.h <<\EOF -#define GREY 1 -EOF - + if test "$enableval" = no; then + echo DISABLED grey fi else cat >> confdefs.h <<\EOF @@ -1395,11 +1254,8 @@ # Check whether --enable-buttons or --disable-buttons was given. if test "${enable_buttons+set}" = set; then enableval="$enable_buttons" - if test "$enableval" = yes; then - cat >> confdefs.h <<\EOF -#define BUTTONS 1 -EOF - + if test "$enableval" = no; then + echo DISABLED buttons fi else cat >> confdefs.h <<\EOF @@ -1412,11 +1268,8 @@ # Check whether --enable-statusline or --disable-statusline was given. if test "${enable_statusline+set}" = set; then enableval="$enable_statusline" - if test "$enableval" = yes; then - cat >> confdefs.h <<\EOF -#define STATUSLINE 1 -EOF - + if test "$enableval" = no; then + echo DISABLED statusline fi else cat >> confdefs.h <<\EOF @@ -1429,23 +1282,14 @@ # Check whether --enable-t1lib or --disable-t1lib was given. if test "${enable_t1lib+set}" = set; then enableval="$enable_t1lib" - if test "$enableval" = yes; then + if test "$enableval" = no; then T1LIB= LDT1LIB= - echo t1lib disabled - cat >> confdefs.h <<\EOF -#define T1LIB 1 -EOF - - cat >> confdefs.h <<\EOF -#define LDT1LIB 1 -EOF - + echo DISABLED t1lib fi else T1LIB=1 LDT1LIB=../../libs/t1lib/lib/.libs/libt1.a -echo t1lib enabled cat >> confdefs.h <<\EOF #define LDT1LIB 1 EOF @@ -1474,42 +1318,30 @@ # Check whether --enable-a4 or --disable-a4 was given. if test "${enable_a4+set}" = set; then enableval="$enable_a4" - if test "$enableval" != no; then + if test "$enableval" = no; then + echo DISABLED a4/cm, using letter/in instead +fi +else cat >> confdefs.h <<\EOF #define A4 1 EOF fi -fi -# Check whether --enable-libwww or --disable-libwww was given. -if test "${enable_libwww+set}" = set; then - enableval="$enable_libwww" - if test "$enableval" = yes; then - HTEX= - echo libwww disabled - cat >> confdefs.h <<\EOF -#define HTEX 1 -EOF -fi -else - HTEX=1 -echo libwww enabled +HTEX=1 cat >> confdefs.h <<\EOF #define HTEX 1 EOF -fi - # Extract the first word of "pwd", so it can be a program name with args. set dummy pwd; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1513: checking for $ac_word" >&5 +echo "configure:1345: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BINPWD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1622,6 +1454,17 @@ fi +# Check whether --with-libwww-config or --without-libwww-config was given. +if test "${with_libwww_config+set}" = set; then + withval="$with_libwww_config" + + libwww_config=$with_libwww_config + try_system_wwwlib=yes + + +fi + + if test "x$with_omega" = xno; then with_odvipsk=no @@ -1802,7 +1645,7 @@ s%@MAINT@%$MAINT%g s%@LD@%$LD%g s%@AR@%$AR%g -s%@AR_OPTS@%$AR_OPTS%g +s%@ARFLAGS@%$ARFLAGS%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g diff -Naur xdvik-22.40n/texk/kpathsea/AUTHORS xdvik-22.40o/texk/kpathsea/AUTHORS --- xdvik-22.40n/texk/kpathsea/AUTHORS Wed Apr 18 14:24:24 2001 +++ xdvik-22.40o/texk/kpathsea/AUTHORS Wed Oct 16 22:26:21 2002 @@ -1,10 +1,11 @@ Karl Berry wrote all files not otherwise marked, with help from Kathryn Hargreaves on some of the original versions. -Thomas Esser originated most of the MakeTeX... scripts. +Thomas Esser originated most of the MakeTeX... scripts. Subsequent changes +were made by Olaf Weber and Thomas Esser. -The brace expansion code in expand.c was written by Brian Fox and Chet -Ramey for Bash, the GNU shell. +The brace expansion code in expand.c was written by Olaf Weber, replacing +the original code borrowed from bash. The implementation of the link trick in pathsearch.c is taken from GNU find, implemented by David MacKenzie from Matthew Farwell's suggestion. diff -Naur xdvik-22.40n/texk/kpathsea/CVS/Entries xdvik-22.40o/texk/kpathsea/CVS/Entries --- xdvik-22.40n/texk/kpathsea/CVS/Entries Mon Sep 16 17:45:03 2002 +++ xdvik-22.40o/texk/kpathsea/CVS/Entries Wed Oct 16 23:44:48 2002 @@ -1,159 +1,161 @@ -/AUTHORS/1.1.1.1/Wed Apr 18 14:24:24 2001//Txdvik_22_40_STABLE +/AUTHORS/1.1.1.1.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE /BUGS/1.1.1.1/Wed Apr 18 14:24:25 2001//Txdvik_22_40_STABLE -/ChangeLog/1.1.1.1/Wed Apr 18 14:24:26 2001//Txdvik_22_40_STABLE +/ChangeLog/1.1.1.1.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE /HIER/1.1.1.1/Wed Apr 18 14:24:26 2001//Txdvik_22_40_STABLE -/INSTALL/1.1.1.1/Wed Apr 18 14:24:26 2001//Txdvik_22_40_STABLE +/INSTALL/1.1.1.1.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE /Makefile.flc/1.1.1.1/Wed Apr 18 14:24:26 2001//Txdvik_22_40_STABLE -/Makefile.in/1.1.1.1/Wed Apr 18 14:24:26 2001//Txdvik_22_40_STABLE -/NEWS/1.1.1.1/Wed Apr 18 14:24:26 2001//Txdvik_22_40_STABLE +/Makefile.in/1.1.1.1.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE +/NEWS/1.1.1.1.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE /PROJECTS/1.1.1.1/Wed Apr 18 14:24:26 2001//Txdvik_22_40_STABLE /README/1.1.1.1/Wed Apr 18 14:24:26 2001//Txdvik_22_40_STABLE /README.CONFIGURE/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE -/absolute.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/absolute.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/access.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE +/absolute.c/1.2.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE +/absolute.h/1.2.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE +/access.c/1.2.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE /access.man/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE -/acconfig.h/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE +/acconfig.h/1.1.1.1.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE /atou.c/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE /bugs.texi/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE -/c-auto.in/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE -/c-ctype.h/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE +/c-auto.in/1.1.1.1.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE +/c-ctype.h/1.1.1.1.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE /c-dir.h/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE /c-errno.h/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE -/c-fopen.h/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE -/c-limits.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/c-memstr.h/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE -/c-minmax.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/c-namemx.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/c-pathch.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/c-pathmx.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/c-proto.h/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE -/c-stat.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/c-std.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/c-unistd.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE +/c-fopen.h/1.1.1.1.8.1/Wed Oct 16 22:26:21 2002//Txdvik_22_40_STABLE +/c-limits.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/c-memstr.h/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/c-minmax.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/c-namemx.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/c-pathch.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/c-pathmx.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/c-proto.h/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/c-stat.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/c-std.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/c-unistd.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /c-vararg.h/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE -/cnf.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/cnf.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/common.ac/1.1.1.1/Wed Apr 18 14:24:27 2001//Txdvik_22_40_STABLE -/concat.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/concat3.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/concatn.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/concatn.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/config.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/configure/1.1.1.1/Wed Apr 18 14:24:28 2001//Txdvik_22_40_STABLE -/configure.in/1.1.1.1/Wed Apr 18 14:24:28 2001//Txdvik_22_40_STABLE -/db.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/db.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/debug.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/debug.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/default.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/depend.mk/1.1.1.1/Wed Apr 18 14:24:29 2001//Txdvik_22_40_STABLE -/dir.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/elt-dirs.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/expand.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/expand.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/extend-fname.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/file-p.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/find-suffix.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/fn.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/fn.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/fontmap.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/fontmap.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/getopt.c/1.1.1.1/Wed Apr 18 14:24:29 2001//Txdvik_22_40_STABLE -/getopt.h/1.1.1.1/Wed Apr 18 14:24:29 2001//Txdvik_22_40_STABLE +/cnf.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/cnf.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/common.ac/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/concat.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/concat3.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/concatn.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/concatn.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/config.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/configure/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/configure.in/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/db.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/db.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/debug.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/debug.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/default.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/depend.mk/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/dir.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/elt-dirs.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/expand.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/expand.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/extend-fname.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/file-p.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/find-suffix.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/fn.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/fn.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/fontmap.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/fontmap.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/getopt.c/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/getopt.h/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /getopt1.c/1.1.1.1/Wed Apr 18 14:24:29 2001//Txdvik_22_40_STABLE -/hash.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/hash.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE +/hash.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/hash.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /hier.texi/1.1.1.1/Wed Apr 18 14:24:29 2001//Txdvik_22_40_STABLE -/install.texi/1.1.1.1/Wed Apr 18 14:24:30 2001//Txdvik_22_40_STABLE -/kdefault.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/kpathsea.cps/1.1.1.1/Wed Apr 18 14:24:30 2001//Txdvik_22_40_STABLE -/kpathsea.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/kpathsea.info/1.4/Sat May 19 11:20:13 2001//Txdvik_22_40_STABLE -/kpathsea.texi/1.1.1.1/Wed Apr 18 14:24:32 2001//Txdvik_22_40_STABLE -/kpathsea.version/1.1.1.1/Wed Apr 18 14:24:32 2001//Txdvik_22_40_STABLE -/kpsestat.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/kpsestat.man/1.1.1.1/Wed Apr 18 14:24:32 2001//Txdvik_22_40_STABLE -/kpsewhich.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/kpsewhich.man/1.1.1.1/Wed Apr 18 14:24:32 2001//Txdvik_22_40_STABLE -/lib.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/line.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/line.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/magstep.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/magstep.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/make-suffix.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE +/install.texi/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/kdefault.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/kpathsea.cps/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/kpathsea.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/kpathsea.info/1.4.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/kpathsea.texi/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/kpathsea.version/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/kpsestat.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/kpsestat.man/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/kpsewhich.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/kpsewhich.man/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/lib.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/line.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/line.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/magstep.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/magstep.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/make-suffix.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /mktex.cnf/1.1.1.1/Wed Apr 18 14:24:32 2001//Txdvik_22_40_STABLE -/mktex.opt/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/mktexdir/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/mktexdir.opt/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/mktexlsr/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE +/mktex.opt/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/mktexdir/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/mktexdir.opt/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/mktexlsr/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /mktexlsr.man/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/mktexmf/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE +/mktexmf/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /mktexmf.man/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/mktexnam/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/mktexnam.opt/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/mktexpk/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE +/mktexnam/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/mktexnam.opt/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/mktexpk/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /mktexpk.man/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/mktextfm/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/mktextfm.man/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/mktexupd/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/path-elt.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/pathsearch.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/pathsearch.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/proginit.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/proginit.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/progname.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/progname.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE +/mktextfm/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/mktextfm.man/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/mktexupd/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/path-elt.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/pathsearch.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/pathsearch.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/proginit.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/proginit.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/progname.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/progname.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /putenv.c/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/readable.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/readable.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/readlink.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE +/readable.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/readable.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/readlink.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /readlink.man/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE -/rm-suffix.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/stamp-auto.in/1.2/Sun May 20 22:19:03 2001//Txdvik_22_40_STABLE -/str-list.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/str-list.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/str-llist.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/str-llist.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE +/rm-suffix.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/stamp-auto.in/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/str-list.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/str-list.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/str-llist.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/str-llist.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /strcasecmp.c/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE /strstr.c/1.1.1.1/Wed Apr 18 14:24:33 2001//Txdvik_22_40_STABLE /strtol.c/1.1.1.1/Wed Apr 18 14:24:34 2001//Txdvik_22_40_STABLE /systypes.h/1.1.1.1/Wed Apr 18 14:24:34 2001//Txdvik_22_40_STABLE -/tex-file.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/tex-file.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/tex-glyph.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/tex-glyph.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/tex-hush.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/tex-hush.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/tex-make.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/tex-make.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/texmf.in/1.1.1.1/Wed Apr 18 14:24:36 2001//Txdvik_22_40_STABLE -/tilde.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/tilde.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/truncate.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/truncate.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/types.h/1.1.1.1/Wed Apr 18 14:24:36 2001//Txdvik_22_40_STABLE -/unixtex.texi/1.1.1.1/Wed Apr 18 14:24:37 2001//Txdvik_22_40_STABLE -/uppercasify.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/variable.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/variable.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/version.c/1.1.1.1/Wed Apr 18 14:24:37 2001//Txdvik_22_40_STABLE +/tex-file.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/tex-file.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/tex-glyph.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/tex-glyph.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/tex-hush.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/tex-hush.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/tex-make.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/tex-make.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/texmf.in/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/tilde.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/tilde.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/truncate.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/truncate.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/types.h/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/unixtex.ftp/1.1.2.1/Wed Oct 16 22:29:09 2002//Txdvik_22_40_STABLE +/unixtex.texi/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/uppercasify.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/variable.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/variable.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/version.c/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /win32lib.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE /win32lib.h/1.1.1.1/Wed Apr 18 14:24:37 2001//Txdvik_22_40_STABLE -/withenable.ac/1.1.1.1/Wed Apr 18 14:24:37 2001//Txdvik_22_40_STABLE -/xbasename.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xcalloc.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xfopen.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xfseek.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xftell.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xgetcwd.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xmalloc.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xopendir.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xopendir.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xputenv.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xrealloc.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xstat.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xstat.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/xstrdup.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE +/withenable.ac/1.1.1.1.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xbasename.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xcalloc.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xdirname.c/1.1.2.1/Wed Oct 16 22:29:09 2002//Txdvik_22_40_STABLE +/xfopen.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xfseek.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xftell.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xgetcwd.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xmalloc.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xopendir.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xopendir.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xputenv.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xrealloc.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xstat.c/1.2.8.2/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xstat.h/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE +/xstrdup.c/1.2.8.1/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /xt.ac/1.1.1.1.8.3/Mon Mar 4 20:03:40 2002//Txdvik_22_40_STABLE D diff -Naur xdvik-22.40n/texk/kpathsea/ChangeLog xdvik-22.40o/texk/kpathsea/ChangeLog --- xdvik-22.40n/texk/kpathsea/ChangeLog Wed Apr 18 14:24:26 2001 +++ xdvik-22.40o/texk/kpathsea/ChangeLog Wed Oct 16 22:26:21 2002 @@ -1,8 +1,772 @@ +2002-10-11 Olaf Weber + + * kpathsea.texi: Update date/version to 3.3.8. + + * NEWS: Update for 3.3.8. + + * configure.in: Version 3.3.8. + + * kpathsea.version: Version 3.3.8. + + * Makefile.in: Remove install rules for mktexfmt, as it is not a + separate file. + +2002-10-06 Olaf Weber + + * texmf.in: Expand main_memory (again). + + * xstat.c: Remove lstat() declaration. + + * variable.c (kpse_var_value): Check for NAME.progname in the + environment before checking for NAME_progname. Both can occur, + even on UNIX systems. + + * tex-file.c (init_path): We need to check PATH.progname, + PATH_programe, and PATH in the environment. PATH.progname is the + "logical" way to set the name on Windows systems, and can even + occur on UNIX systems if env(1) is used to set the environment + variables. + + * withenable.ac: Add --with-mktexfmt-default option. After + Fabrice Popineau. He used --with-mkfmt-default, but this was + changed to match the other options. + + * texmf.in: Add XDVIINPUTS, TEXINPUTS.pdfamstex. Modiy definition + of TEXMFLOCAL to match Thomas', add MKTEXFMT. All part of the + TeXlive merge. + + * tex-make.c (kpse_make_tex): Complain if a number of problematic + characters are found in the requested font name -- this works in + combination with a check in maketex() to prevent misuse of the + system() call that starts the mktex* scripts. + + * tex-file.c (kpse_init_format): Support for mktexfmt, from + Fabrice Popineau. + + * mktexupd: Delete CR characters at the end-of-line before doing + the compare. Yet another hack for windows/unix cross-platform + support. + + * mktextfm: TeXlive merge: support for mf-nowin. + + * mktexpk: TeXlive merge: considerably reorganized to support use + of mf-nowin. + + * mktexnam: Additional definitions for the LH fonts. TeXlive + merge. + + * mktexmf: Additional definitions for the LH fonts. TeXlive + merge. + + * common.ac: Add support for MAKE_TEX_FMT. From Fabrice Popineau. + + * acconfig.h [MAKE_TEX_FMT_BY_DEFAULT] Added. After Fabrice + Popineau. + +2002-07-16 Olaf Weber + + * kpsewhich.c (find_format): Remove special case for pdftex.cfg. + Not needed. + + * kpsewhich.c (find_format): Hard-code format types for pdftex.cnf + and pdftex.map. + +2002-07-08 Olaf Weber + + * mktex.opt: Limit permissions on $TEMPDIR. + + * mktexlsr: Limit permissions on tmp directory. + +2002-06-04 Olaf Weber + + * texmf.in: Remove setting of src_specials: it will be ignored + anyway as we'll only allow it to be set from the command line. + +2002-05-28 Olaf Weber + + * mktexdir: Guard $KPSE_DOT with quotes. From Emmanuel_Thomé + . + +2002-04-01 Olaf Weber + + * mktexlsr: Strip a trailing CR before testing the first line of + an ls-R file. Needed for interoperability with Windows (sigh). + + * tex-make.c (maketex): Use a literal "r" in the popen command, as + (under UNIX) it tends not to understand "rb", and we're generating + text anyway. + +2001-11-27 Olaf Weber + + * kpathsea.texi: Version 3.3.7. + + * configure.in: Version 3.3.7. + +2001-11-25 Olaf Weber + + * types.h: Define boolean as int whenever we can. This makes the + option-handling code correct (where pointer to int and pointer to + boolean need to be the same type). + + * install.texi: Update totals to (hopefully) more accurate values. + +2001-11-19 Olaf Weber + + * line.c (read_line): Add prototype. + +2001-11-18 Olaf Weber + + * kpathsea.version: Version 3.3.6. + + * kpathsea.texi: Version 3.3.6. + + * configure.in: Version 3.3.6. + + * xgetcwd.c: Changes to keep C++ compilers from choking. + + * xdirname.c: Changes to keep C++ compilers from choking. + + * variable.c: Changes to keep C++ compilers from choking. + + * str-list.c: Changes to keep C++ compilers from choking. + + * readable.c: Add pathsearch.h to included headers, for + kpse_normalize_path. + + * pathsearch.c: Changes to keep C++ compilers from choking. + + * path-elt.c: Changes to keep C++ compilers from choking. + + * make-suffix.c: Changes to keep C++ compilers from choking. + + * line.c: Changes to keep C++ compilers from choking. + + * kpsewhich.c: Changes to keep C++ compilers from choking. + + * kdefault.c: Changes to keep C++ compilers from choking. + + * fontmap.c: Changes to keep C++ compilers from choking. + + * fn.h (fn_grow): Second argument is a const_string, not a generic + address. + + * fn.c (fn_grow): Second argument is a const_string, not generic + address. + + * expand.c: Add a few casts to ensure a C++ compiler wouldn't + choke. + + * dir.c (dir_links): Replace a conditional expression with an + if-then version. + + * db.c: Add a few casts, rename 'try', all to ensure a C++ + compiler wouldn't choke. + + * cnf.c: Add a few casts, rename 'try', all to ensure a C++ + compiler wouldn't choke. + + * c-proto.h: Addtional P*H and P*C macros for functions with up to + 17 arguments. + +2001-11-14 Olaf Weber + + * readlink.c (main): Add prototype. + + * kpsewhich.c (main): Add prototype. + + * kpsestat.c (main): Add protype. + + * c-pathch.h [WIN32] (IS_UNC_NAME): An unc name can be // + as well as //. + + * access.c (main): Prototype. + +2001-11-10 Olaf Weber + + * kpathsea.version: Version 3.3.5. + + * kpathsea.texi: Version, date. + + * configure.in: Version 3.3.5. + + * texmf.in: Additional entries for mex-pl, platex-pl, pdfplatex, + pdfmex-pl, pdfemex, pdfemex-pl. As usual, ConTeXt wants more + space. + + * mktexnam: First set defaults, then modify for explicit + destination, not the reverse. From Thomas. + + * mktex.opt: Preserve return code over trap. From Thomas. + + * kpsewhich.man: Typo. + +2001-10-30 Olaf Weber + + * configure.in: To 3.3.4. + + * kpathsea.version: To 3.3.4. + + * mktexnam.opt: Robustness fix for handling of NAME. Minor + changes in the handling of the defaults when a name isn't found in + the supplier or typeface maps. + + * tex-file.c: Add ".ch" as alternate suffix for kpse_web_format + and kpse_cweb_format. + + * readable.c [main]: Call kpse_normalize_path. + + * progname.c [WIN32]: Update from Fabrice. + + * pathsearch.h [WIN32]: Remove prototype for safe_beg_of_path. + Add prototype for kpse_normalize_path. + + * pathsearch.c (path_search) [WIN32]: Remove call to + safe_beg_of_path. + (path_search): Add call to kpse_normalize_path. + + * expand.c (kpse_path_expand): Don't strip devices and such here, + as we're doing that in kpse_element_dirs anyway. + + * elt-dirs.c [WIN32]: Remove safe_beg_of_path. + (kpse_normalize_path): Replaces safe_beg_of_path, but is defined on + all architectures. + + * dir.c [WIN32]: Remove safe_beg_of_path prototype here. + + * common.ac: Test whether libm exists. If it does, we + unconditionally link with it, which is probably wrong. + + * cnf.c [__NetBSD__]: Define unix. + + * c-pathch.h [IS_UNC_NAME]: Define on all architectures. + + * Makefile.in (distdir): Add *.ftp to destination directory. + +2001-09-26 Olaf Weber + + * texmf.in: Add support for Web and Cweb files (kpse_web_format, + kpse_cweb_format). Requested by Wlodek Bzyl. + + * tex-file.h, tex-file.c: Add support for Web and Cweb files + (kpse_web_format, kpse_cweb_format). Requested by Wlodek Bzyl. + +2001-07-23 Olaf Weber + + * common.ac [kb_cv_func_putenv_malloc]: Add declaration for + malloc, which testing on IA64 revealed to be missing. + +2000-08-25 Olaf Weber + + * mktexlsr: Changed the fix for NeXT. + +2000-08-05 Olaf Weber + + * kpathsea.texi: Bump version, date. + + * kpathsea.version: Bump version. + + * configure.in: Update for 3.3.3. + + * NEWS: Update for 3.3.3. + + * mktexlsr: On NeXT, 'rm -rf ' will recursively remove the current + directory. This is bad if you're in / and are root. + +2000-05-25 Olaf Weber + + * lib.h [MONOCASE_FILENAMES]: Parenthesis was omitted in + FILESTRNCASEEQ. Found by Fabrice. + +2000-04-26 Olaf Weber + + * unixtex.texi: Added notes that web2c is bare-bones, and that the + texk/texklib packages may contain older components. + +2000-04-21 Olaf Weber + + * progname.c: Add P?C macros to functions that lacked them. + + * lib.h [STREQ,STRNEQ,FILESTRCASEEQ,FILESTRNCASEEQ]: If any + argument is NULL, compare unequal. + +2000-04-13 Olaf Weber + + * tex-hush.c (kpse_tex_hush): Check for "all" and "none" first, + then look for more specific switches. This fixes the most common + case of problems due to non-reentrancy of kpse_path_element. + + * kpathsea.texi: Correct example of brace expansion. Document + TEX_HUSH = none. Found by Tijs Michels . + + * texmf.in: Document the use of TEX_HUSH = none. + +2000-04-03 Olaf Weber + + * texmf.in: Add variable for src_specials. Increase arrays for + context (again). + + * xopendir.c [WIN32]: Only define xclosedir. + + * kpsewhich.man: Spelling correction. + + * getopt.h [WIN32]: For definition of __STDC__ to 1. + +2000-04-02 Olaf Weber + + * xopendir.c [WIN32]: Define neither xopendir nor xclosedir. From + Han The Thanh . + + * xputenv.c (xputenv): The WIN32 conditional code is also valid + for DJGPP. From Fabrice. + + * xmalloc.c (xmalloc): Allocate 1 byte if passed size 0. + + * xdirname.c (xdirname): Changes for Win32 from Fabrice. + + * tex-file.h: Prototype for kpse_set_suffixes. From Fabrice. + + * tex-file.c (kpse_set_suffixes): New function, added by Fabrice. + + * readable.c: Win32-related changes from Fabrice. + + * progname.c [WIN32]: Various changes from Fabrice. + + * pathsearch.h [WIN32]: Declare safe_beg_of_path. From Fabrice. + + * pathsearch.c (path_search [WIN32]): Use safe_beg_of_path. From + Fabrice. + + * kpsestat.c: Remove WIN32 define. From Fabrice. + + * hash.c [MONOCASE_FILENAMES]: Change for the WIN32 case from + Fabrice. + + * getopt.h [WIN32]: Changes from Fabrice. + + * getopt.c [WIN32 && ! __CYGWIN32__]: Ensure getpid is not defined + before defining it. From Fabrice. + + * lib.h: Update dir_links prototype, from Fabrice. + + * elt-dirs.c: Win32 related changes from Fabrice. + + * dir.c: Various Win32-related changes from Fabrice. + + * config.h: Various changes for the DOS famility of systems. From + Fabrice. + + * c-stat.h [WIN32]: Use oldnames.h instead of kpathsea/win32lib.h. + From Fabrice. + + * c-proto.h [WIN32]: _DLL -> KPSE_DLL, from Fabrice Popineau. + + * c-memstr.h: Move closer to just the ANSI string functions, if + necessary defined in terms of the BSD functions. After Thomas + Esser . + + [FOPEN_RBIN_MODE, FOPEN_WBIN_MODE, FOPEN_ABIN_MODE]: Specify + binary I/O mode on all systems, not just those where it makes a + difference. + [VMCMS]: Remove as it isn't used. + [SET_BINARY]: Change defines which select it. From Fabrice + Popineau. + + * c-ctype.h [WIN32]: On Windows, get isascii from oldnames.h. + After Fabrice Popineau . + + * access.c: Replace WIN32 code with generic code. + +2000-01-31 Olaf Weber + + * mktexlsr: Fix possible symlink exploit. By Thomas Esser + . + +1999-06-28 Olaf Weber + + * mktextfm: Get rid of error message if hbf2gf cannot be found. + From Thomas. + + * tex-glyph.c: Test whether glyph_file is NULL before + dereferencing it. Suggested by Julian Gilbey + . + + * texmf.in: Improved comments about VARTEXMF, along lines + suggested by Thomas Esser. + Increased font_mem_size, as requested by Thomas. + + * pathsearch.c (path_search): Print a message if we're debugging + the search and we're not pounding the disk because an ls-R file + exists but must_exist=0. This to highlight the most confusing + case where disk searches do not happen. + + * mktextfm.man: Cleanup of synopsis. + + * mktex.opt: More robust handling of TEMPDIR, after Luc Van Eycken + . + + * kpsestat.man: Remove comment about unclear message. + + * kpsestat.c (main): Print a more understandable message when the + stat call fails. + +1999-06-20 Olaf Weber + + * pathsearch.c (log_search): If TEXMFLOG is defined, then the + kpathsea library would write a space to stderr for every file + logged. Fix from Charles Karney . + +1999-05-29 Olaf Weber + + * configure.in: Update version number to 3.3.1. + + * kpathsea.version: Update version number to 3.3.1. + + * kpathsea.texi: Update version info. + + * mktexnam, mktexmf: Fix the LH patterns to be more specific. + From Thomas. + + * unixtex.texi: Remove node on tape distributions. + + * texmf.in: Add platex, add comment about TEXMFDBS. + + * tex-file.c (kpse_find_file): Fix off-by-one in tests for suffix + length. + + * pathsearch.c (log_search): Fix problem with debugging output. + + * mktextfm: Order of options to hbf2gf turns out to matter. + + * mktexpk: Updates from Thomas: don't remove generated fonts + because of bad pos errors; better handling of type1 fonts. + + * mktexnam: Updates from Thomas for Czech fonts. Consult fontmaps + if a fonts fell into unknown/unknown. + + * mktexmf: Updates from Thomas for Czech fonts. + + * mktexdir: Small fix from Julian Gilbey. + + * cnf.c: Apple's MacOsX is also unix-like. + + * access.c: Parametrise the help string as in readlink.c. + + * Makefile.in: Use INSTALL_DATA, not INSTALL_SCRIPT, for the *.opt + files. + + * AUTHORS: Update accounts for MakeTeX scripts and expand.c. + + * c-memstr.h: Don't declare strstr if strstr is already a define. + Suggested by Paul Vojta . + + * readlink.c: Corrected a bug in the help string (wrong program + name), reported by several people. + +1999-03-26 Olaf Weber + + * kpathsea.version: Set MINOR to 3. + + * configure.in: Bumped KPSEVERSION to 3.3. + +1999-03-23 Olaf Weber + + * texmf.in: More changes from Thomas, add MISCFONTS for + kpse_miscfonts_format. + + * tex-file.c: Implement kpse_miscfonts_format. + + * tex-file.h: New format: kpse_miscfonts_format, to be used for + small sets of fonts for which no real type has been defined. + + * mktextfm: Add support for hbf fonts. (From Werner Lemberg.) + + * withenable.ac: Remove implementation of some --with-* options. + + * common.ac: Move implementation of some --with-* options here + from withenable.ac, so the latter can be included elsewhere with + kpathsea's acconfig.h or derivatives being seen. + +1999-03-17 Olaf Weber + + * texmf.in: Size increases for context, requested by Hans Hagen. + + * texmf.in: Update from Thomas. + + * Makefile.in: TEXMF_CNF -> VARTEXMF + + * mktexmf: Small fix to a case statement from Berthold Höllmann + . + +1999-03-15 Olaf Weber + + * win32lib.h: Patch from Fabrice. + + * variable.c (kpse_var_value, expand): Handle the VAR_progname + construct. After Julian Gilbey . + + * tex-file.c: Fixes to the code that forces an update of the + paths. After Julian Gilbey . + + * mktexmf: Changes to support CB font family. From Kimon + Kontovasilis . + + * kpathsea.texi: Update address info of TUG. + + * config.h: Remove outdated comment, explicitly include + kpathsea/c-auto.h. + + * cnf.c (do_line): Correct comment, remove unused code. + (read_all_cnf): Strip trailing whitespace. + (kpse_cnf_get): Fix memory leak. + After Julian Gilbey . + + * acconfig.h: We no longer use this for all kpathsea using + programs, just kpathsea itself. Thus the WEB2CVERSION macro goes, + as does other stuff that belongs to web2c or xdvik. + + * Makefile.in: Allow the c-auto.h file to be installed. + +1999-02-18 Olaf Weber + + * mktex.opt: Document nomfdrivers option. + + * mktextfm: Implement nomfdrivers option. + + * mktexpk: Implement nomfdrivers option. + + * install.texi: Document new option: nomfdrivers. + + * kpsewhich.man: Document how search parts are determined. + + * mktexlsr: Really skip empty components. From Thomas. + + * tex-file.c (kpse_reset_program_name): Don't free the old paths, + they may not have been allocated on the heap. + +1999-02-16 Olaf Weber + + * tex-file.c (kpse_reset_program_name): Ensure that when the + program name changes, the various paths will indeed be updated. + +1999-02-14 Olaf Weber + + * mktexupd: Fix test whether argument is a directory name. From + Thomas. + + * mktexlsr: Skip empty components. + + * mktexnam.opt: This file is supposed to be sourced, not executed, + so remove the #!. From Thomas. + + * mktexdir.opt: This file is supposed to be sourced, not executed, + so remove the #!. From Thomas. + + * mktex.opt: This file is supposed to be sourced, not executed, so + remove the #!. From Thomas. + + * config.h: Make sure c-auto.h is included before win32lib.h, + which needs definitions from the former. + +1999-02-06 Olaf Weber + + * win32lib.h: Add pragma warning, for the S_* defines, only define + them if they are not defined already. + + * pathsearch.h (kpse_all_path_search): Add KPSEDLL, from Fabrice. + + * debug.h (fclose): Add KPSEDLL, from Fabrice. + + * config.h [WIN32]: Remove pragma warning. From Fabrice. + +1999-02-04 Olaf Weber + + * withenable.ac: Rename AR_OPTS to ARFLAGS. + + * texmf.in: Cleanup of semicolon/comma. Remove the double slash + between 'fonts' and its subdirs. Sites using pseudo-TDS will have + to add these by hand from now on. + + * tex-file.c (init_path, add_suffixes): Remove __cdecl, from + Fabrice. + + * mktexmf: Special cases for 30 and 36 points, as requested by the + sauter mainainer Jeroen Nijhof . + + * kpsewhich.c (main): Remove __cdecl, from Fabrice. + + * kpsestat.c (main): Remove __cdecl, from Fabrice. + + * install.texi: The +u flag is no longer recommended for HP-UX. + + * getopt.h [!WIN32]: Remove define of __cdecl, from Fabrice. + + * elt-dirs.c (safe_beg_of_path): Change return type to unsigned + int, because other functions expect this. + + * concatn.c (concatn): Remove __cdecl, from Fabrice. + + * common.ac: sinclude from ../texk now, from Thomas. + + * c-proto.h [!WIN32]: Removed define of __cdecl, from Fabrice. + + * access.c (main): Removed __cdecl, from Fabrice. + +1999-01-27 Olaf Weber + + * xputenv.c (xputenv) [WIN32]: Don't free old value, ever. + + * win32lib.h: Fixes by Fabrice. + + * win32lib.c: Fixes by Fabrice. + + * version.c (kpathsea_version_string, kpse_bug_address): Add + KPSEDLL, by Fabrice. + + * variable.h (kpse_var_value, kpse_var_expand): Add KPSEDLL, by + Fabrice. + + * texmf.in: Change path separators back to commas, use semicolon + instead of colon, correct TEXINPUTS for the pdfeTeX family, + TEXPSHEADERS for the pdfTeX family. By Thomas Esser. + + * tex-make.h (kpse_make_tex_discard_errors): Add KPSEDLL, by + Fabrice. + + * tex-make.c (maketex): Add cast to shup up a compiler. From + Fabrice. + + * tex-hush.h (kpse_tex_hush): Add KPSEDLL, by Fabrice. + + * tex-glyph.h (kpse_find_glyph, kpse_bitmap_tolerance): Add + KPSEDLL, by Fabrice. + + * tex-glyph.c (try_resolution): Add casts to quiet a compiler. + From Fabrice. + + * tex-file.h (kpse_fallback_resolutions_string, kpse_format_info, + kpse_set_program_enabled, kpse_maketex_option, kpse_init_format, + kpse_find_file, kpse_open_file, kpse_reset_program_name): Add + KPSEDLL, by Fabrice. + + * tex-file.c (init_path, add_suffixes): Add __cdecl, by Fabrice. + (kpse_init_format): Correct definition of "other ... files" to take + different path separators into account. After Fabrice. + + * str-list.c (str_list_concat_elements): Make loop indices + unsigned to quiet compilers. By Fabrice. + + * readable.h (kpse_readable_file): Add KPSEDLL, by Fabrice. + + * readable.c [WIN32] (kpse_readable_file): Many changes by + Fabrice. + + * progname.h (program_invocation_name, + program_invocation_short_name, kpse_program_name, + kpse_set_program_name, kpse_set_progname): Add KPSEDLL, by + Fabrice. + + * progname.c: Remove my_dirname function, which returns in its own + file renamed to xdirname. From Fabrice. + (kpse_set_program_name) [WIN32]: Close handle. By Fabrice. + + * proginit.h (kpse_init_prog): Add KPSEDLL, by Fabrice. + + * pathsearch.h (kpse_path_element, kpse_element_dirs, + kpse_path_search): Add KPSEDLL, by Fabrice. + + * pathsearch.c (path_search): We now strip devices in the caller. + From Fabrice. + + * magstep.h (kpse_magstep_fix): Add KPSEDLL, by Fabrice. + + * magstep.c (magstep, kpse_magstep_fix): Casts to quiet an unruly + compiler. Added by Fabrice. + + * line.h (read_line): Add KPSEDLL, by Fabrice. + + * lib.h (concat, concat3, xstrdup, uppercasify, atou, same_file_p, + xbasename, find_suffix, remove_suffix, make_suffix, make_prefix, + extend_filename, xputenv, xputenv_int, xgetcwd,dir_p, dir_links, + xfopen, xfclose, xfseek, xftell, xmalloc, xrealloc, xcalloc): Add + KPSEDLL, by Fabrice. + (xdirname): New function, by Fabrice. + + * kpsewhich.c (read_command_line): Add KPSEDLL to external + functions, by Fabrice. + (main): Add __cdecl, by Fabrice. + + * kpsestat.c (main): Add __cdecl, by Fabrice. + + * hash.h (hash_table_type, hash_insert, hash_remove, hash_lookup): + Add KPSEDLL, by Fabrice. + + * hash.c [WIN32]: Different implementation of TRANSFORM, for speed + reasons. From Fabrice. + + * getopt.h: Changes for KPSEDLL, by Fabrice. + + * fn.h (fn_init, fn_copy0, fn_free, fn_1grow, fn_grow, + fn_str_grow, fn_shrink_to): Add KPSEDLL, by Fabrice. + + * expand.h (kpse_expand, kpse_brace_expand, kpse_path_expand): Add + KPSEDLL, by Fabrice. + + * elt-dirs.c (safe_beg_of_path): New function by Fabrice. Used to + strip device from a path before feeding it to expand_elt. + (kpse_element_dirs): Call safe_beg_of_path. + + * debug.h (kpathsea_debug, fopen): Add KPSEDLL, by Fabrice. + + * db.h (kpse_db_insert): Add KPSEDLL, by Fabrice. + + * config.h [WIN32]: Add pragma to quiet some warnings. From + Fabrice. + + * concatn.h (concatn): Add KPSEDLL. From Fabrice. + + * concatn.c (concatn): Add __cdecl. From Fabrice. + + * cnf.h (kpse_cnf_get): Add KPSEDLL. From Fabrice. + + * c-std.h: Don't include math.h if we're seen be a C++ compiler. + From Fabrice. + + * c-proto.h [WIN32]: Instead of defining DllImport, define + KPSEDLL. This change makes building shared libraries on windows + systems work better. From Fabrice. + + * c-pathch.h [WIN32]: IS_UNC_NAME macro added by Fabrice. + + * access.c (main): Add __cdecl, from Fabrice. + + * absolute.h (kpse_absolute_p): Add KPSEDLL, from Fabrice. + + * Makefile.in: Account for the addition of xdirname.c. + +1999-01-24 Olaf Weber + + * texmf.in: Add support for pdfeTeX. + + * mktexpk: Correct typo: ps_topk -> ps_to_pk. + + * mktexnam: New version from Thomas. + + * mktexmf: Update for cs* fonts from Thomas. + + * kpathsea.texi: Update section on brace expansion. Decided to + keep the comma. + + * db.c (kpse_db_insert): Replace basename with xbasename. + +1999-01-19 Olaf Weber + + * kpsestat.c (main): Replace use of S_IFMT with an octal literal. + 1999-01-14 Olaf Weber * texmf.in: Remove open_any, add openout_any, openin_any. - str-list.h: Add prototype for str_list_concat_elements. + * str-list.h: Add prototype for str_list_concat_elements. 1999-01-10 Olaf Weber diff -Naur xdvik-22.40n/texk/kpathsea/INSTALL xdvik-22.40o/texk/kpathsea/INSTALL --- xdvik-22.40n/texk/kpathsea/INSTALL Wed Apr 18 14:24:26 2001 +++ xdvik-22.40o/texk/kpathsea/INSTALL Wed Oct 16 22:26:21 2002 @@ -1,3 +1,31 @@ +Contents: + +Installation + Simple installation + Custom installation + Disk space + Kpathsea application distributions + Changing search paths + Default path features + Default path generation + Running `configure' + `configure' shells + `configure' options + `configure' environment + `configure' scenarios + Shared library + Running `make' + Installing files + Cleaning up + Filename database generation + `mktex' scripts + `mktex' configuration + `mktex' script names + `mktex' script arguments + Installation testing + Security + + Installation ************ @@ -28,14 +56,17 @@ *Note Disk space::. 2. Retrieve these distribution archives: - `ftp://ftp.tug.org/tex/texk.tar.gz' + These are the sources, which you will be compiling. - `ftp://ftp.tug.org/tex/texklib.tar.gz' + This is a basic set of input files. You should unpack it in the directory `/usr/local/share'; doing so will create a `texmf' subdirectory there. + These archives are mirrored on the CTAN hosts, in the + `systems/web2c' directory. + *Note Kpathsea application distributions::. 3. When using the default search paths, there is no need to edit any @@ -46,11 +77,8 @@ Running configure::. 5. `make'. *Note Running make::. If you are using a BSD 4.4 system - such as FreeBSD or NetBSD, use GNU make (often installed in - `/usr/local/bin'), not the BSD make. - - If you are using a HP-UX 10 system and the native compiler, - specify the `+u' flag in `XCFLAGS'. + such as FreeBSD or NetBSD, you may have to use GNU make (often + installed in `/usr/local/bin'), not the BSD make. 6. `make install'. *Note Installing files::. @@ -118,20 +146,20 @@ don't enter into it. Sizes are in megabytes. All numbers are approximate. -Distribution .tar.gz Unpacked Compiled Installed -dviljk .9 3.8 -dvipsk .9 3.2 -xdvik .7 2.5 -web2c 1.3 5.0 -web 1.9 6.5 - - -texk 3.8 14.1 43.1 23.5 -texklib 3.8 15.0 - 15.0 -(totals) 7.6 29.1 43.1 38.5 +Distribution .tar.gz Unpacked Compiled Installed +dviljk .9 3.8 +dvipsk .9 3.2 +xdvik .7 2.5 +web2c 1.3 5.0 +web 1.9 6.5 - - +texk 7.5 32.1 95.3 33.5 +texklib 6.3 15.0 - 15.0 +(totals) 14.6 47.1 95.3 48.5 Kpathsea application distributions ---------------------------------- - The archive `ftp://ftp.tug.org/tex/texk.tar.gz' contains all of the + The archive contains all of the Kpathsea applications I maintain, and the library itself. For example, since NeXT does not generally support X11, you'd probably want to skip `xdvik' (or simply remove it after unpacking `texk.tar.gz'. If you are @@ -169,7 +197,7 @@ friends. *Note mktex configuration::. You do not need to edit `texmf.in' to change the default top-level or -other installation *directories* (only the paths). You can and should +other installation _directories_ (only the paths). You can and should do that when you run `configure' (next step). You also do not need to edit `texmf.in' if you are willing to rely on @@ -256,7 +284,7 @@ Run `sh configure OPTIONS' (in the top-level directory, the one containing `kpathsea/'), possibly using a shell other than `sh' (*note -configure shells::.). +configure shells::). `configure' adapts the source distribution to the present system via `#define''s in `*/c-auto.h', which are created from the corresponding @@ -445,7 +473,7 @@ resolutions. You can also override each of `configure''s environment variables -(*note configure environment::.). The Make variables have the same +(*note configure environment::). The Make variables have the same names. Finally, you can supply additional options via the following @@ -488,7 +516,7 @@ ---------------- The basic command is the usual `make install'. For security issues, -*note Security::.. +*note Security::. The first time you install any manual in the GNU Info system, you should add a line (you choose where) to the file `dir' in your @@ -496,7 +524,7 @@ the Texinfo source files (`kpathsea/kpathsea.texi', `dvipsk/dvips.texi', and `web2c/doc/web2c.texi'). If you have a recent version of the GNU Texinfo distribution installed -(`ftp://prep.ai.mit.edu/pub/gnu/texinfo-3.9.tar.gz' or later), this +( or later), this should happen automatically. On the offchance that this is your first Info installation, the `dir' @@ -522,7 +550,7 @@ make make install prefix=/afs/.SYSTEM.NAME/system/1.3/@sys/whatever With AFS, you will definitely want to use relative filenames in -`ls-R' (*note Filename database::.), not absolute filenames. This is +`ls-R' (*note Filename database::), not absolute filenames. This is done by default, but check anyway. Cleaning up @@ -566,7 +594,7 @@ If Kpathsea cannot otherwise find a file, for some file types it is configured by default to invoke an external program to create it -dynamically (*note mktex configuration::.). This is most useful for +dynamically (*note mktex configuration::). This is most useful for fonts (bitmaps, TFM's, and arbitrarily-sizable Metafont sources such as the Sauter and EC fonts), since any given document can use fonts never before referenced. Trying to build all fonts in advance is therefore @@ -595,7 +623,7 @@ The `configure' setting is overridden if the environment variable or configuration file value named for the script is set; e.g., `MKTEXPK' -(*note mktex script arguments::.). +(*note mktex script arguments::). As distributed, all the scripts source a file `texmf/web2c/mktex.cnf' if it exists, so you can override various defaults. See `mktex.opt', @@ -658,6 +686,11 @@ from the location of the sources, the aliases and directory names from the Fontname distribution are used. (*note Introduction: (fontname)Top.). + +`nomfdrivers' + Let mktexpk and mktextfm create metafont driver files in a + temporary directory. These will be used for just one metafont run + and not installed permanently. `nomode' Omit the directory level for the mode name; this is fine as long as diff -Naur xdvik-22.40n/texk/kpathsea/Makefile.in xdvik-22.40o/texk/kpathsea/Makefile.in --- xdvik-22.40n/texk/kpathsea/Makefile.in Wed Apr 18 14:24:26 2001 +++ xdvik-22.40o/texk/kpathsea/Makefile.in Wed Oct 16 22:26:21 2002 @@ -26,8 +26,8 @@ pathsearch.lo proginit.lo progname.lo readable.lo rm-suffix.lo \ str-list.lo str-llist.lo tex-glyph.lo tex-hush.lo tex-make.lo \ tilde.lo truncate.lo uppercasify.lo variable.lo version.lo xbasename.lo \ -xcalloc.lo xfopen.lo xfseek.lo xftell.lo xgetcwd.lo xmalloc.lo xopendir.lo \ -xputenv.lo xrealloc.lo xstat.lo xstrdup.lo $(liblobjs) $(malloc) +xcalloc.lo xdirname.lo xfopen.lo xfseek.lo xftell.lo xgetcwd.lo xmalloc.lo \ +xopendir.lo xputenv.lo xrealloc.lo xstat.lo xstrdup.lo $(liblobjs) $(malloc) liblobjs = @LTLIBOBJS@ library = kpathsea @@ -85,7 +85,7 @@ # likely to have been mangled as well. echo '/^ *TEXMFMAIN[ =]/s%\$$TEXMF%$(texmf)%' >>$@ echo '/^[% ]*TEXMFLOCAL[ =]/s%\$$TEXMF%$(texmf)%' >>$@ - echo '/^[% ]*TEXMF_CNF[ =]/s%\$$TEXMF%$(texmf)%' >>$@ + echo '/^[% ]*VARTEXMF[ =]/s%\$$TEXMF%$(texmf)%' >>$@ echo '/^[% ]*TEXMFCNF[ =]/s%\$$TEXMF%$(texmf)%' >>$@ # And fill in the last clause of TEXMFCNF with an absolute path. echo '/^ *TEXMFCNF[ =]/s%@web2c@%$(web2cdir)%' >>$@ @@ -170,11 +170,15 @@ || test ! -r $(scriptdir)/mktexlsr; then \ $(INSTALL_SCRIPT) $(srcdir)/mktexlsr $(scriptdir)/mktexlsr; \ else true; fi - $(INSTALL_SCRIPT) $(srcdir)/mktex.opt $(web2cdir)/mktex.opt +# if grep 'original mktexfmt --' $(scriptdir)/mktexfmt > /dev/null 2>&1\ +# || test ! -r $(scriptdir)/mktexfmt; then \ +# $(INSTALL_SCRIPT) $(srcdir)/mktexfmt $(scriptdir)/mktexfmt; \ +# else true; fi + $(INSTALL_DATA) $(srcdir)/mktex.opt $(web2cdir)/mktex.opt $(INSTALL_SCRIPT) $(srcdir)/mktexdir $(web2cdir)/mktexdir - $(INSTALL_SCRIPT) $(srcdir)/mktexdir.opt $(web2cdir)/mktexdir.opt + $(INSTALL_DATA) $(srcdir)/mktexdir.opt $(web2cdir)/mktexdir.opt $(INSTALL_SCRIPT) $(srcdir)/mktexnam $(web2cdir)/mktexnam - $(INSTALL_SCRIPT) $(srcdir)/mktexnam.opt $(web2cdir)/mktexnam.opt + $(INSTALL_DATA) $(srcdir)/mktexnam.opt $(web2cdir)/mktexnam.opt $(INSTALL_SCRIPT) $(srcdir)/mktexupd $(web2cdir)/mktexupd $(INSTALL_LIBTOOL_LIBS) $(libdir) lib$(library).la $(INSTALL_LIBTOOL_PROG) $(bindir) kpsewhich @@ -214,7 +218,7 @@ mkdir -p $(distdir) ln $(ln_files) kpathsea.version $(distdir) touch *.info* - ln mktex* *.info* *.texi $(library).aux $(library).cps $(distdir) + ln mktex* *.info* *.texi *.ftp $(library).aux $(library).cps $(distdir) rm -f $(distdir)/*.1 $(distdir)/*.man ln *.man $(distdir) ln BUGS README.CONFIGURE HIER PROJECTS *.ac $(distdir) @@ -227,7 +231,7 @@ rm -f $@ echo '#include ' >$@ ls -1 *.h \ - | grep -v '\(acconfig\|config\|kpathsea\|win32lib\|c-auto\)\.h' \ + | grep -v '\(acconfig\|config\|kpathsea\|win32lib\)\.h' \ | sed -e 's,^,#include ,' >>$@ touch -r `ls -1t *.h | tail +2 | head -1` $@ always: diff -Naur xdvik-22.40n/texk/kpathsea/NEWS xdvik-22.40o/texk/kpathsea/NEWS --- xdvik-22.40n/texk/kpathsea/NEWS Wed Apr 18 14:24:26 2001 +++ xdvik-22.40o/texk/kpathsea/NEWS Wed Oct 16 22:26:21 2002 @@ -1,4 +1,33 @@ This file records noteworthy changes. +3.3.8 +* Add support for mktexfmt (which is normally a link to fmtutil). +* Check both VAR.progname and VAR_progname in the environment. + +3.3.7 (27 November 2001) +* Minor fixes/changes to assist Omega development. + +3.3.6 (18 November 2001) +* Minor fixes/changes to assist Omega development. + +3.3.5 (10 November 2001) +* Minor bug fixes. + +3.3.4 (30 October 2001) +* Minor bug fixes. + +3.3.3 (5 August 2000) +* On NeXT, 'rm -rf' will not fail, but uses the cwd as its argument. + mktexlsr counted on it to fail, with sometimes disastrous results. + +3.3.2 (25 April 1999) +* Minor bug fixes. + +3.3.1 (29 May 1999) +* Minor bug fixes. + +3.3 (26 March 1999) +* Minor bugfixes. + 3.2 (15 March 1998) * Brace expansion will accept the path separator as well as the comma, e.g., {foo:bar}. diff -Naur xdvik-22.40n/texk/kpathsea/absolute.c xdvik-22.40o/texk/kpathsea/absolute.c --- xdvik-22.40n/texk/kpathsea/absolute.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/absolute.c Wed Oct 16 22:26:21 2002 @@ -16,10 +16,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/absolute.h" -#include "kpathsea/c-pathch.h" +#include +#include /* Sorry this is such a system-dependent mess, but I can't see any way to usefully generalize. */ diff -Naur xdvik-22.40n/texk/kpathsea/absolute.h xdvik-22.40o/texk/kpathsea/absolute.h --- xdvik-22.40n/texk/kpathsea/absolute.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/absolute.h Wed Oct 16 22:26:21 2002 @@ -19,13 +19,13 @@ #ifndef KPATHSEA_ABSOLUTE_H #define KPATHSEA_ABSOLUTE_H -#include "kpathsea/types.h" -#include "kpathsea/c-proto.h" +#include +#include /* True if FILENAME is absolute (/foo) or, if RELATIVE_OK is true, explicitly relative (./foo, ../foo), else false (foo). */ -extern boolean kpse_absolute_p P2H(const_string filename, boolean relative_ok); +extern KPSEDLL boolean kpse_absolute_p P2H(const_string filename, boolean relative_ok); #endif /* not KPATHSEA_ABSOLUTE_H */ diff -Naur xdvik-22.40n/texk/kpathsea/access.c xdvik-22.40o/texk/kpathsea/access.c --- xdvik-22.40n/texk/kpathsea/access.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/access.c Wed Oct 16 22:26:21 2002 @@ -1,5 +1,5 @@ /* access -- test for access permissions of a file. - Copyright (C) 1997 Olaf Weber. + Copyright (C) 1997, 2000 Olaf Weber. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,12 +16,9 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include -#include "kpathsea/config.h" -#include "kpathsea/c-unistd.h" - -#ifdef WIN32 -#include -#endif +#include +#include +#include /* * access mode x @@ -30,9 +27,8 @@ * only, which doesn't take read-only file systems into account. */ -int main (argc, argv) - int argc; - char *argv[]; +int +main P2C(int, argc, char **, argv) { int mode; int status; @@ -61,7 +57,7 @@ /* insist on exactly two args */ if (argc != 3) { fprintf(stderr, "%s: Need exactly two arguments.\n\ -Try `access --help' for more information.\n", argv[0]); +Try `%s --help' for more information.\n", argv[0], argv[0]); exit(1); } diff -Naur xdvik-22.40n/texk/kpathsea/acconfig.h xdvik-22.40o/texk/kpathsea/acconfig.h --- xdvik-22.40n/texk/kpathsea/acconfig.h Wed Apr 18 14:24:27 2001 +++ xdvik-22.40o/texk/kpathsea/acconfig.h Wed Oct 16 22:26:21 2002 @@ -10,8 +10,6 @@ /* kpathsea: the version string. */ #define KPSEVERSION "REPLACE-WITH-KPSEVERSION" -/* web2c: the version string. */ -#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION" /* kpathsea/configure.in tests for these functions with kb_AC_KLIBTOOL_REPLACE_FUNCS, and naturally Autoheader doesn't know @@ -43,54 +41,14 @@ `program_invocation_name' and `program_invocation_short_name'. */ #undef HAVE_PROGRAM_INVOCATION_NAME -/* Define if you get clashes concerning wchar_t, between X's include - files and system includes. */ -#undef FOIL_X_WCHAR_T - -/* tex: Define to enable --ipc. */ -#undef IPC - /* all: Define to enable running scripts when missing input files. */ #define MAKE_TEX_MF_BY_DEFAULT 0 #define MAKE_TEX_PK_BY_DEFAULT 0 #define MAKE_TEX_TEX_BY_DEFAULT 0 #define MAKE_TEX_TFM_BY_DEFAULT 0 +#define MAKE_TEX_FMT_BY_DEFAULT 0 #define MAKE_OMEGA_OFM_BY_DEFAULT 0 #define MAKE_OMEGA_OCP_BY_DEFAULT 0 - -/* web2c: Define if gcc asm needs _ on external symbols. */ -#undef ASM_NEEDS_UNDERSCORE - -/* web2c: Define when using system-specific files for arithmetic. */ -#undef ASM_SCALED_FRACTION - -/* web2c: Define to enable HackyInputFileNameForCoreDump.tex. */ -#undef FUNNY_CORE_DUMP - -/* web2c: Define to disable architecture-independent dump files. - Faster on LittleEndian architectures. */ -#undef NO_DUMP_SHARE - -/* web2c: Default editor for interactive `e' option. */ -#define EDITOR "vi +%d %s" - -/* web2c: Window system support for Metafont. */ -#undef EPSFWIN -#undef HP2627WIN -#undef MFTALKWIN -#undef NEXTWIN -#undef REGISWIN -#undef SUNWIN -#undef TEKTRONIXWIN -#undef UNITERMWIN -#undef X11WIN - -/* xdvik: Define if you have SIGIO, F_SETOWN, and FASYNC. */ -#undef HAVE_SIGIO - -/* xdvik: Define to avoid using any toolkit (and consequently omit lots - of features). */ -#undef NOTOOL @BOTTOM@ #endif /* !KPATHSEA_C_AUTO_H */ diff -Naur xdvik-22.40n/texk/kpathsea/c-auto.in xdvik-22.40o/texk/kpathsea/c-auto.in --- xdvik-22.40n/texk/kpathsea/c-auto.in Wed Apr 18 14:24:27 2001 +++ xdvik-22.40o/texk/kpathsea/c-auto.in Wed Oct 16 22:26:21 2002 @@ -11,8 +11,6 @@ /* kpathsea: the version string. */ #define KPSEVERSION "REPLACE-WITH-KPSEVERSION" -/* web2c: the version string. */ -#define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION" /* kpathsea/configure.in tests for these functions with kb_AC_KLIBTOOL_REPLACE_FUNCS, and naturally Autoheader doesn't know @@ -57,6 +55,7 @@ #define MAKE_TEX_PK_BY_DEFAULT 0 #define MAKE_TEX_TEX_BY_DEFAULT 0 #define MAKE_TEX_TFM_BY_DEFAULT 0 +#define MAKE_TEX_FMT_BY_DEFAULT 0 #define MAKE_OMEGA_OFM_BY_DEFAULT 0 #define MAKE_OMEGA_OCP_BY_DEFAULT 0 @@ -143,4 +142,7 @@ /* Define if you have the header file. */ #undef HAVE_UNISTD_H + +/* Define if you have the m library (-lm). */ +#undef HAVE_LIBM #endif /* !KPATHSEA_C_AUTO_H */ diff -Naur xdvik-22.40n/texk/kpathsea/c-ctype.h xdvik-22.40o/texk/kpathsea/c-ctype.h --- xdvik-22.40n/texk/kpathsea/c-ctype.h Wed Apr 18 14:24:27 2001 +++ xdvik-22.40o/texk/kpathsea/c-ctype.h Wed Oct 16 22:26:21 2002 @@ -1,6 +1,6 @@ /* c-ctype.h: ASCII-safe versions of the macros. -Copyright (C) 1992 Free Software Foundation, Inc. +Copyright (C) 1992, 2000 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -22,8 +22,12 @@ #include /* Be sure we have `isascii'. */ +#ifdef WIN32 +#include +#else #ifndef isascii #define isascii(c) 1 +#endif #endif #define ISALNUM(c) (isascii (c) && isalnum(c)) diff -Naur xdvik-22.40n/texk/kpathsea/c-fopen.h xdvik-22.40o/texk/kpathsea/c-fopen.h --- xdvik-22.40n/texk/kpathsea/c-fopen.h Wed Apr 18 14:24:27 2001 +++ xdvik-22.40o/texk/kpathsea/c-fopen.h Wed Oct 16 22:26:21 2002 @@ -1,6 +1,6 @@ /* c-fopen.h: how to open files with fopen. -Copyright (C) 1992, 94, 95, 96 Free Software Foundation, Inc. +Copyright (C) 1992, 94, 95, 96, 2000 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -34,33 +34,17 @@ /* How to open a binary file for reading: */ #ifndef FOPEN_RBIN_MODE -#if defined (VMS) || defined (VMCMS) || defined(DOS) || defined (OS2) || defined (WIN32) || defined (__DJGPP__) || defined (__CYGWIN32__) #define FOPEN_RBIN_MODE "rb" -#else -#define FOPEN_RBIN_MODE "r" -#endif /* not (VM/CMS or VMS or DOS or OS2 or WIN32 or __DJGPP__ or __CYGWIN32__) */ #endif /* not FOPEN_RBIN_MODE */ /* How to open a binary file for writing: */ #ifndef FOPEN_WBIN_MODE -#if defined (DOS) || defined (OS2) || defined (WIN32) || defined (__DJGPP__) || defined (__CYGWIN32__) #define FOPEN_WBIN_MODE "wb" -#else -#ifdef VMCMS -#define FOPEN_WBIN_MODE "wb, lrecl=1024, recfm=f" -#else -#define FOPEN_WBIN_MODE "w" -#endif /* not VM/CMS */ -#endif /* not (DOS or OS2 or WIN32 or DJGPP or CYGWIN32) */ #endif /* not FOPEN_WBIN_MODE */ /* How to open a binary file for appending: */ #ifndef FOPEN_ABIN_MODE -#if defined (DOS) || defined (OS2) || defined (WIN32) || defined (__DJGPP__) || defined (__CYGWIN32__) #define FOPEN_ABIN_MODE "ab" -#else -#define FOPEN_ABIN_MODE "a" -#endif /* not (DOS or OS2 or WIN32 or DJGPP or CYGWIN32) */ #endif /* not FOPEN_ABIN_MODE */ /* How to switch an already open file handle to binary mode. @@ -74,7 +58,8 @@ #define O_BINARY _O_BINARY #endif #endif -#if defined (__DJGPP__) || defined (WIN32) || defined (__CYGWIN32__) +#if defined (__i386_pc_gnu__) || \ + defined (WIN32) || defined (__WIN32__) || defined (_WIN32) #define SET_BINARY(f) setmode((f), O_BINARY) #endif #else /* not DOSISH */ diff -Naur xdvik-22.40n/texk/kpathsea/c-limits.h xdvik-22.40o/texk/kpathsea/c-limits.h --- xdvik-22.40n/texk/kpathsea/c-limits.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/c-limits.h Wed Oct 16 22:26:22 2002 @@ -22,7 +22,7 @@ #ifdef HAVE_LIMITS_H #include #else -#include "kpathsea/systypes.h" +#include #ifdef HAVE_SYS_PARAM_H #include #endif diff -Naur xdvik-22.40n/texk/kpathsea/c-memstr.h xdvik-22.40o/texk/kpathsea/c-memstr.h --- xdvik-22.40n/texk/kpathsea/c-memstr.h Wed Apr 18 14:24:27 2001 +++ xdvik-22.40o/texk/kpathsea/c-memstr.h Wed Oct 16 22:26:22 2002 @@ -1,6 +1,6 @@ /* c-memstr.h: memcpy, strchr, etc. -Copyright (C) 1992, 93, 94, 95, 97 Free Software Foundation, Inc. +Copyright (C) 1992, 93, 94, 95, 97, 2000 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -35,28 +35,6 @@ /* Just to be complete, we make both the system V/ANSI and the BSD versions of the string functions available. */ -/* FIXME: we'll move to providing the ANSI stuff, if necessary defined - in terms of the BSD functions. */ -#if !defined(HAVE_INDEX) && !defined(index) -#define index strchr -#endif - -#if !defined(HAVE_RINDEX) && !defined(rindex) -#define rindex strrchr -#endif - -#if !defined(HAVE_BCMP) && !defined(bcmp) -#define bcmp(s1, s2, len) memcmp ((s1), (s2), (len)) -#endif - -#if !defined(HAVE_BCOPY) && !defined(bcopy) -#define bcopy(from, to, len) memcpy ((to), (from), (len)) -#endif - -#if !defined(HAVE_BZERO) && !defined(bzero) -#define bzero(s, len) memset ((s), 0, (len)) -#endif - #if !defined(HAVE_STRCHR) && !defined(strchr) #define strchr index #endif @@ -71,6 +49,19 @@ #if !defined(HAVE_MEMCPY) && !defined(memcpy) #define memcpy(to, from, len) bcopy ((from), (to), (len)) +#endif + +/* Note that these functions should not be used. */ +#if !defined(HAVE_BCMP) && !defined(bcmp) +#define bcmp(s1, s2, len) memcmp ((s1), (s2), (len)) +#endif + +#if !defined(HAVE_BCOPY) && !defined(bcopy) +#define bcopy(from, to, len) memcpy ((to), (from), (len)) +#endif + +#if !defined(HAVE_BZERO) && !defined(bzero) +#define bzero(s, len) memset ((s), 0, (len)) #endif #if !defined(HAVE_STRING_H) diff -Naur xdvik-22.40n/texk/kpathsea/c-minmax.h xdvik-22.40o/texk/kpathsea/c-minmax.h --- xdvik-22.40n/texk/kpathsea/c-minmax.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/c-minmax.h Wed Oct 16 22:26:22 2002 @@ -20,7 +20,7 @@ #ifndef KPATHSEA_C_MINMAX_H #define KPATHSEA_C_MINMAX_H -#include "kpathsea/c-limits.h" +#include /* Declared in on ANSI C systems. If the system doesn't define it, we use the minimum ANSI values -- except for `int'; we diff -Naur xdvik-22.40n/texk/kpathsea/c-namemx.h xdvik-22.40o/texk/kpathsea/c-namemx.h --- xdvik-22.40n/texk/kpathsea/c-namemx.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/c-namemx.h Wed Oct 16 22:26:22 2002 @@ -21,7 +21,7 @@ #ifndef KPATHSEA_C_NAME_MX_H #define KPATHSEA_C_NAME_MX_H -#include "kpathsea/c-limits.h" +#include /* Most likely the system will truncate filenames if it is not POSIX, and so we can use the BSD value here. */ diff -Naur xdvik-22.40n/texk/kpathsea/c-pathch.h xdvik-22.40o/texk/kpathsea/c-pathch.h --- xdvik-22.40n/texk/kpathsea/c-pathch.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/c-pathch.h Wed Oct 16 22:26:22 2002 @@ -20,7 +20,7 @@ #ifndef C_PATHCH_H #define C_PATHCH_H -#include "kpathsea/c-ctype.h" +#include /* What separates filename components? */ #ifndef DIR_SEP @@ -37,6 +37,11 @@ #define NAME_BEGINS_WITH_DEVICE(name) (*(name) && IS_DEVICE_SEP((name)[1])) /* On DOS, it's good to allow both \ and / between directories. */ #define IS_DIR_SEP(ch) ((ch) == '/' || (ch) == '\\') +/* On win32, UNC names are authorized */ +#ifdef WIN32 +#define IS_UNC_NAME(name) (strlen(name)>=3 && IS_DIR_SEP(*name) \ + && IS_DIR_SEP(*(name+1)) && isalnum(*(name+2))) +#endif #else #ifdef AMIGA #define DIR_SEP '/' @@ -65,7 +70,9 @@ #ifndef NAME_BEGINS_WITH_DEVICE #define NAME_BEGINS_WITH_DEVICE(name) 0 #endif - +#ifndef IS_UNC_NAME /* Unc names are in practice found on Win32 only. */ +#define IS_UNC_NAME(name) 0 +#endif /* What separates elements in environment variable path lists? */ #ifndef ENV_SEP diff -Naur xdvik-22.40n/texk/kpathsea/c-pathmx.h xdvik-22.40o/texk/kpathsea/c-pathmx.h --- xdvik-22.40n/texk/kpathsea/c-pathmx.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/c-pathmx.h Wed Oct 16 22:26:22 2002 @@ -21,7 +21,7 @@ #ifndef KPATHSEA_C_PATH_MX_H #define KPATHSEA_C_PATH_MX_H -#include "kpathsea/c-limits.h" +#include /* Cheat and define this as a manifest constant no matter what, instead of using pathconf. I forget why we want to do this. */ diff -Naur xdvik-22.40n/texk/kpathsea/c-proto.h xdvik-22.40o/texk/kpathsea/c-proto.h --- xdvik-22.40n/texk/kpathsea/c-proto.h Wed Apr 18 14:24:27 2001 +++ xdvik-22.40o/texk/kpathsea/c-proto.h Wed Oct 16 22:26:22 2002 @@ -1,6 +1,6 @@ /* c-proto.h: macros to include or discard prototypes. -Copyright (C) 1992, 93, 95, 96 Free Software Foundation, Inc. +Copyright (C) 1992, 93, 95, 96, 2000 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -19,15 +19,21 @@ #ifndef KPATHSEA_C_PROTO_H #define KPATHSEA_C_PROTO_H -#if !defined(WIN32) -#define DllImport -#define __cdecl -#elif (defined(_DLL) && !defined(_IMPORT)) || !defined(_DLL) -#define DllImport +#if defined(WIN32) +#ifdef KPSE_DLL +#ifdef MAKE_KPSE_DLL +#define KPSEDLL __declspec( dllexport) #else -#define DllImport __declspec(dllimport) +#define KPSEDLL __declspec( dllimport) +#endif +#else +#define KPSEDLL +#endif +#else /* ! WIN32 */ +#define KPSEDLL #endif + /* These macros munge function declarations to make them work in both cases. The P?H macros are used for declarations, the P?C for definitions. Cf. from the GNU C library. P1H(void) @@ -46,6 +52,23 @@ #define P7H(p1,p2,p3,p4,p5,p6,p7) (p1, p2, p3, p4, p5, p6, p7) #define P8H(p1,p2,p3,p4,p5,p6,p7,p8) (p1, p2, p3, p4, p5, p6, p7, p8) #define P9H(p1,p2,p3,p4,p5,p6,p7,p8,p9) (p1, p2, p3, p4, p5, p6, p7, p8, p9) +#define P10H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) \ + (p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) +#define P11H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11) \ + (p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11) +#define P12H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12) \ + (p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12) +#define P13H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13) \ + (p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13) +#define P14H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14) \ + (p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14) +#define P15H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15) \ + (p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15) +#define P16H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16) \ + (p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16) +#define P17H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17) \ + (p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17) + #define P1C(t1,n1)(t1 n1) #define P2C(t1,n1, t2,n2)(t1 n1, t2 n2) @@ -61,6 +84,29 @@ (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8) #define P9C(t1,n1, t2,n2, t3,n3, t4,n4, t5,n5, t6,n6, t7,n7, t8,n8, t9,n9) \ (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8, t9 n9) +#define P10C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10) \ + (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8, t9 n9, t10 n10) +#define P11C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11) \ + (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8, t9 n9, t10 n10, \ + t11 n11) +#define P12C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12) \ + (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8, t9 n9, t10 n10, \ + t11 n11, t12 n12) +#define P13C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13) \ + (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8, t9 n9, t10 n10, \ + t11 n11, t12 n12, t13 n13) +#define P14C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14) \ + (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8, t9 n9, t10 n10, \ + t11 n11, t12 n12, t13 n13, t14 n14) +#define P15C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14,t15,n15) \ + (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8, t9 n9, t10 n10, \ + t11 n11, t12 n12, t13 n13, t14 n14, t15 n15) +#define P16C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14,t15,n15,t16,n16) \ + (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8, t9 n9, t10 n10, \ + t11 n11, t12 n12, t13 n13, t14 n14, t15 n15, t16 n16) +#define P17C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14,t15,n15,t16,n16,t17,n17) \ + (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8, t9 n9, t10 n10, \ + t11 n11, t12 n12, t13 n13, t14 n14, t15 n15, t16 n16, t17 n17) #else /* not HAVE_PROTOTYPES */ @@ -75,6 +121,14 @@ #define P7H(p1, p2, p3, p4, p5, p6, p7) () #define P8H(p1, p2, p3, p4, p5, p6, p7, p8) () #define P9H(p1, p2, p3, p4, p5, p6, p7, p8, p9) () +#define P10H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) () +#define P11H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11) () +#define P12H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12) () +#define P13H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13) () +#define P14H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14) () +#define P15H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15) () +#define P16H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16) () +#define P17H(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17) () #define P1C(t1,n1) (n1) t1 n1; #define P2C(t1,n1, t2,n2) (n1,n2) t1 n1; t2 n2; @@ -94,6 +148,37 @@ #define P9C(t1,n1, t2,n2, t3,n3, t4,n4, t5,n5, t6,n6, t7,n7, t8,n8, t9,n9) \ (n1,n2,n3,n4,n5,n6,n7,n8,n9) \ t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; +#define P10C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10) \ + (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10) \ + t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; +#define P11C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11) \ + (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11) \ + t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \ + t11 n11; +#define P12C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12) \ + (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12) \ + t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \ + t11 n11; t12 n12; +#define P13C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13) \ + (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13) \ + t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \ + t11 n11; t12 n12; t13 n13; +#define P14C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14) \ + (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14) \ + t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \ + t11 n11; t12 n12; t13 n13; t14 n14; +#define P15C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14,t15,n15) \ + (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15) \ + t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \ + t11 n11; t12 n12; t13 n13; t14 n14; t15 n15; +#define P16C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14,t15,n15,t16,n16) \ + (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16) \ + t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \ + t11 n11; t12 n12; t13 n13; t14 n14; t15 n15; t16 n16; +#define P17C(t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8,t9,n9,t10,n10,t11,n11,t12,n12,t13,n13,t14,n14,t15,n15,t16,n16,t17,n17) \ + (n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17) \ + t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; t7 n7; t8 n8; t9 n9; t10 n10; \ + t11 n11; t12 n12; t13 n13; t14 n14; t15 n15; t16 n16; t17 n17; #endif /* not HAVE_PROTOTYPES */ diff -Naur xdvik-22.40n/texk/kpathsea/c-stat.h xdvik-22.40o/texk/kpathsea/c-stat.h --- xdvik-22.40n/texk/kpathsea/c-stat.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/c-stat.h Wed Oct 16 22:26:22 2002 @@ -1,6 +1,6 @@ /* c-stat.h: declarations for using stat(2). -Copyright (C) 1993, 96 Free Software Foundation, Inc. +Copyright (C) 1993, 96, 2000 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -19,11 +19,11 @@ #ifndef KPATHSEA_STAT_H #define KPATHSEA_STAT_H -#include "kpathsea/systypes.h" +#include #include #ifdef WIN32 -#include "kpathsea/win32lib.h" +#include #endif /* WIN32 */ /* POSIX predicates for testing file attributes. */ diff -Naur xdvik-22.40n/texk/kpathsea/c-std.h xdvik-22.40o/texk/kpathsea/c-std.h --- xdvik-22.40n/texk/kpathsea/c-std.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/c-std.h Wed Oct 16 22:26:22 2002 @@ -22,11 +22,15 @@ /* Header files that essentially all of our sources need, and that all implementations have. We include these first, to help with NULL being defined multiple times. */ +/* Workaround against a MSVC bug : it can't be declared + extern "C" in a c++ source file. */ +#ifndef __cplusplus #include +#endif #include /* Be sure we have constants from . */ -#include "kpathsea/c-unistd.h" +#include #ifdef HAVE_STDLIB_H #include @@ -68,13 +72,13 @@ #endif /* not EXIT_SUCCESS */ /* strchr vs. index, memcpy vs. bcopy, etc. */ -#include "kpathsea/c-memstr.h" +#include /* Error numbers and errno declaration. */ -#include "kpathsea/c-errno.h" +#include /* Numeric minima and maxima. */ -#include "kpathsea/c-minmax.h" +#include /* Assertions are too useful to not make generally available. */ #ifdef HAVE_ASSERT_H diff -Naur xdvik-22.40n/texk/kpathsea/c-unistd.h xdvik-22.40o/texk/kpathsea/c-unistd.h --- xdvik-22.40n/texk/kpathsea/c-unistd.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/c-unistd.h Wed Oct 16 22:26:22 2002 @@ -21,13 +21,13 @@ #define KPATHSEA_C_UNISTD_H /* is allowed to depend on . */ -#include "kpathsea/systypes.h" +#include #if HAVE_UNISTD_H #include #endif -#include "kpathsea/c-std.h" +#include /* For fseek. */ #ifndef SEEK_SET diff -Naur xdvik-22.40n/texk/kpathsea/cnf.c xdvik-22.40o/texk/kpathsea/cnf.c --- xdvik-22.40n/texk/kpathsea/cnf.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/cnf.c Wed Oct 16 22:26:22 2002 @@ -16,18 +16,18 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" -#include "kpathsea/c-fopen.h" -#include "kpathsea/c-ctype.h" -#include "kpathsea/cnf.h" -#include "kpathsea/db.h" -#include "kpathsea/hash.h" -#include "kpathsea/line.h" -#include "kpathsea/paths.h" -#include "kpathsea/pathsearch.h" -#include "kpathsea/progname.h" -#include "kpathsea/tex-file.h" -#include "kpathsea/variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* By using our own hash table, instead of the environment, we complicate variable expansion (because we have to look in two @@ -69,12 +69,11 @@ /* `line' is now one character past the end of the variable name. */ len = line - start; - var = xmalloc (len + 1); + var = (string)xmalloc (len + 1); strncpy (var, start, len); var[len] = 0; - /* If the variable is qualified with a program name, we might be - ignoring it. */ + /* If the variable is qualified with a program name, find out which. */ while (ISSPACE (*line)) line++; if (*line == '.') { @@ -89,18 +88,9 @@ /* It's annoying to repeat all this, but making a tokenizing subroutine would be just as long and annoying. */ len = line - start; - prog = xmalloc (len + 1); + prog = (string)xmalloc (len + 1); strncpy (prog, start, len); prog[len] = 0; -#if 0 /* This code should be removed...premature optimization. */ - /* If we are running `prog', fine; otherwise, we're done. */ - assert (kpse_program_name); - if (!FILESTRCASEEQ (prog, kpse_program_name)) { - free (prog); - free (var); - return; - } -#endif } /* Skip whitespace, an optional =, more whitespace. */ @@ -118,7 +108,7 @@ while (ISSPACE (start[len - 1]) && len > 0) len--; - value = xmalloc (len + 1); + value = (string)xmalloc (len + 1); strncpy (value, start, len); value[len] = 0; @@ -138,10 +128,14 @@ /* gcc -ansi doesn't predefine `unix', since ANSI forbids it. And AIX generally doesn't predefine unix, who knows why. HP-UX is, of course, - also different. */ + also different. Apple's MacOsX is also unix-like. */ #ifndef unix #if defined (__unix__) || defined (_AIX) || defined (_HPUX_SOURCE) #define unix +#elif defined (__APPLE__) && defined (__MACH__) +#define unix +#elif defined (__NetBSD__) +#define unix #endif #endif @@ -192,6 +186,11 @@ while ((line = read_line (cnf_file)) != NULL) { unsigned len = strlen (line); + /* Strip trailing spaces. */ + while (len > 0 && ISSPACE(line[len-1])) { + line[len - 1] = 0; + --len; + } /* Concatenate consecutive lines that end with \. */ while (len > 0 && line[len - 1] == '\\') { string next_line = read_line (cnf_file); @@ -221,7 +220,7 @@ string kpse_cnf_get P1C(const_string, name) { - string ret, try; + string ret, ctry; string *ret_list; static boolean doing_cnf_init = false; @@ -245,13 +244,13 @@ /* First look up NAME.`kpse_program_name', then NAME. */ assert (kpse_program_name); - try = concat3 (name, ".", kpse_program_name); - ret_list = hash_lookup (cnf_hash, try); + ctry = concat3 (name, ".", kpse_program_name); + ret_list = hash_lookup (cnf_hash, ctry); + free (ctry); if (ret_list) { ret = *ret_list; free (ret_list); } else { - free (try); ret_list = hash_lookup (cnf_hash, name); if (ret_list) { ret = *ret_list; diff -Naur xdvik-22.40n/texk/kpathsea/cnf.h xdvik-22.40o/texk/kpathsea/cnf.h --- xdvik-22.40n/texk/kpathsea/cnf.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/cnf.h Wed Oct 16 22:26:22 2002 @@ -19,12 +19,12 @@ #ifndef KPATHSEA_CNF_H #define KPATHSEA_CNF_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* Return the value in the last-read cnf file for VAR, or NULL if none. On the first call, also read all the `texmf.cnf' files in the path for kpse_cnf_format (and initialize the path). */ -extern string kpse_cnf_get P1H(const_string var); +extern KPSEDLL string kpse_cnf_get P1H(const_string var); #endif /* not KPATHSEA_CNF_H */ diff -Naur xdvik-22.40n/texk/kpathsea/common.ac xdvik-22.40o/texk/kpathsea/common.ac --- xdvik-22.40n/texk/kpathsea/common.ac Wed Apr 18 14:24:27 2001 +++ xdvik-22.40o/texk/kpathsea/common.ac Wed Oct 16 22:26:22 2002 @@ -68,6 +68,7 @@ #define STRING1 "GabbaGabbaHey" #define STRING2 "Yow!!" /* should be shorter than STRING1 */ extern char *getenv (); /* in case char* and int don't mix gracefully */ +extern char *malloc (); /* ditto */ main () { char *str1, *rstr1, *str2, *rstr2; @@ -141,3 +142,29 @@ # Common --with and --enable options. sinclude(../../texk/kpathsea/withenable.ac) + +# Implementation of those options. +if test "x$with_mktexmf_default" = xyes; then + AC_DEFINE(MAKE_TEX_MF_BY_DEFAULT) +fi +if test "x$with_mktexpk_default" = xyes; then + AC_DEFINE(MAKE_TEX_PK_BY_DEFAULT) +fi +if test "x$with_mktextex_default" = xyes; then + AC_DEFINE(MAKE_TEX_TEX_BY_DEFAULT) +fi +if test "x$with_mktexfmt_default" = xyes; then + AC_DEFINE(MAKE_TEX_FMT_BY_DEFAULT) +fi +if test "x$with_mktextfm_default" = xyes; then + AC_DEFINE(MAKE_TEX_TFM_BY_DEFAULT) +fi +if test "x$with_mkocp_default" = xyes; then + AC_DEFINE(MAKE_OMEGA_OCP_BY_DEFAULT) +fi +if test "x$with_mkofm_default" = xyes; then + AC_DEFINE(MAKE_OMEGA_OFM_BY_DEFAULT) +fi + +# Is libm present. FIXME: do we need it at all? +AC_CHECK_LIB(m, main) diff -Naur xdvik-22.40n/texk/kpathsea/concat.c xdvik-22.40o/texk/kpathsea/concat.c --- xdvik-22.40n/texk/kpathsea/concat.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/concat.c Wed Oct 16 22:26:22 2002 @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include /* Return the concatenation of S1 and S2. See `concatn.c' for a diff -Naur xdvik-22.40n/texk/kpathsea/concat3.c xdvik-22.40o/texk/kpathsea/concat3.c --- xdvik-22.40n/texk/kpathsea/concat3.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/concat3.c Wed Oct 16 22:26:22 2002 @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include string diff -Naur xdvik-22.40n/texk/kpathsea/concatn.c xdvik-22.40o/texk/kpathsea/concatn.c --- xdvik-22.40n/texk/kpathsea/concatn.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/concatn.c Wed Oct 16 22:26:22 2002 @@ -16,9 +16,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/concatn.h" +#include /* OK, it would be epsilon more efficient to compute the total length diff -Naur xdvik-22.40n/texk/kpathsea/concatn.h xdvik-22.40o/texk/kpathsea/concatn.h --- xdvik-22.40n/texk/kpathsea/concatn.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/concatn.h Wed Oct 16 22:26:22 2002 @@ -22,12 +22,12 @@ #ifndef KPATHSEA_CONCATN_H #define KPATHSEA_CONCATN_H -#include "kpathsea/c-proto.h" -#include "kpathsea/c-vararg.h" -#include "kpathsea/types.h" +#include +#include +#include /* Concatenate a null-terminated list of strings and return the result in malloc-allocated memory. */ -extern DllImport string concatn PVAR1H(const_string str1); +extern KPSEDLL string concatn PVAR1H(const_string str1); #endif /* not KPATHSEA_CONCATN_H */ diff -Naur xdvik-22.40n/texk/kpathsea/config.h xdvik-22.40o/texk/kpathsea/config.h --- xdvik-22.40n/texk/kpathsea/config.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/config.h Wed Oct 16 22:26:22 2002 @@ -1,7 +1,7 @@ /* config.h: master configuration file, included first by all compilable source files (not headers). -Copyright (C) 1993, 95, 96, 97 Free Software Foundation, Inc. +Copyright (C) 1993, 95, 96, 97, 2000 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -22,11 +22,21 @@ /* System defines are for non-Unix systems only. (Testing for all Unix variations should be done in configure.) Presently the defines used - are: AMIGA DOS OS2 VMCMS VMS WIN32. I do not use any of these systems - myself; if you do, I'd be grateful for any changes. --kb@mail.tug.org */ + are: AMIGA DOS OS2 WIN32. I do not use any of these systems myself; + if you do, I'd be grateful for any changes. --olaf@infovore.xs4all.nl */ + +#if defined(DJGPP) || defined(__DJGPP__) || \ + defined(CYGWIN) || defined(__CYGWIN__) || \ + defined(CYGWIN32) || defined(__CYGWIN32__) || \ + defined(MINGW32) || defined(__MINGW32__) +#define __i386_pc_gnu__ +#endif /* If we have either DOS or OS2, we are DOSISH. */ -#if defined (DOS) || defined (OS2) || defined (WIN32) || defined(__MSDOS__) +#if defined(__i386_pc_gnu__) || \ + defined(OS2) || \ + defined(MSDOS) || defined(__MSDOS__) || defined(DOS) || \ + defined(WIN32) || defined(__WIN32__) || defined(_WIN32) #define DOSISH #endif @@ -36,9 +46,11 @@ #ifdef WIN32 #define __STDC__ 1 -#include "kpathsea/win32lib.h" #endif /* not WIN32 */ +/* System dependencies that are figured out by `configure'. */ +#include + #ifdef __DJGPP__ #include /* for long filenames' stuff */ #include /* for `getdisk' */ @@ -47,24 +59,25 @@ /* Some drivers have partially integrated kpathsea changes. */ #ifndef KPATHSEA -#define KPATHSEA 32 +#define KPATHSEA 33 #endif - -/* System dependencies that are figured out by `configure'. If we are - compiling standalone, we get our c-auto.h. Otherwise, the package - containing us must provide this (unless it can somehow generate ours - from c-auto.in). We use <...> instead of "..." so that the current - cpp directory (i.e., kpathsea/) won't be searched. */ -#include - -#include "kpathsea/c-std.h" /* , , etc. */ - -#include "kpathsea/c-proto.h" /* Macros to discard or keep prototypes. */ - -#include "kpathsea/debug.h" /* Runtime tracing. */ -#include "kpathsea/lib.h" /* STREQ, etc. */ -#include "kpathsea/types.h" /* , boolean, string, etc. */ -#include "kpathsea/progname.h" /* for program_invocation_*name */ + +#include /* , , etc. */ + +#include /* Macros to discard or keep prototypes. */ + +/* + This must be included after "c-proto.h" + but before "lib.h". FP. +*/ +#ifdef WIN32 +#include +#endif + +#include /* Runtime tracing. */ +#include /* STREQ, etc. */ +#include /* , boolean, string, etc. */ +#include /* for program_invocation_*name */ /* If you want to find subdirectories in a directory with non-Unix diff -Naur xdvik-22.40n/texk/kpathsea/configure xdvik-22.40o/texk/kpathsea/configure --- xdvik-22.40n/texk/kpathsea/configure Wed Apr 18 14:24:28 2001 +++ xdvik-22.40o/texk/kpathsea/configure Wed Oct 16 22:26:22 2002 @@ -29,6 +29,10 @@ ac_help="$ac_help --without-mkofm-default do not run mkofm if OFM file missing" ac_help="$ac_help + --with-mktexfmt-default run mktexfmt if format file missing" +ac_help="$ac_help + --with-mktextex-default run mktextex if TeX source missing" +ac_help="$ac_help --enable-multiplatform put executables in bin/PLATFORM" # Initialize some variables set by options. @@ -541,7 +545,7 @@ -KPSEVERSION=3.2.1 +KPSEVERSION=3.3.8 cat >> confdefs.h <&6 -echo "configure:560: checking for $ac_word" >&5 +echo "configure:564: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -587,7 +591,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:591: checking for $ac_word" >&5 +echo "configure:595: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -639,7 +643,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:643: checking for $ac_word" >&5 +echo "configure:647: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -672,7 +676,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:676: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:680: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -683,12 +687,12 @@ cat > conftest.$ac_ext << EOF -#line 687 "configure" +#line 691 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -714,12 +718,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:718: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:722: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:723: checking whether we are using GNU C" >&5 +echo "configure:727: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -728,7 +732,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -747,7 +751,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:751: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:755: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -815,7 +819,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:819: checking for a BSD compatible install" >&5 +echo "configure:823: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -870,7 +874,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:874: checking whether ln -s works" >&5 +echo "configure:878: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -893,7 +897,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:897: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:901: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -925,12 +929,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:929: checking for $ac_hdr that defines DIR" >&5 +echo "configure:933: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -938,7 +942,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -963,7 +967,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:967: checking for opendir in -ldir" >&5 +echo "configure:971: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -971,7 +975,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1004,7 +1008,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1008: checking for opendir in -lx" >&5 +echo "configure:1012: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1012,7 +1016,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1046,7 +1050,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1050: checking how to run the C preprocessor" >&5 +echo "configure:1054: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1061,13 +1065,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1078,13 +1082,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1095,13 +1099,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1126,12 +1130,12 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1130: checking for ANSI C header files" >&5 +echo "configure:1134: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1139,7 +1143,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1156,7 +1160,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1174,7 +1178,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1195,7 +1199,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1206,7 +1210,7 @@ exit (0); } EOF -if { (eval echo configure:1210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1230,7 +1234,7 @@ fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:1234: checking whether closedir returns void" >&5 +echo "configure:1238: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1238,13 +1242,13 @@ ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF -if { (eval echo configure:1248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else @@ -1271,17 +1275,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1275: checking for $ac_hdr" >&5 +echo "configure:1279: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1313,7 +1317,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1317: checking for $ac_word" >&5 +echo "configure:1321: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1348,7 +1352,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1352: checking host system type" >&5 +echo "configure:1356: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1372,7 +1376,7 @@ # echo $ac_n "checking for libtool object types""... $ac_c" 1>&6 -echo "configure:1376: checking for libtool object types" >&5 +echo "configure:1380: checking for libtool object types" >&5 # ## Check that the klibtool script is in ac_aux_dir. Don't bother to # scan PATH. For one thing, if we found it somewhere there, we couldn't @@ -1424,12 +1428,12 @@ for ac_func in putenv strcasecmp strtol strstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1428: checking for $ac_func" >&5 +echo "configure:1432: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1482,12 +1486,12 @@ for ac_func in bcmp bcopy bzero getcwd getwd index memcmp memcpy rindex strchr strrchr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1486: checking for $ac_func" >&5 +echo "configure:1490: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1536,12 +1540,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1540: checking for working const" >&5 +echo "configure:1544: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1613,19 +1617,19 @@ # Check whether prototypes work. echo $ac_n "checking whether the compiler accepts prototypes""... $ac_c" 1>&6 -echo "configure:1617: checking whether the compiler accepts prototypes" >&5 +echo "configure:1621: checking whether the compiler accepts prototypes" >&5 if eval "test \"`echo '$''{'kb_cv_c_prototypes'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { extern void foo(int i,...); ; return 0; } EOF -if { (eval echo configure:1629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* kb_cv_c_prototypes=yes else @@ -1646,19 +1650,19 @@ # This is a GNU libc invention. echo $ac_n "checking whether program_invocation_name is predefined""... $ac_c" 1>&6 -echo "configure:1650: checking whether program_invocation_name is predefined" >&5 +echo "configure:1654: checking whether program_invocation_name is predefined" >&5 if eval "test \"`echo '$''{'kb_cv_var_program_inv_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* kb_cv_var_program_inv_name=yes else @@ -1682,7 +1686,7 @@ # We don't actually need to run this if we don't have putenv, but it # doesn't hurt. echo $ac_n "checking whether putenv uses malloc""... $ac_c" 1>&6 -echo "configure:1686: checking whether putenv uses malloc" >&5 +echo "configure:1690: checking whether putenv uses malloc" >&5 if eval "test \"`echo '$''{'kb_cv_func_putenv_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1690,13 +1694,14 @@ kb_cv_func_putenv_malloc=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then kb_cv_func_putenv_malloc=yes else @@ -1767,7 +1772,7 @@ if test $ac_cv_func_getcwd = yes; then # We only need to run this if we have getcwd. echo $ac_n "checking whether getcwd uses fork or vfork""... $ac_c" 1>&6 -echo "configure:1771: checking whether getcwd uses fork or vfork" >&5 +echo "configure:1776: checking whether getcwd uses fork or vfork" >&5 if eval "test \"`echo '$''{'kb_cv_func_getcwd_forks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1775,7 +1780,7 @@ kb_cv_func_getcwd_forks=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then kb_cv_func_getcwd_forks=no else @@ -1812,7 +1817,7 @@ # Common --with and --enable options. echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1816: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1821: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1831,7 +1836,7 @@ echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6 -echo "configure:1835: checking for loader (symbol LD)" >&5 +echo "configure:1840: checking for loader (symbol LD)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1845,7 +1850,7 @@ echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6 -echo "configure:1849: checking for archiver (symbol AR)" >&5 +echo "configure:1854: checking for archiver (symbol AR)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1858,18 +1863,18 @@ echo "$ac_t""$AR" 1>&6 -echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 -echo "configure:1863: checking for archiver options (symbol AR_OPTS)" >&5 -if eval "test \"`echo '$''{'cf_cv_subst_AR_OPTS'+set}'`\" = set"; then +echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6 +echo "configure:1868: checking for archiver options (symbol ARFLAGS)" >&5 +if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -test -z "$AR_OPTS" && AR_OPTS=rc -cf_cv_subst_AR_OPTS=$AR_OPTS +test -z "$ARFLAGS" && ARFLAGS=rc +cf_cv_subst_ARFLAGS=$ARFLAGS fi -AR_OPTS=${cf_cv_subst_AR_OPTS} -echo "$ac_t""$AR_OPTS" 1>&6 +ARFLAGS=${cf_cv_subst_ARFLAGS} +echo "$ac_t""$ARFLAGS" 1>&6 @@ -1878,80 +1883,64 @@ withval="$with_mktexmf_default" : else - withval=yes + with_mktexmf_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_MF_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktexpk-default or --without-mktexpk-default was given. if test "${with_mktexpk_default+set}" = set; then withval="$with_mktexpk_default" : else - withval=yes + with_mktexpk_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_PK_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktextfm-default or --without-mktextfm-default was given. if test "${with_mktextfm_default+set}" = set; then withval="$with_mktextfm_default" : else - withval=yes + with_mktextfm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_TFM_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkocp-default or --without-mkocp-default was given. if test "${with_mkocp_default+set}" = set; then withval="$with_mkocp_default" : else - withval=yes + with_mkocp_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OCP_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkofm-default or --without-mkofm-default was given. if test "${with_mkofm_default+set}" = set; then withval="$with_mkofm_default" : else - withval=yes + with_mkofm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OFM_BY_DEFAULT 1 -EOF +# Check whether --with-mktexfmt-default or --without-mktexfmt-default was given. +if test "${with_mktexfmt_default+set}" = set; then + withval="$with_mktexfmt_default" + : +fi +# Check whether --with-mktextex-default or --without-mktextex-default was given. +if test "${with_mktextex_default+set}" = set; then + withval="$with_mktextex_default" + with_mktextex_default=yes +else + with_mktextex_default=no fi + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1955: checking host system type" >&5 +echo "configure:1944: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1983,7 +1972,7 @@ echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 -echo "configure:1987: checking where the main texmf tree is located" >&5 +echo "configure:1976: checking where the main texmf tree is located" >&5 texmfmain= if test "x$datadir" != 'x${prefix}/share'; then # First case, datadir is defined... @@ -2017,6 +2006,13 @@ if test -n "$texmfmain"; then echo "$ac_t"""$texmfmain"" 1>&6 else + ### SU: added using `kpsewhich' as last fallback before giving up; since + ### xdvik is most likely to be installed with an *existing* kpathsearch + ### system, this seemed reasonable to me. + texmfmain=`kpsewhich --expand-path='$TEXMFMAIN' 2>/dev/null | sed 's,//*,/,g'` + if test -d "$texmfmain"; then + echo "$ac_t"""$texmfmain"" 1>&6 + else eval texmfmain="$datadir/texmf" echo "$ac_t""not found" 1>&6 echo "configure: warning: The main texmf tree was not found. @@ -2026,8 +2022,98 @@ in systems/web2c. Winging it by using the default location $texmfmain." 1>&2 fi + fi +fi + + + +# Implementation of those options. +if test "x$with_mktexmf_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_TEX_MF_BY_DEFAULT 1 +EOF + fi +if test "x$with_mktexpk_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_TEX_PK_BY_DEFAULT 1 +EOF + +fi +if test "x$with_mktextex_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_TEX_TEX_BY_DEFAULT 1 +EOF + +fi +if test "x$with_mktexfmt_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_TEX_FMT_BY_DEFAULT 1 +EOF +fi +if test "x$with_mktextfm_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_TEX_TFM_BY_DEFAULT 1 +EOF + +fi +if test "x$with_mkocp_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_OMEGA_OCP_BY_DEFAULT 1 +EOF + +fi +if test "x$with_mkofm_default" = xyes; then + cat >> confdefs.h <<\EOF +#define MAKE_OMEGA_OFM_BY_DEFAULT 1 +EOF + +fi + +# Is libm present. FIXME: do we need it at all? +echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 +echo "configure:2077: checking for main in -lm" >&5 +ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi @@ -2183,7 +2269,7 @@ s%@MAINT@%$MAINT%g s%@LD@%$LD%g s%@AR@%$AR%g -s%@AR_OPTS@%$AR_OPTS%g +s%@ARFLAGS@%$ARFLAGS%g s%@texmfmain@%$texmfmain%g CEOF diff -Naur xdvik-22.40n/texk/kpathsea/configure.in xdvik-22.40o/texk/kpathsea/configure.in --- xdvik-22.40n/texk/kpathsea/configure.in Wed Apr 18 14:24:28 2001 +++ xdvik-22.40o/texk/kpathsea/configure.in Wed Oct 16 22:26:22 2002 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(pathsearch.c) -KPSEVERSION=3.2.1 +KPSEVERSION=3.3.8 AC_SUBST(KPSEVERSION) AC_DEFINE_UNQUOTED(KPSEVERSION, "kpathsea version $KPSEVERSION") diff -Naur xdvik-22.40n/texk/kpathsea/db.c xdvik-22.40o/texk/kpathsea/db.c --- xdvik-22.40n/texk/kpathsea/db.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/db.c Wed Oct 16 22:26:22 2002 @@ -16,19 +16,19 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" -#include "kpathsea/absolute.h" -#include "kpathsea/c-stat.h" -#include "kpathsea/c-fopen.h" -#include "kpathsea/c-pathch.h" -#include "kpathsea/db.h" -#include "kpathsea/hash.h" -#include "kpathsea/line.h" -#include "kpathsea/pathsearch.h" -#include "kpathsea/readable.h" -#include "kpathsea/str-list.h" -#include "kpathsea/tex-file.h" -#include "kpathsea/variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static hash_table_type db; /* The hash table for all the ls-R's. */ /* SMALL: The old size of the hash table was 7603, with the assumption @@ -78,7 +78,7 @@ string line; unsigned dir_count = 0, file_count = 0, ignore_dir_count = 0; unsigned len = strlen (db_filename) - sizeof (DB_NAME) + 1; /* Keep the /. */ - string top_dir = xmalloc (len + 1); + string top_dir = (string)xmalloc (len + 1); string cur_dir = NULL; /* First thing in ls-R might be a filename. */ FILE *db_file = fopen (db_filename, FOPEN_R_MODE); @@ -406,7 +406,7 @@ last_slash = strrchr (name, '/'); if (last_slash && last_slash != name) { unsigned len = last_slash - name + 1; - string dir_part = xmalloc (len); + string dir_part = (string)xmalloc (len); strncpy (dir_part, name, len - 1); dir_part[len - 1] = 0; path_elt = concat3 (orig_path_elt, "/", dir_part); @@ -447,10 +447,10 @@ done = false; for (r = aliases; !done && *r; r++) { - string try = *r; + string ctry = *r; /* We have an ls-R db. Look up `try'. */ - orig_dirs = db_dirs = hash_lookup (db, try); + orig_dirs = db_dirs = hash_lookup (db, ctry); ret = XTALLOC1 (str_list_type); *ret = str_list_init (); @@ -459,7 +459,7 @@ example, if we have .../cx/cmr10.300pk and .../ricoh/cmr10.300pk, and the path looks like .../cx, we don't want the ricoh file. */ while (!done && db_dirs && *db_dirs) { - string db_file = concat (*db_dirs, try); + string db_file = concat (*db_dirs, ctry); boolean matched = match (db_file, path_elt); #ifdef KPSE_DEBUG diff -Naur xdvik-22.40n/texk/kpathsea/db.h xdvik-22.40o/texk/kpathsea/db.h --- xdvik-22.40n/texk/kpathsea/db.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/db.h Wed Oct 16 22:26:22 2002 @@ -19,9 +19,9 @@ #ifndef KPATHSEA_DB_H #define KPATHSEA_DB_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" -#include "kpathsea/str-list.h" +#include +#include +#include /* Initialize the database. Until this is called, no ls-R matches will be found. */ @@ -37,6 +37,6 @@ /* Insert the filename FNAME into the database. Called by mktexpk et al. */ -extern void kpse_db_insert P1H(const_string fname); +extern KPSEDLL void kpse_db_insert P1H(const_string fname); #endif /* not KPATHSEA_DB_H */ diff -Naur xdvik-22.40n/texk/kpathsea/debug.c xdvik-22.40o/texk/kpathsea/debug.c --- xdvik-22.40n/texk/kpathsea/debug.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/debug.c Wed Oct 16 22:26:22 2002 @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include #ifdef KPSE_DEBUG /* whole file */ diff -Naur xdvik-22.40n/texk/kpathsea/debug.h xdvik-22.40o/texk/kpathsea/debug.h --- xdvik-22.40n/texk/kpathsea/debug.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/debug.h Wed Oct 16 22:26:22 2002 @@ -22,9 +22,9 @@ /* If NO_DEBUG is defined (not recommended), skip all this. */ #ifndef NO_DEBUG -#include "kpathsea/c-proto.h" -#include "kpathsea/c-std.h" -#include "kpathsea/types.h" +#include +#include +#include #if defined(WIN32) #if defined(_DEBUG) @@ -53,7 +53,7 @@ #define KPSE_DEBUG /* Bit vector defining what we should trace. */ -extern DllImport unsigned kpathsea_debug; +extern KPSEDLL unsigned kpathsea_debug; /* Set a bit. */ #define KPSE_DEBUG_SET(bit) kpathsea_debug |= 1 << (bit) @@ -87,10 +87,10 @@ #undef fopen #define fopen kpse_fopen_trace -extern FILE *fopen P2H(const_string filename, const_string mode); +extern KPSEDLL FILE *fopen P2H(const_string filename, const_string mode); #undef fclose #define fclose kpse_fclose_trace -extern int fclose P1H(FILE *); +extern KPSEDLL int fclose P1H(FILE *); #endif /* not NO_DEBUG */ diff -Naur xdvik-22.40n/texk/kpathsea/default.h xdvik-22.40o/texk/kpathsea/default.h --- xdvik-22.40n/texk/kpathsea/default.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/default.h Wed Oct 16 22:26:22 2002 @@ -19,8 +19,8 @@ #ifndef KPATHSEA_DEFAULT_H #define KPATHSEA_DEFAULT_H -#include "kpathsea/types.h" -#include "kpathsea/c-proto.h" +#include +#include /* Replace a leading or trailing or doubled : in PATH with DFLT. If diff -Naur xdvik-22.40n/texk/kpathsea/depend.mk xdvik-22.40o/texk/kpathsea/depend.mk --- xdvik-22.40n/texk/kpathsea/depend.mk Wed Apr 18 14:24:29 2001 +++ xdvik-22.40o/texk/kpathsea/depend.mk Wed Oct 16 22:26:22 2002 @@ -1,610 +1,738 @@ -absolute.lo: absolute.c $(kpathsea_srcdir)/config.h c-auto.h \ +absolute.lo: absolute.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/c-pathch.h \ - $(kpathsea_srcdir)/c-ctype.h + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h access.o: access.c \ - $(kpathsea_srcdir)/config.h c-auto.h \ - $(kpathsea_srcdir)/c-std.h \ - $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ + $(kpathsea_srcdir)/config.h \ + $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-unistd.h \ + $(kpathsea_srcdir)/systypes.h \ + getopt.h \ $(kpathsea_srcdir)/c-memstr.h \ $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -atou.lo: atou.c config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +atou.lo: atou.c config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -cnf.lo: cnf.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +cnf.lo: cnf.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-fopen.h \ - $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/cnf.h $(kpathsea_srcdir)/db.h $(kpathsea_srcdir)/str-list.h \ - $(kpathsea_srcdir)/hash.h $(kpathsea_srcdir)/line.h $(kpathsea_dir)/paths.h \ - $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ - $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/variable.h -concat.lo: concat.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-fopen.h \ + $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/cnf.h \ + $(kpathsea_srcdir)/db.h $(kpathsea_srcdir)/str-list.h $(kpathsea_srcdir)/hash.h \ + $(kpathsea_srcdir)/line.h $(kpathsea_dir)/paths.h $(kpathsea_srcdir)/pathsearch.h \ + $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/c-vararg.h \ + $(kpathsea_srcdir)/variable.h +concat.lo: concat.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -concat3.lo: concat3.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +concat3.lo: concat3.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -concatn.lo: concatn.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +concatn.lo: concatn.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/concatn.h $(kpathsea_srcdir)/c-vararg.h -db.lo: db.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/concatn.h $(kpathsea_srcdir)/c-vararg.h +db.lo: db.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/c-stat.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/c-stat.h \ $(kpathsea_srcdir)/c-fopen.h \ $(kpathsea_srcdir)/c-pathch.h \ $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/db.h \ $(kpathsea_srcdir)/str-list.h $(kpathsea_srcdir)/hash.h $(kpathsea_srcdir)/line.h \ $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ - $(kpathsea_srcdir)/readable.h $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/variable.h -debug.lo: debug.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/readable.h $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/c-vararg.h \ + $(kpathsea_srcdir)/variable.h +debug.lo: debug.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -dir.lo: dir.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +dir.lo: dir.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-dir.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-dir.h \ $(kpathsea_srcdir)/c-stat.h \ $(kpathsea_srcdir)/hash.h -elt-dirs.lo: elt-dirs.c $(kpathsea_srcdir)/config.h c-auto.h \ +elt-dirs.lo: elt-dirs.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/expand.h $(kpathsea_srcdir)/fn.h \ - $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ - $(kpathsea_srcdir)/xopendir.h $(kpathsea_srcdir)/c-dir.h -expand.lo: expand.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ + $(kpathsea_srcdir)/expand.h $(kpathsea_srcdir)/fn.h $(kpathsea_srcdir)/pathsearch.h \ + $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/xopendir.h $(kpathsea_srcdir)/c-dir.h +expand.lo: expand.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/expand.h $(kpathsea_srcdir)/pathsearch.h \ - $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/tilde.h $(kpathsea_srcdir)/variable.h \ - $(kpathsea_srcdir)/concatn.h $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/absolute.h \ - $(kpathsea_srcdir)/str-list.h -extend-fname.lo: extend-fname.c $(kpathsea_srcdir)/config.h c-auto.h \ - $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ + $(kpathsea_srcdir)/expand.h $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ + $(kpathsea_srcdir)/tilde.h $(kpathsea_srcdir)/variable.h $(kpathsea_srcdir)/concatn.h \ + $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/str-list.h +extend-fname.lo: extend-fname.c $(kpathsea_srcdir)/config.h \ + $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -file-p.lo: file-p.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +file-p.lo: file-p.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/xstat.h $(kpathsea_srcdir)/c-stat.h -find-suffix.lo: find-suffix.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/xstat.h $(kpathsea_srcdir)/c-stat.h +find-suffix.lo: find-suffix.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h -fn.lo: fn.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h +fn.lo: fn.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/fn.h -fontmap.lo: fontmap.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/fn.h +fontmap.lo: fontmap.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/c-fopen.h \ - $(kpathsea_srcdir)/fontmap.h $(kpathsea_srcdir)/hash.h $(kpathsea_srcdir)/line.h \ - $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ - $(kpathsea_srcdir)/str-list.h $(kpathsea_srcdir)/tex-file.h -getopt.lo: getopt.c config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/c-fopen.h \ + $(kpathsea_srcdir)/fontmap.h \ + $(kpathsea_srcdir)/hash.h $(kpathsea_srcdir)/line.h $(kpathsea_srcdir)/pathsearch.h \ + $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/str-list.h $(kpathsea_srcdir)/tex-file.h \ + $(kpathsea_srcdir)/c-vararg.h +getopt.lo: getopt.c config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -getopt1.lo: getopt1.c config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +getopt1.lo: getopt1.c config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h getopt.h -hash.lo: hash.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +hash.lo: hash.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/hash.h $(kpathsea_srcdir)/str-list.h -kdefault.lo: kdefault.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/hash.h \ + $(kpathsea_srcdir)/str-list.h +kdefault.lo: kdefault.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ $(kpathsea_srcdir)/default.h -kpsestat.o: kpsestat.c $(kpathsea_srcdir)/config.h c-auto.h \ +kpsestat.o: kpsestat.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-stat.h -kpsewhich.o: kpsewhich.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-stat.h +kpsewhich.o: kpsewhich.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/expand.h $(kpathsea_srcdir)/getopt.h \ - $(kpathsea_srcdir)/line.h $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ - $(kpathsea_srcdir)/proginit.h $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/tex-glyph.h \ - $(kpathsea_srcdir)/variable.h -line.lo: line.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/c-pathch.h \ + $(kpathsea_srcdir)/expand.h $(kpathsea_srcdir)/getopt.h $(kpathsea_srcdir)/line.h \ + $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ + $(kpathsea_srcdir)/proginit.h $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/c-vararg.h \ + $(kpathsea_srcdir)/tex-glyph.h $(kpathsea_srcdir)/variable.h +line.lo: line.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/line.h -magstep.lo: magstep.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/line.h +magstep.lo: magstep.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/magstep.h -make-suffix.lo: make-suffix.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/magstep.h +make-suffix.lo: make-suffix.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h -path-elt.lo: path-elt.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h +path-elt.lo: path-elt.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h -pathsearch.lo: pathsearch.c $(kpathsea_srcdir)/config.h c-auto.h \ +pathsearch.lo: pathsearch.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ $(kpathsea_srcdir)/c-fopen.h \ - $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/expand.h \ - $(kpathsea_srcdir)/db.h $(kpathsea_srcdir)/str-list.h $(kpathsea_srcdir)/pathsearch.h \ - $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/readable.h $(kpathsea_srcdir)/variable.h -proginit.lo: proginit.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/expand.h $(kpathsea_srcdir)/db.h \ + $(kpathsea_srcdir)/str-list.h $(kpathsea_srcdir)/pathsearch.h \ + $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/readable.h $(kpathsea_srcdir)/variable.h +proginit.lo: proginit.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/proginit.h $(kpathsea_srcdir)/tex-file.h -progname.lo: progname.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ + $(kpathsea_srcdir)/proginit.h $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/c-vararg.h +progname.lo: progname.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/c-pathch.h \ - $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/c-stat.h \ - $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ - $(kpathsea_srcdir)/tex-file.h + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ + $(kpathsea_srcdir)/c-stat.h \ + $(kpathsea_srcdir)/pathsearch.h \ + $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/c-vararg.h putenv.lo: putenv.c -readable.lo: readable.c $(kpathsea_srcdir)/config.h c-auto.h \ +readable.lo: readable.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-stat.h \ - $(kpathsea_srcdir)/readable.h $(kpathsea_srcdir)/tex-hush.h \ - $(kpathsea_srcdir)/truncate.h + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-stat.h \ + $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ + $(kpathsea_srcdir)/readable.h $(kpathsea_srcdir)/tex-hush.h $(kpathsea_srcdir)/truncate.h readlink.o: readlink.c \ - $(kpathsea_srcdir)/config.h c-auto.h \ - $(kpathsea_srcdir)/c-std.h \ - $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ + $(kpathsea_srcdir)/config.h \ + $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-unistd.h \ + $(kpathsea_srcdir)/systypes.h \ + getopt.h \ $(kpathsea_srcdir)/c-memstr.h \ $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathmx.h $(kpathsea_srcdir)/c-stat.h -rm-suffix.lo: rm-suffix.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathmx.h $(kpathsea_srcdir)/c-stat.h +rm-suffix.lo: rm-suffix.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -str-list.lo: str-list.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +str-list.lo: str-list.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/str-list.h -str-llist.lo: str-llist.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/str-list.h +str-llist.lo: str-llist.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/str-llist.h -strcasecmp.lo: strcasecmp.c config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/str-llist.h +strcasecmp.lo: strcasecmp.c config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h strstr.lo: strstr.c -strtol.lo: strtol.c config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ +strtol.lo: strtol.c config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -tex-file.lo: tex-file.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +tex-file.lo: tex-file.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-fopen.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-fopen.h \ $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/cnf.h \ - $(kpathsea_srcdir)/concatn.h $(kpathsea_srcdir)/default.h $(kpathsea_srcdir)/expand.h \ - $(kpathsea_srcdir)/fontmap.h $(kpathsea_srcdir)/hash.h $(kpathsea_dir)/paths.h \ - $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ - $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/tex-make.h $(kpathsea_srcdir)/variable.h -tex-glyph.lo: tex-glyph.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/cnf.h $(kpathsea_srcdir)/concatn.h \ + $(kpathsea_srcdir)/default.h $(kpathsea_srcdir)/expand.h $(kpathsea_srcdir)/fontmap.h \ + $(kpathsea_srcdir)/hash.h $(kpathsea_dir)/paths.h $(kpathsea_srcdir)/pathsearch.h \ + $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/tex-make.h \ + $(kpathsea_srcdir)/variable.h +tex-glyph.lo: tex-glyph.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-unistd.h \ + $(kpathsea_srcdir)/systypes.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ + $(kpathsea_srcdir)/c-minmax.h \ + $(kpathsea_srcdir)/c-limits.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/expand.h $(kpathsea_srcdir)/fontmap.h \ + $(kpathsea_srcdir)/hash.h $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ + $(kpathsea_srcdir)/tex-glyph.h $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/c-vararg.h \ + $(kpathsea_srcdir)/tex-make.h $(kpathsea_srcdir)/variable.h +tex-hush.lo: tex-hush.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/expand.h \ - $(kpathsea_srcdir)/fontmap.h $(kpathsea_srcdir)/hash.h $(kpathsea_srcdir)/pathsearch.h \ - $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/tex-glyph.h \ - $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/tex-make.h $(kpathsea_srcdir)/variable.h -tex-hush.lo: tex-hush.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h \ + $(kpathsea_srcdir)/tex-hush.h $(kpathsea_srcdir)/variable.h +tex-make.lo: tex-make.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/pathsearch.h \ - $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/tex-hush.h $(kpathsea_srcdir)/variable.h -tex-make.lo: tex-make.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-fopen.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ + $(kpathsea_srcdir)/concatn.h $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/db.h \ + $(kpathsea_srcdir)/str-list.h $(kpathsea_srcdir)/fn.h $(kpathsea_srcdir)/magstep.h \ + $(kpathsea_srcdir)/readable.h $(kpathsea_srcdir)/tex-make.h $(kpathsea_srcdir)/tex-file.h \ + $(kpathsea_srcdir)/variable.h +tilde.lo: tilde.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-fopen.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/concatn.h $(kpathsea_srcdir)/c-vararg.h \ - $(kpathsea_srcdir)/db.h $(kpathsea_srcdir)/str-list.h $(kpathsea_srcdir)/fn.h \ - $(kpathsea_srcdir)/magstep.h $(kpathsea_srcdir)/readable.h $(kpathsea_srcdir)/tex-make.h \ - $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/variable.h -tilde.lo: tilde.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/tilde.h +truncate.lo: truncate.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/tilde.h -truncate.lo: truncate.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-namemx.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h \ + $(kpathsea_srcdir)/c-pathmx.h $(kpathsea_srcdir)/truncate.h +uppercasify.lo: uppercasify.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-namemx.h $(kpathsea_srcdir)/c-pathch.h \ - $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/c-pathmx.h \ - $(kpathsea_srcdir)/truncate.h -uppercasify.lo: uppercasify.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-ctype.h +variable.lo: variable.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-ctype.h -variable.lo: variable.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/cnf.h \ + $(kpathsea_srcdir)/fn.h $(kpathsea_srcdir)/variable.h +version.lo: version.c c-auto.h $(kpathsea_srcdir)/c-proto.h +xbasename.lo: xbasename.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/cnf.h $(kpathsea_srcdir)/fn.h $(kpathsea_srcdir)/variable.h -version.lo: version.c c-auto.h -win32lib.lo: win32lib.c -xbasename.lo: xbasename.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h +xcalloc.lo: xcalloc.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h -xcalloc.lo: xcalloc.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +xdirname.lo: xdirname.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -xfopen.lo: xfopen.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-ctype.h +xfopen.lo: xfopen.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -xfseek.lo: xfseek.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +xfseek.lo: xfseek.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -xftell.lo: xftell.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +xftell.lo: xftell.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -xgetcwd.lo: xgetcwd.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +xgetcwd.lo: xgetcwd.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-pathmx.h + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/c-pathmx.h xmalloc.lo: xmalloc.c \ - $(kpathsea_srcdir)/config.h c-auto.h \ - $(kpathsea_srcdir)/c-std.h \ - $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ + $(kpathsea_srcdir)/config.h \ + $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-unistd.h \ + $(kpathsea_srcdir)/systypes.h \ + getopt.h \ $(kpathsea_srcdir)/c-memstr.h \ $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -xopendir.lo: xopendir.c $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +xopendir.lo: xopendir.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/xopendir.h $(kpathsea_srcdir)/c-dir.h -xputenv.lo: xputenv.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/xopendir.h $(kpathsea_srcdir)/c-dir.h +xputenv.lo: xputenv.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h xrealloc.lo: xrealloc.c \ - $(kpathsea_srcdir)/config.h c-auto.h \ - $(kpathsea_srcdir)/c-std.h \ - $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ + $(kpathsea_srcdir)/config.h \ + $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-unistd.h \ + $(kpathsea_srcdir)/systypes.h \ + getopt.h \ $(kpathsea_srcdir)/c-memstr.h \ $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h -xstat.lo: xstat.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h +xstat.lo: xstat.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/xstat.h $(kpathsea_srcdir)/c-stat.h -xstrdup.lo: xstrdup.c $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-std.h \ + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ + $(kpathsea_srcdir)/xstat.h $(kpathsea_srcdir)/c-stat.h +xstrdup.lo: xstrdup.c $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/c-std.h \ $(kpathsea_srcdir)/c-unistd.h \ $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ + getopt.h \ + $(kpathsea_srcdir)/c-memstr.h \ + $(kpathsea_srcdir)/c-errno.h \ $(kpathsea_srcdir)/c-minmax.h \ $(kpathsea_srcdir)/c-limits.h \ - $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h + $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ + $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h diff -Naur xdvik-22.40n/texk/kpathsea/dir.c xdvik-22.40o/texk/kpathsea/dir.c --- xdvik-22.40n/texk/kpathsea/dir.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/dir.c Wed Oct 16 22:26:22 2002 @@ -1,6 +1,6 @@ /* dir.c: directory operations. -Copyright (C) 1992, 93, 94, 95 Free Software Foundation, Inc. +Copyright (C) 1992, 93, 94, 95, 2000 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -16,11 +16,11 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-dir.h" -#include "kpathsea/c-stat.h" -#include "kpathsea/hash.h" +#include +#include +#include /* Return true if FN is a directory or a symlink to a directory, @@ -29,8 +29,26 @@ boolean dir_p P1C(const_string, fn) { + /* FIXME : using the stat() replacement in gnuw32, + we could avoid this win32 specific code. However, + I wonder if it would be as fast as this one is ? + */ #ifdef WIN32 - int fa = GetFileAttributes(fn); + int fa; + + safe_beg_of_path((string)fn); + fa = GetFileAttributes(fn); + + if (KPSE_DEBUG_P(KPSE_DEBUG_STAT)) { + if (fa == 0xFFFFFFFF) { + fprintf(stderr, "failed to get file attributes for %s (%d)\n", + fn, GetLastError()); + } else { + fprintf(stderr, "path %s %s a directory\n", + fn , (fa & FILE_ATTRIBUTE_DIRECTORY) ? + "is" : "is not"); + } + } return (fa != 0xFFFFFFFF && (fa & FILE_ATTRIBUTE_DIRECTORY)); #else struct stat stats; @@ -38,18 +56,19 @@ #endif } -#ifndef WIN32 - -/* Return -1 if FN isn't a directory, else its number of links. - Duplicate the call to stat; no need to incur overhead of a function - call for that little bit of cleanliness. */ - +/* + Return -1 if FN isn't a directory, else its number of links. + Duplicate the call to stat; no need to incur overhead of a function + call for that little bit of cleanliness. + + The process is a bit different under Win32 : the first call + memoizes the nlinks value, the following ones retrieve it. +*/ int -dir_links P1C(const_string, fn) +dir_links P2C(const_string, fn, long, nlinks) { static hash_table_type link_table; string *hash_ret; - long ret; if (link_table.size == 0) link_table = hash_create (457); @@ -70,24 +89,31 @@ /* Have to cast the int we need to/from the const_string that the hash table stores for values. Let's hope an int fits in a pointer. */ - if (hash_ret) - ret = (long) *hash_ret; - else - { + if (hash_ret) { + nlinks = (long) *hash_ret; + } else { +#ifdef WIN32 + /* Insert it only if we have some informations about it. */ + if (nlinks) + /* It's up to us to copy the value. */ + hash_insert (&link_table, xstrdup (fn), (const_string) nlinks); +#else struct stat stats; - ret = stat (fn, &stats) == 0 && S_ISDIR (stats.st_mode) - ? stats.st_nlink : -1; - + if (stat (fn, &stats) == 0 && S_ISDIR (stats.st_mode)) + nlinks = stats.st_nlink; + else + nlinks = -1; /* It's up to us to copy the value. */ - hash_insert (&link_table, xstrdup (fn), (const_string) ret); - + hash_insert (&link_table, xstrdup (fn), (const_string) nlinks); +#endif + #ifdef KPSE_DEBUG if (KPSE_DEBUG_P (KPSE_DEBUG_STAT)) - DEBUGF2 ("dir_links(%s) => %ld\n", fn, ret); + DEBUGF2 ("dir_links(%s) => %ld\n", fn, nlinks); #endif - } + } - return ret; + /* In any case, return nlinks + (either 0, the value inserted or the value retrieved. */ + return nlinks; } - -#endif /* !WIN32 */ diff -Naur xdvik-22.40n/texk/kpathsea/elt-dirs.c xdvik-22.40o/texk/kpathsea/elt-dirs.c --- xdvik-22.40n/texk/kpathsea/elt-dirs.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/elt-dirs.c Wed Oct 16 22:26:22 2002 @@ -1,6 +1,7 @@ /* elt-dirs.c: Translate a path element to its corresponding director{y,ies}. Copyright (C) 1993, 94, 95, 96, 97 Karl Berry. +Copyright (C) 1997, 1998, 99, 2000, Olaf Weber. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -16,13 +17,13 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-pathch.h" -#include "kpathsea/expand.h" -#include "kpathsea/fn.h" -#include "kpathsea/pathsearch.h" -#include "kpathsea/xopendir.h" +#include +#include +#include +#include +#include /* To avoid giving prototypes for all the routines and then their real definitions, we give all the subroutines first. The entry point is @@ -125,6 +126,7 @@ WIN32_FIND_DATA find_file_data; HANDLE hnd; int proceed; + int nlinks = 2; #else DIR *dir; struct dirent *e; @@ -161,11 +163,21 @@ proceed = 1; while (proceed) { if (find_file_data.cFileName[0] != '.') { + int links; + /* Construct the potential subdirectory name. */ fn_str_grow (&name, find_file_data.cFileName); + + /* Maybe we have cached the leafness of this directory. + The function will return 0 if unknown, + else the actual (Unix-like) value. */ + links = dir_links (FN_STRING (name), 0); + if (find_file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { unsigned potential_len = FN_LENGTH (name); - + /* in any case, compute the leafness */ + nlinks++; + /* It's a directory, so append the separator. */ fn_str_grow (&name, DIR_SEP_STRING); if (*post != 0) { @@ -178,14 +190,28 @@ expand_elt (str_list_ptr, FN_STRING (name), potential_len); fn_shrink_to (&name, potential_len); } - - do_subdir (str_list_ptr, FN_STRING (name), - potential_len, post); + /* Should we recurse? To see if the subdirectory is a + leaf, check if it has two links (one for . and one for + ..). This means that symbolic links to directories do + not affect the leaf-ness. This is arguably wrong, but + the only alternative I know of is to stat every entry + in the directory, and that is unacceptably slow. */ + + if (links == 0 || links > 2) + /* All criteria are met; find subdirectories. */ + do_subdir (str_list_ptr, FN_STRING (name), + potential_len, post); + else if (*post == 0) + /* Nothing to match, no recursive subdirectories to + look for: we're done with this branch. Add it. */ + dir_list_add (str_list_ptr, FN_STRING (name)); } fn_shrink_to (&name, elt_length); } proceed = FindNextFile (hnd, &find_file_data); } + /* Update the leafness of name. */ + dir_links(FN_STRING(name), nlinks); fn_free (&name); FindClose(hnd); @@ -222,7 +248,7 @@ fn_str_grow (&name, e->d_name); /* If we can't stat it, or if it isn't a directory, continue. */ - links = dir_links (FN_STRING (name)); + links = dir_links (FN_STRING (name), 0); if (links >= 0) { @@ -317,10 +343,59 @@ checked_dir_list_add (str_list_ptr, elt); } +/* The first bits of a path element can be problematic because they + look like a request to expand a whole disk, rather than a subtree. + - It can contain a drive specification. + - It can be a UNC path (win32, but they are part of the single + UNIX specification as well). + The argument is a string as the function can diddle into the argument + to canonicalize it, which tends to matter on windows platforms. + - Always lower-case drive letters a-z, even those filesystem that + preserve case in filenames do not care about the case of the drive + letters. + - Remove unneeded double slashes. The problem is Windows does not + handle well filenames like c://dir/foo. So canonicalize the names. + The resulting name will always be shorter than the one passed, so no + problem. + - If possible, we merely skip multiple leading slashes to prevent + expanding from the root of a UNIX filesystem tree. +*/ +unsigned +kpse_normalize_path P1C(string, elt) +{ + unsigned ret; + unsigned i; + + if (NAME_BEGINS_WITH_DEVICE(elt)) { + if (*elt >= 'A' && *elt <= 'Z') + *elt += 'a' - 'A'; + for (i = 2; IS_DIR_SEP(elt[i]); ++i) + ; + if (i > 3) + memmove(elt+3, elt+i, strlen(elt+i) + 1); + ret = 2; + } else if (IS_UNC_NAME(elt)) { + for (ret = 2; elt[ret] && !IS_DIR_SEP(elt[ret]); ++ret) + ; + for (i = ret; elt[i] && IS_DIR_SEP(elt[i]); ++i) + ; + if (i > ret+1) + memmove(elt+ret+1, elt+i, strlen(elt+i) + 1); + } else { + for (ret = 0; IS_DIR_SEP(elt[ret]); ++ret) + ; + } + + if (KPSE_DEBUG_P (KPSE_DEBUG_STAT)) + DEBUGF2 ("kpse_normalize_path (%s) => %u\n", elt, ret); + + return ret; +} + /* Here is the entry point. Returns directory list for ELT. */ str_llist_type * -kpse_element_dirs P1C(const_string, elt) +kpse_element_dirs P1C(string, elt) { str_llist_type *ret; @@ -338,7 +413,7 @@ *ret = NULL; /* We handle the hard case in a subroutine. */ - expand_elt (ret, elt, 0); + expand_elt (ret, elt, kpse_normalize_path (elt)); /* Remember the directory list we just found, in case future calls are made with the same ELT. */ diff -Naur xdvik-22.40n/texk/kpathsea/expand.c xdvik-22.40o/texk/kpathsea/expand.c --- xdvik-22.40n/texk/kpathsea/expand.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/expand.c Wed Oct 16 22:26:22 2002 @@ -16,16 +16,16 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-pathch.h" -#include "kpathsea/expand.h" -#include "kpathsea/pathsearch.h" -#include "kpathsea/tilde.h" -#include "kpathsea/variable.h" -#include "kpathsea/concatn.h" -#include "kpathsea/absolute.h" -#include "kpathsea/str-list.h" +#include +#include +#include +#include +#include +#include +#include +#include /* Do variable expansion first so ~${USER} works. (Besides, it's what the shells do.) */ @@ -63,7 +63,7 @@ if (kpse_dot == NULL) return path; - ret = xmalloc(1); + ret = (string)xmalloc(1); *ret = 0; #ifdef MSDOS @@ -116,7 +116,7 @@ { unsigned i; str_list_type expansions = brace_expand (&elt); - string ret = xmalloc (1); + string ret = (string)xmalloc (1); *ret = 0; for (i = 0; i != STR_LIST_LENGTH(expansions); i++) { @@ -159,7 +159,7 @@ Since kpse_path_element is not reentrant, we must get all the path elements before we start the loop. */ string xpath = kpse_var_expand (path); - string ret = xmalloc (1); + string ret = (string)xmalloc (1); *ret = 0; for (elt = kpse_path_element (xpath); elt; elt = kpse_path_element (NULL)) { @@ -195,7 +195,7 @@ unsigned len; /* Initialise ret to the empty string. */ - ret = xmalloc (1); + ret = (string)xmalloc (1); *ret = 0; len = 0; @@ -210,19 +210,6 @@ if (*elt == '!' && *(elt + 1) == '!') elt += 2; - /* Do not touch the device if present */ - if (NAME_BEGINS_WITH_DEVICE (elt)) { - while (IS_DIR_SEP (*(elt + 2)) && IS_DIR_SEP (*(elt + 3))) { - *(elt + 2) = *(elt + 1); - *(elt + 1) = *elt; - elt++; - } - } else { - /* We never want to search the whole disk. */ - while (IS_DIR_SEP (*elt) && IS_DIR_SEP (*(elt + 1))) - elt++; - } - /* Search the disk for all dirs in the component specified. Be faster to check the database, but this is more reliable. */ dirs = kpse_element_dirs (elt); @@ -263,7 +250,7 @@ str_list_type tmp; tmp = str_list_init(); len = p - text; - new_string = xmalloc(len+1); + new_string = (string)xmalloc(len+1); strncpy(new_string, text, len); new_string[len]=0; str_list_add(&tmp, new_string); diff -Naur xdvik-22.40n/texk/kpathsea/expand.h xdvik-22.40o/texk/kpathsea/expand.h --- xdvik-22.40n/texk/kpathsea/expand.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/expand.h Wed Oct 16 22:26:22 2002 @@ -19,24 +19,24 @@ #ifndef KPATHSEA_EXPAND_H #define KPATHSEA_EXPAND_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* Call kpse_var_expand and kpse_tilde_expand (in that order). Result is always in fresh memory, even if no expansions were done. */ -extern string kpse_expand P1H(const_string s); +extern KPSEDLL string kpse_expand P1H(const_string s); /* Do brace expansion and call `kpse_expand' on each element of the result; return the final expansion (always in fresh memory, even if no expansions were done). We don't call `kpse_expand_default' because there is a whole sequence of defaults to run through; see `kpse_init_format'. */ -extern string kpse_brace_expand P1H(const_string path); +extern KPSEDLL string kpse_brace_expand P1H(const_string path); /* Do brace expansion and call `kpse_expand' on each argument of the result, then expand any `//' constructs. The final expansion (always in fresh memory) is a path of all the existing directories that match the pattern. */ -extern string kpse_path_expand P1H(const_string path); +extern KPSEDLL string kpse_path_expand P1H(const_string path); #endif /* not KPATHSEA_EXPAND_H */ diff -Naur xdvik-22.40n/texk/kpathsea/extend-fname.c xdvik-22.40o/texk/kpathsea/extend-fname.c --- xdvik-22.40n/texk/kpathsea/extend-fname.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/extend-fname.c Wed Oct 16 22:26:22 2002 @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include /* We may or may not return NAME. It's up to the caller not to assume diff -Naur xdvik-22.40n/texk/kpathsea/file-p.c xdvik-22.40o/texk/kpathsea/file-p.c --- xdvik-22.40n/texk/kpathsea/file-p.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/file-p.c Wed Oct 16 22:26:22 2002 @@ -16,9 +16,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/xstat.h" +#include /* Test whether FILENAME1 and FILENAME2 are actually the same file. If diff -Naur xdvik-22.40n/texk/kpathsea/find-suffix.c xdvik-22.40o/texk/kpathsea/find-suffix.c --- xdvik-22.40n/texk/kpathsea/find-suffix.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/find-suffix.c Wed Oct 16 22:26:22 2002 @@ -16,9 +16,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-pathch.h" +#include /* Return pointer to first character after `.' in last directory element diff -Naur xdvik-22.40n/texk/kpathsea/fn.c xdvik-22.40o/texk/kpathsea/fn.c --- xdvik-22.40n/texk/kpathsea/fn.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/fn.c Wed Oct 16 22:26:22 2002 @@ -16,9 +16,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/fn.h" +#include /* /usr/local/lib/texmf/fonts/public/cm/pk/ljfour/cmr10.300pk is 58 @@ -44,7 +44,7 @@ fn_type ret; FN_ALLOCATED (ret) = CHUNK_SIZE > len ? CHUNK_SIZE : len + 1; - FN_STRING (ret) = xmalloc (FN_ALLOCATED (ret)); + FN_STRING (ret) = (string)xmalloc (FN_ALLOCATED (ret)); strncpy (FN_STRING (ret), s, len); FN_STRING (ret)[len] = 0; @@ -92,7 +92,7 @@ void -fn_grow P3C(fn_type *, f, address, source, unsigned, len) +fn_grow P3C(fn_type *, f, const_string, source, unsigned, len) { grow (f, len); strncpy (FN_STRING (*f) + FN_LENGTH (*f), source, len); diff -Naur xdvik-22.40n/texk/kpathsea/fn.h xdvik-22.40o/texk/kpathsea/fn.h --- xdvik-22.40n/texk/kpathsea/fn.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/fn.h Wed Oct 16 22:26:22 2002 @@ -19,8 +19,8 @@ #ifndef KPATHSEA_FN_H #define KPATHSEA_FN_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* Arbitrarily long filenames; it's inconvenient to use obstacks here, because we want to maintain a null terminator. Also used for @@ -41,27 +41,27 @@ /* Create a new empty fn. */ -extern fn_type fn_init P1H(void); +extern KPSEDLL fn_type fn_init P1H(void); /* Create a new fn from the first LEN characters from S and a null. */ -extern fn_type fn_copy0 P2H(const_string s, unsigned len); +extern KPSEDLL fn_type fn_copy0 P2H(const_string s, unsigned len); /* Free what's been allocated. Can also just free the string if it's been extracted out. Fatal error if nothing allocated in F. */ -extern void fn_free P1H(fn_type *f); +extern KPSEDLL void fn_free P1H(fn_type *f); /* Append the character C to the fn F. Don't append trailing null. */ -extern void fn_1grow P2H(fn_type *f, char c); +extern KPSEDLL void fn_1grow P2H(fn_type *f, char c); /* Append LENGTH bytes from SOURCE to F. */ -extern void fn_grow P3H(fn_type *f, address source, unsigned length); +extern KPSEDLL void fn_grow P3H(fn_type *f, const_string source, unsigned length); /* Concatenate the component S to the fn F. Assumes string currently in F is null terminated. */ -extern void fn_str_grow P2H(fn_type *f, const_string s); +extern KPSEDLL void fn_str_grow P2H(fn_type *f, const_string s); /* Add a null to F's string at position LOC, and update its length. Fatal error if LOC is past the end of the string. */ -extern void fn_shrink_to P2H(fn_type *f, unsigned loc); +extern KPSEDLL void fn_shrink_to P2H(fn_type *f, unsigned loc); #endif /* not KPATHSEA_FN_H */ diff -Naur xdvik-22.40n/texk/kpathsea/fontmap.c xdvik-22.40o/texk/kpathsea/fontmap.c --- xdvik-22.40n/texk/kpathsea/fontmap.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/fontmap.c Wed Oct 16 22:26:22 2002 @@ -16,16 +16,16 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-ctype.h" -#include "kpathsea/c-fopen.h" -#include "kpathsea/fontmap.h" -#include "kpathsea/hash.h" -#include "kpathsea/line.h" -#include "kpathsea/pathsearch.h" -#include "kpathsea/str-list.h" -#include "kpathsea/tex-file.h" +#include +#include +#include +#include +#include +#include +#include +#include /* We have one and only one fontmap, so may as well make it static instead of passing it around. */ @@ -56,7 +56,7 @@ str++; len = str - start; - ret = xmalloc (len + 1); + ret = (string)xmalloc (len + 1); strncpy (ret, start, len); ret[len] = 0; diff -Naur xdvik-22.40n/texk/kpathsea/fontmap.h xdvik-22.40o/texk/kpathsea/fontmap.h --- xdvik-22.40n/texk/kpathsea/fontmap.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/fontmap.h Wed Oct 16 22:26:22 2002 @@ -19,9 +19,9 @@ #ifndef FONTMAP_H #define FONTMAP_H -#include "kpathsea/c-proto.h" -#include "kpathsea/hash.h" -#include "kpathsea/types.h" +#include +#include +#include /* Look up KEY in all texfonts.map's in the glyph_format path, and diff -Naur xdvik-22.40n/texk/kpathsea/getopt.c xdvik-22.40o/texk/kpathsea/getopt.c --- xdvik-22.40n/texk/kpathsea/getopt.c Wed Apr 18 14:24:29 2001 +++ xdvik-22.40o/texk/kpathsea/getopt.c Wed Oct 16 22:26:22 2002 @@ -3,7 +3,7 @@ "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu before changing it! - Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97 + Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Its master source is NOT part of @@ -83,6 +83,9 @@ /* It's not Unix, really. See? Capital letters. */ #include #include +#ifdef getpid +#undef getpid +#endif #define getpid() GetCurrentProcessId() #endif diff -Naur xdvik-22.40n/texk/kpathsea/getopt.h xdvik-22.40o/texk/kpathsea/getopt.h --- xdvik-22.40n/texk/kpathsea/getopt.h Wed Apr 18 14:24:29 2001 +++ xdvik-22.40o/texk/kpathsea/getopt.h Wed Oct 16 22:26:22 2002 @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc. + Copyright (C) 1989,90,91,92,93,94,96,97, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Its master source is NOT part of the C library, however. The master source lives in /gd/gnu/lib. @@ -22,10 +22,21 @@ #ifndef _GETOPT_H #define _GETOPT_H 1 -#if !defined(WIN32) || (defined(_DLL) && !defined(_IMPORT)) || !defined(_DLL) -#define DllImport +#if defined(WIN32) +#ifndef __STDC__ +#define __STDC__ 1 +#endif +#if defined (KPSE_DLL) || defined (GNUW32_DLL) +#if defined (MAKE_KPSE_DLL) || defined (MAKE_GNUW32_DLL) +#define KPSEDLL __declspec( dllexport) +#else +#define KPSEDLL __declspec( dllimport) +#endif #else -#define DllImport __declspec(dllimport) +#define KPSEDLL +#endif +#else /* ! WIN32 */ +#define KPSEDLL #endif #ifdef __cplusplus @@ -38,7 +49,7 @@ Also, when `ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ -extern DllImport char *optarg; +extern KPSEDLL char *optarg; /* Index in ARGV of the next element to be scanned. This is used for communication to and from the caller @@ -52,16 +63,16 @@ Otherwise, `optind' communicates from one call to the next how much of ARGV has been scanned so far. */ -extern DllImport int optind; +extern KPSEDLL int optind; /* Callers store zero here to inhibit the error message `getopt' prints for unrecognized options. */ -extern DllImport int opterr; +extern KPSEDLL int opterr; /* Set to an option character which was unrecognized. */ -extern DllImport int optopt; +extern KPSEDLL int optopt; /* Describe the long-named options requested by the application. The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector @@ -109,13 +120,13 @@ /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ -extern int getopt (int argc, char *const *argv, const char *shortopts); +extern KPSEDLL int getopt (int argc, char *const *argv, const char *shortopts); #else /* not __GNU_LIBRARY__ */ -extern int getopt (); +extern KPSEDLL int getopt (); #endif /* __GNU_LIBRARY__ */ -extern int getopt_long (int argc, char *const *argv, const char *shortopts, +extern KPSEDLL int getopt_long (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind); -extern int getopt_long_only (int argc, char *const *argv, +extern KPSEDLL int getopt_long_only (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind); @@ -125,9 +136,9 @@ const struct option *longopts, int *longind, int long_only); #else /* not __STDC__ */ -extern int getopt (); -extern int getopt_long (); -extern int getopt_long_only (); +extern KPSEDLL int getopt (); +extern KPSEDLL int getopt_long (); +extern KPSEDLL int getopt_long_only (); extern int _getopt_internal (); #endif /* __STDC__ */ diff -Naur xdvik-22.40n/texk/kpathsea/hash.c xdvik-22.40o/texk/kpathsea/hash.c --- xdvik-22.40n/texk/kpathsea/hash.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/hash.c Wed Oct 16 22:26:22 2002 @@ -1,6 +1,6 @@ /* hash.c: hash table operations. -Copyright (C) 1994, 95, 96, 97 Karl Berry & Olaf Weber. +Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 Karl Berry & Olaf Weber. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -16,17 +16,23 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include +#include -#include "kpathsea/hash.h" -#include "kpathsea/str-list.h" +#include +#include /* The hash function. We go for simplicity here. */ /* All our hash tables are related to filenames. */ #ifdef MONOCASE_FILENAMES -#define TRANSFORM(x) toupper (x) +#if defined(WIN32) && !defined(__i386_pc_gnu__) +/* This is way faster under Win32. */ +#define TRANSFORM(x) ((unsigned)CharUpper((LPTSTR)(BYTE)(x))) +#else +#define TRANSFORM(x) (toupper(x)) +#endif #else #define TRANSFORM(x) (x) #endif diff -Naur xdvik-22.40n/texk/kpathsea/hash.h xdvik-22.40o/texk/kpathsea/hash.h --- xdvik-22.40n/texk/kpathsea/hash.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/hash.h Wed Oct 16 22:26:22 2002 @@ -19,8 +19,8 @@ #ifndef HASH_H #define HASH_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* A single (key,value) pair. */ @@ -44,20 +44,20 @@ #endif /* Create a hash table of size SIZE. */ -extern hash_table_type hash_create P1H(unsigned size); +extern KPSEDLL hash_table_type hash_create P1H(unsigned size); /* Insert the (KEY,VALUE) association into TABLE. KEY may have more than one VALUE. Neither KEY nor VALUE is copied. */ -extern void hash_insert P3H(hash_table_type *table, const_string key, - const_string value); +extern KPSEDLL void hash_insert P3H(hash_table_type *table, const_string key, + const_string value); /* Remove the (KEY,VALUE) association from TABLE. */ -extern void hash_remove P3H(hash_table_type *table, const_string key, - const_string value); +extern KPSEDLL void hash_remove P3H(hash_table_type *table, const_string key, + const_string value); /* Look up KEY in MAP, and return NULL-terminated list of all matching values (not copies), in insertion order. If none, return NULL. */ -extern string *hash_lookup P2H(hash_table_type table, const_string key); +extern KPSEDLL string *hash_lookup P2H(hash_table_type table, const_string key); /* Print TABLE to stderr. */ extern void hash_print P2H(hash_table_type table, boolean summary_only); diff -Naur xdvik-22.40n/texk/kpathsea/install.texi xdvik-22.40o/texk/kpathsea/install.texi --- xdvik-22.40n/texk/kpathsea/install.texi Wed Apr 18 14:24:30 2001 +++ xdvik-22.40o/texk/kpathsea/install.texi Wed Oct 16 22:26:22 2002 @@ -70,6 +70,9 @@ subdirectory there. @end table +These archives are mirrored on the CTAN hosts, in the +@file{systems/web2c} directory. + @noindent @xref{Kpathsea application distributions}. @item @@ -83,11 +86,8 @@ @item @samp{make}. @xref{Running make}. If you are using a BSD 4.4 system -such as FreeBSD or NetBSD, use GNU make (often installed in -@file{/usr/local/bin}), not the BSD make. - -If you are using a HP-UX 10 system and the native compiler, specify the -@samp{+u} flag in @code{XCFLAGS}. +such as FreeBSD or NetBSD, you may have to use GNU make (often installed +in @file{/usr/local/bin}), not the BSD make. @item @samp{make install}. @xref{Installing files}. @@ -200,9 +200,9 @@ @item xdvik @tab .7 @tab 2.5 @tab @item web2c @tab 1.3 @tab 5.0 @tab @item web @tab 1.9 @tab 6.5 @tab - @tab - -@item texk @tab 3.8 @tab 14.1 @tab 43.1 @tab 23.5 -@item texklib @tab 3.8 @tab 15.0 @tab - @tab 15.0 -@item (totals) @tab 7.6 @tab 29.1 @tab 43.1 @tab 38.5 +@item texk @tab 7.5 @tab 32.1 @tab 95.3 @tab 33.5 +@item texklib @tab 6.3 @tab 15.0 @tab - @tab 15.0 +@item (totals) @tab 14.6 @tab 47.1 @tab 95.3 @tab 48.5 @end multitable @@ -996,6 +996,12 @@ the location of the sources, the aliases and directory names from the Fontname distribution are used. (@pxref{Top,, Introduction, fontname, Fontname}). + +@item nomfdrivers +@cindex metafont driver files +Let mktexpk and mktextfm create metafont driver files in a temporary +directory. These will be used for just one metafont run and not +installed permanently. @item nomode @cindex mode directory, omitting diff -Naur xdvik-22.40n/texk/kpathsea/kdefault.c xdvik-22.40o/texk/kpathsea/kdefault.c --- xdvik-22.40n/texk/kpathsea/kdefault.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/kdefault.c Wed Oct 16 22:26:22 2002 @@ -19,10 +19,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-pathch.h" -#include "kpathsea/default.h" +#include +#include /* Check for leading colon first, then trailing, then doubled, since @@ -66,7 +66,7 @@ { if (IS_ENV_SEP (loc[0]) && IS_ENV_SEP (loc[1])) { /* We have a doubled colon. */ - expansion = xmalloc (path_length + strlen (fallback) + 1); + expansion = (string)xmalloc (path_length + strlen(fallback) + 1); /* Copy stuff up to and including the first colon. */ strncpy (expansion, path, loc - path + 1); diff -Naur xdvik-22.40n/texk/kpathsea/kpathsea.cps xdvik-22.40o/texk/kpathsea/kpathsea.cps --- xdvik-22.40n/texk/kpathsea/kpathsea.cps Wed Apr 18 14:24:30 2001 +++ xdvik-22.40o/texk/kpathsea/kpathsea.cps Wed Oct 16 22:26:22 2002 @@ -1,205 +1,205 @@ \initial {!} -\entry {\code {!! \r {in path specifications}}}{36} +\entry {\code {!! \r {in path specifications}}}{35} \initial {$} -\entry {\code {$ \r {expansion}}}{33} +\entry {\code {$ \r {expansion}}}{32} \initial {-} -\entry {\code {--color=tty}}{36} -\entry {\code {--debug=\var {num}}}{40} +\entry {\code {--color=tty}}{34} +\entry {\code {--debug=\var {num}}}{38} \entry {\code {--disable-static}}{8} -\entry {\code {--dpi=\var {num}}}{38} +\entry {\code {--dpi=\var {num}}}{37} \entry {\code {--enable \r {options}}}{7} \entry {\code {--enable-maintainer-mode}}{8} \entry {\code {--enable-shared}}{8, 9} -\entry {\code {--expand-braces=\var {string}}}{40} -\entry {\code {--expand-path=\var {string}}}{40} -\entry {\code {--expand-var=\var {string}}}{40} -\entry {\code {--format=\var {name}}}{38} -\entry {\code {--help}}{40} -\entry {\code {--interactive}}{39} -\entry {\code {--mode=\var {string}}}{39} -\entry {\code {--must-exist}}{39} -\entry {\code {--path=\var {string}}}{39} -\entry {\code {--progname=\var {name}}}{39} -\entry {\code {--show-path=\var {name}}}{40} +\entry {\code {--expand-braces=\var {string}}}{38} +\entry {\code {--expand-path=\var {string}}}{39} +\entry {\code {--expand-var=\var {string}}}{38} +\entry {\code {--format=\var {name}}}{37} +\entry {\code {--help}}{39} +\entry {\code {--interactive}}{38} +\entry {\code {--mode=\var {string}}}{38} +\entry {\code {--must-exist}}{38} +\entry {\code {--path=\var {string}}}{38} +\entry {\code {--progname=\var {name}}}{38} +\entry {\code {--show-path=\var {name}}}{39} \entry {\code {--srcdir\r {, for building multiple architectures}}}{9} -\entry {\code {--version}}{40} +\entry {\code {--version}}{39} \entry {\code {--with \r {options}}}{7} \entry {\code {--with-mktextex-default}}{12} \entry {\code {--without-mktexmf-default}}{12} \entry {\code {--without-mktexpk-default}}{12} \entry {\code {--without-mktextfm-default}}{12} \entry {\code {-1 \r {debugging value}}}{22} -\entry {\code {-A \r {option to \code {ls}}}}{36} +\entry {\code {-A \r {option to \code {ls}}}}{35} \entry {\code {-Bdynamic}}{28} \entry {\code {-Bstatic}}{28} -\entry {\code {-D \var {num}}}{38} +\entry {\code {-D \var {num}}}{37} \entry {\code {-dynamic}}{28} \entry {\code {-g\r {, compiling without}}}{9} -\entry {\code {-L \r {option to \code {ls}}}}{36} -\entry {\code {-mktex=\var {filetype}}}{39} -\entry {\code {-no-mktex=\var {filetype}}}{39} +\entry {\code {-L \r {option to \code {ls}}}}{35} +\entry {\code {-mktex=\var {filetype}}}{38} +\entry {\code {-no-mktex=\var {filetype}}}{38} \entry {\code {-O\r {, compiling with}}}{9} \entry {\code {-static}}{28} \initial {.} -\entry {\code {. \r {directories, ignored}}}{36} -\entry {\code {. \r {files}}}{36} +\entry {\code {. \r {directories, ignored}}}{35} +\entry {\code {. \r {files}}}{35} \entry {\code {.2602gf}}{26} -\entry {\code {.afm}}{41} -\entry {\code {.base}}{41} -\entry {\code {.bib}}{41} -\entry {\code {.bst}}{41} -\entry {\code {.cnf}}{41} -\entry {\code {.eps}}{42} -\entry {\code {.epsi}}{42} -\entry {\code {.fmt}}{41} -\entry {\code {.ist}}{42} -\entry {\code {.map}}{42} -\entry {\code {.mem}}{42} -\entry {\code {.mf}}{42} -\entry {\code {.mft}}{42} -\entry {\code {.mp}}{42} -\entry {\code {.ocp}}{42} -\entry {\code {.ofm}}{42} -\entry {\code {.opl}}{42} -\entry {\code {.otp}}{42} -\entry {\code {.ovf}}{42} -\entry {\code {.ovp}}{42} -\entry {\code {.pfa}}{43} -\entry {\code {.pfb}}{43} -\entry {\code {.pk}}{42} -\entry {\code {.pool}}{42, 43} -\entry {\code {.pro}}{42} +\entry {\code {.afm}}{40} +\entry {\code {.base}}{40} +\entry {\code {.bib}}{40} +\entry {\code {.bst}}{40} +\entry {\code {.cnf}}{40} +\entry {\code {.eps}}{40} +\entry {\code {.epsi}}{40} +\entry {\code {.fmt}}{40} +\entry {\code {.ist}}{41} +\entry {\code {.map}}{41} +\entry {\code {.mem}}{41} +\entry {\code {.mf}}{41} +\entry {\code {.mft}}{41} +\entry {\code {.mp}}{41} +\entry {\code {.ocp}}{41} +\entry {\code {.ofm}}{41} +\entry {\code {.opl}}{41} +\entry {\code {.otp}}{41} +\entry {\code {.ovf}}{41} +\entry {\code {.ovp}}{41} +\entry {\code {.pfa}}{42} +\entry {\code {.pfb}}{42} +\entry {\code {.pk}}{41} +\entry {\code {.pool}}{41, 42} +\entry {\code {.pro}}{41} \entry {\code {.rhosts\r {, writable by \TeX{}}}}{15} -\entry {\code {.tex}}{42} -\entry {\code {.tex \r {file, included in \file {ls-R}}}}{36} -\entry {\code {.tfm}}{43} -\entry {\code {.ttc}}{43} -\entry {\code {.ttf}}{43} -\entry {\code {.vf}}{43} +\entry {\code {.tex}}{41} +\entry {\code {.tex \r {file, included in \file {ls-R}}}}{35} +\entry {\code {.tfm}}{42} +\entry {\code {.ttc}}{42} +\entry {\code {.ttf}}{42} +\entry {\code {.vf}}{42} \initial {/} -\entry {\code {/ \r {may not be /}}}{30} -\entry {\code {/\r {, trailing in home directory}}}{34} -\entry {\code {//}}{34} +\entry {\code {/ \r {may not be /}}}{29} +\entry {\code {/\r {, trailing in home directory}}}{32} +\entry {\code {//}}{33} \entry {\code {/afs/\dots {} \r {, installing into}}}{11} \entry {\code {/etc/profile}}{25} -\entry {\code {/etc/profile \r {and aliases}}}{36} +\entry {\code {/etc/profile \r {and aliases}}}{34} \entry {\code {/var/tmp/texfonts}}{13} \initial {:} -\entry {\code {: \r {may not be :}}}{30} -\entry {\code {:: \r {expansion}}}{32} +\entry {\code {: \r {may not be :}}}{29} +\entry {\code {:: \r {expansion}}}{31} \initial {@} \entry {@\var {var}@ substitutions}{7} -\initial {{\tt\char '173}} -\entry {\code {{\tt\char '173} \r {expansion}}}{34} -\initial {{\tt\char '176}} -\entry {\code {~ \r {expansion}}}{33} +\initial {{\tt\char 123}} +\entry {\code {{\tt\char 123} \r {expansion}}}{33} +\initial {{\tt\char 126}} +\entry {\code {~ \r {expansion}}}{32} \initial {{\tt\indexbackslash }} -\entry {\code {{\tt\rawbackslashxx }\r {, line continuation in \file {texmf.cnf}}}}{31} -\entry {\code {{\tt\rawbackslashxx }openin}}{30} -\entry {\code {{\tt\rawbackslashxx }special\r {, suppressing warnings about}}}{46} +\entry {\code {{\tt\rawbackslashxx }\r {, line continuation in \file {texmf.cnf}}}}{30} +\entry {\code {{\tt\rawbackslashxx }openin}}{29} +\entry {\code {{\tt\rawbackslashxx }special\r {, suppressing warnings about}}}{45} \initial {2} \entry {\code {2602gf}}{26} \initial {4} -\entry {4all\TeX{} Live CD-ROM}{19} +\entry {4all\TeX{} Live CD-ROM}{20} \initial {8} \entry {8.3 filenames, using}{13} \initial {A} -\entry {absolute filenames}{30} +\entry {absolute filenames}{29} \entry {\code {ac_include\r {, Autoconf extension}}}{7} -\entry {access warnings}{30} +\entry {access warnings}{29} \entry {Acorn \TeX{} implementations}{20} -\entry {\code {AFMFONTS}}{41} +\entry {\code {AFMFONTS}}{40} \entry {AFS}{11} \entry {AIX 4.1 \code {configure} error}{27} \entry {AIX shells and \code {configure}}{7} -\entry {aliases for fonts}{45} -\entry {aliases, for filenames}{36} -\entry {\code {all}}{46} -\entry {alphabetical order, not}{34} +\entry {aliases for fonts}{43} +\entry {aliases, for filenames}{35} +\entry {\code {all}}{45} +\entry {alphabetical order, not}{33} \entry {Amiga support}{4} \entry {Amiga \TeX{} implementations}{20} \entry {Andrew File System, installing with}{11} \entry {announcement mailing list}{22} -\entry {ANSI C}{27} +\entry {ANSI C}{26} \entry {append-only directories and \code {mktexpk}}{15} -\entry {\code {appendonlydir}}{12, 13} +\entry {\code {appendonlydir}}{13} \entry {architecture-(in)dependent files, installing only}{11} \entry {architectures, compiling multiple}{9} \entry {arguments to \file {mktex}}{14} -\entry {\code {argv[0]}}{47, 48} +\entry {\code {argv[0]}}{46, 47} \entry {\code {ash\r {, losing with \code {configure}}}}{7} -\entry {\code {autoconf\r {, recommended}}}{48} +\entry {\code {autoconf\r {, recommended}}}{47} \entry {automounter, and configuration}{9} -\entry {automounter, and \file {ls-R}}{36} -\entry {auxiliary tasks}{39} +\entry {automounter, and \file {ls-R}}{35} +\entry {auxiliary tasks}{38} \initial {B} \entry {Babel}{5, 10} -\entry {Bach, Johann Sebastian}{33} +\entry {Bach, Johann Sebastian}{32} \entry {backbone of CTAN}{17} -\entry {backslash-newline}{31} +\entry {backslash-newline}{30} \entry {\code {bash\r {, recommended for running \code {configure}}}}{7} -\entry {basic glyph lookup}{44} +\entry {basic glyph lookup}{43} \entry {Berry, Karl}{1} -\entry {\code {BIBINPUTS}}{41} +\entry {\code {BIBINPUTS}}{40} \entry {binary mode, for file transfers}{18} -\entry {blank lines, in \file {texmf.cnf}}{31} -\entry {brace expansion}{34} +\entry {blank lines, in \file {texmf.cnf}}{30} +\entry {brace expansion}{33} \entry {BSD universe}{10} \entry {\code {bsh\r {, ok with \code {configure}}}}{7} -\entry {\code {BSTINPUTS}}{41} +\entry {\code {BSTINPUTS}}{40} \entry {bug address}{20} -\entry {bug checklist}{21} +\entry {bug checklist}{20} \entry {bug mailing list}{22} \entry {bugs, reporting}{20} \initial {C} -\entry {\code {c-*.h}}{48} +\entry {\code {c-*.h}}{47} \entry {\code {c-auto.in}}{7} \entry {cache of fonts, local}{15} -\entry {calling sequence}{47} +\entry {calling sequence}{46} \entry {\code {CC}}{8} -\entry {\code {cc \r {warnings}}}{29} +\entry {\code {cc \r {warnings}}}{28} \entry {\code {cc\r {, compiling with}}}{8} \entry {CD-ROM distributions}{19} \entry {\code {CFLAGS}}{8} \entry {\code {ChangeLog \r {entry}}}{21} -\entry {checklist for bug reports}{21} -\entry {\code {checksum}}{46} -\entry {circle fonts}{45} +\entry {checklist for bug reports}{20} +\entry {\code {checksum}}{45} +\entry {circle fonts}{44} \entry {\code {clean \r {Make target}}}{11} -\entry {\code {client_path \r {in \code {kpse_format_info}}}}{48} -\entry {\code {cmr10\r {, as fallback font}}}{46} -\entry {\code {cmr10.vf}}{30} -\entry {\code {cnf.c}}{32} -\entry {\code {cnf.h}}{49} +\entry {\code {client_path \r {in \code {kpse_format_info}}}}{47} +\entry {\code {cmr10\r {, as fallback font}}}{45} +\entry {\code {cmr10.vf}}{29} +\entry {\code {cnf.c}}{31} +\entry {\code {cnf.h}}{48} \entry {code sharing}{9} \entry {color printers, configuring}{4} -\entry {comments, in fontmap files}{45} -\entry {comments, in \file {texmf.cnf}}{31} +\entry {comments, in fontmap files}{44} +\entry {comments, in \file {texmf.cnf}}{30} \entry {comments, making}{1} -\entry {common features in glyph lookup}{44} +\entry {common features in glyph lookup}{43} \entry {common problems}{24} \entry {\code {comp.sys.sun.admin \r {FAQ}}}{28} \entry {\code {comp.text.tex}}{22} \entry {compilation}{3} -\entry {compilation value, source for path}{31} +\entry {compilation value, source for path}{30} \entry {compiler bugs}{26} \entry {compiler bugs, finding}{26} \entry {compiler options, additional}{10} \entry {compiler options, specifying}{8} \entry {compiler, changing}{10} -\entry {compiling on HP-UX}{27} +\entry {compiling on HP-UX}{26} \entry {conditions for use}{1} -\entry {config files}{31} -\entry {config files, for Kpathsea-using programs}{48} -\entry {config files, programming with}{49} +\entry {config files}{30} +\entry {config files, for Kpathsea-using programs}{47} +\entry {config files, programming with}{48} \entry {\code {config.log}}{21} -\entry {\code {config.ps\r {, search path for}}}{41} +\entry {\code {config.ps\r {, search path for}}}{40} \entry {\code {config.status}}{21} \entry {configuration}{3} \entry {configuration bugs}{21} \entry {configuration compiler options}{8} -\entry {configuration file, source for path}{31} -\entry {configuration files as shell scripts.}{32} +\entry {configuration file, source for path}{30} +\entry {configuration files as shell scripts.}{31} \entry {configuration of \file {mktex} scripts}{12} \entry {configuration of optional features}{7} \entry {\code {configure \r {error from \code {sed}}}}{27} @@ -207,7 +207,7 @@ \entry {\code {configure} options for \file {mktex} scripts}{12} \entry {\code {configure\r {, running}}}{7} \entry {context diff}{21} -\entry {continuation character}{31} +\entry {continuation character}{30} \entry {core dumps, reporting}{21} \entry {\code {CPPFLAGS}}{8} \entry {crashes, reporting}{21} @@ -216,21 +216,21 @@ \entry {custom installation}{4} \initial {D} \entry {Dante \TeX{} CD-ROM}{19} -\entry {database search}{30} -\entry {database, for filenames}{35} -\entry {database, format of}{37} +\entry {database search}{29} +\entry {database, for filenames}{34} +\entry {database, format of}{35} \entry {\code {debug.h}}{22} \entry {debugger}{21} \entry {debugging}{22} -\entry {debugging options, in Kpathsea-using program}{48} +\entry {debugging options, in Kpathsea-using program}{47} \entry {debugging output}{22} \entry {debugging with \samp {-g}, disabling}{9} \entry {DEC shells and \code {configure}}{7} -\entry {default expansion}{32} +\entry {default expansion}{31} \entry {default path features}{6} \entry {default paths, changing}{6} \entry {default paths, how they're made}{6} -\entry {\code {default_texsizes}}{46} +\entry {\code {default_texsizes}}{44} \entry {\code {DEFS}}{8} \entry {\code {depot}}{9} \entry {directories, changing default installation}{6} @@ -238,93 +238,92 @@ \entry {directory permissions}{15} \entry {directory structure, for \TeX{} files}{15} \entry {disabling \file {mktex} scripts}{12} -\entry {disk search}{30} -\entry {disk searching, avoiding}{36} +\entry {disk search}{29} +\entry {disk searching, avoiding}{35} \entry {disk space, needed}{4} \entry {disk usage, reducing}{24} \entry {\code {distclean \r {Make target}}}{11} \entry {distributions, compiling simultaneously}{5} \entry {distributions, not compiling}{5} \entry {distributions, on CD-ROM}{19} -\entry {distributions, on tape}{20} \entry {distributions, via ftp}{17} -\entry {\code {dlclose}}{28} -\entry {\code {dlopen}}{28} -\entry {\code {dlsym}}{28} +\entry {\code {dlclose}}{27} +\entry {\code {dlopen}}{27} +\entry {\code {dlsym}}{27} \entry {\code {dlsym.c}}{28} -\entry {\code {doc files}}{43} +\entry {\code {doc files}}{41} \entry {DOS compatible names}{13} \entry {DOS support}{4} \entry {DOS \TeX{} implementations}{20} \entry {\code {dosnames}}{13} -\entry {dot files}{36} -\entry {doubled colons}{32} +\entry {dot files}{35} +\entry {doubled colons}{31} \entry {\code {dpi\var {nnn} directories}}{13} \entry {DVI drivers}{5} \entry {\code {DVILJMAKEPK}}{14} -\entry {\code {DVILJSIZES}}{46} -\entry {\code {DVIPSFONTS}}{43} -\entry {\code {DVIPSHEADERS}}{43} +\entry {\code {DVILJSIZES}}{44} +\entry {\code {DVIPSFONTS}}{42} +\entry {\code {DVIPSHEADERS}}{42} \entry {\code {DVIPSMAKEPK}}{14} -\entry {\code {DVIPSSIZES}}{46} +\entry {\code {DVIPSSIZES}}{44} \entry {dynamic creation of files}{12} \entry {dynamic linking problems with OpenWin libraries}{28} \initial {E} \entry {EC fonts, and dynamic source creation}{12} -\entry {\code {elt-dirs.c}}{35} +\entry {\code {elt-dirs.c}}{34} \entry {email CTAN access}{18} \entry {enabling \file {mktex} scripts}{12} -\entry {environment variable, source for path}{31} -\entry {environment variables for \TeX{}}{41} -\entry {environment variables in paths}{33} +\entry {environment variable, source for path}{30} +\entry {environment variables for \TeX{}}{40} +\entry {environment variables in paths}{32} \entry {environment variables, old}{25} \entry {epoch, seconds since}{24} -\entry {error message macros}{47} +\entry {error message macros}{46} \entry {excessive startup time}{25} -\entry {\code {expand.c}}{34} -\entry {expanding symlinks}{47} -\entry {expansion, default}{32} -\entry {expansion, path element}{30} -\entry {expansion, search path}{32} -\entry {expansion, subdirectory}{34} -\entry {expansion, tilde}{33} -\entry {expansion, variable}{33} -\entry {explicitly relative filenames}{30} -\entry {externally-built filename database}{35} -\entry {extra colons}{32} +\entry {\code {expand.c}}{33} +\entry {expanding symlinks}{46} +\entry {expansion, default}{31} +\entry {expansion, path element}{29} +\entry {expansion, search path}{31} +\entry {expansion, subdirectory}{33} +\entry {expansion, tilde}{32} +\entry {expansion, variable}{32} +\entry {explicitly relative filenames}{29} +\entry {externally-built filename database}{34} +\entry {extra colons}{31} \entry {\code {extraclean \r {Make target}}}{11} \initial {F} \entry {failed \code {mktex\dots {}} script invocation}{14} -\entry {fallback font}{46} -\entry {fallback resolutions}{46} +\entry {fallback font}{44} +\entry {fallback resolutions}{44} \entry {fallback resolutions, overriding}{10} \entry {FAQ, \t {comp.sys.sun.admin}}{28} \entry {FAQ, Kpathsea}{24} -\entry {Farwell, Matthew}{35} +\entry {Farwell, Matthew}{33} \entry {features, of default paths}{6} -\entry {file formats, supported}{41} -\entry {file lookup}{44} +\entry {file formats, supported}{40} +\entry {file lookup}{42} \entry {file permissions}{15} -\entry {file types, registering new}{47} -\entry {filename aliases}{36} -\entry {filename database}{35} +\entry {file types, registering new}{46} +\entry {filename aliases}{35} +\entry {filename database}{34} \entry {filename database generation}{11} -\entry {filenames, absolute or explicitly relative}{30} -\entry {files, unable to find}{25} -\entry {filesystem search}{30} -\entry {floating directories}{30} -\entry {font alias files}{45} +\entry {filenames, absolute or explicitly relative}{29} +\entry {files, unable to find}{24} +\entry {filesystem search}{29} +\entry {floating directories}{29} +\entry {font alias files}{43} \entry {font generation failures}{26} -\entry {font of last resort}{46} +\entry {font of last resort}{44} \entry {font set, infinite}{12} -\entry {fontmap files}{45} +\entry {fontmap files}{43} \entry {\code {fontmaps}}{13} \entry {fontname}{13} -\entry {fontnames, arbitrary length}{45} +\entry {fontnames, arbitrary length}{44} \entry {fonts, being created}{4} -\entry {\code {FOOINPUTS}}{43} +\entry {\code {FOOINPUTS}}{42} \entry {\code {fopen\r {, redefined}}}{23} -\entry {format of external database}{37} +\entry {format of external database}{35} \entry {Free Software Foundation}{19} \entry {FreeBSD \code {configure} error}{27} \entry {FreeBSD shells and \code {configure}}{7} @@ -339,35 +338,35 @@ \entry {German \TeX{} CD info}{19} \entry {\code {get_applicationShellWidgetClass}}{28} \entry {\code {get_wmShellWidgetClass}}{28} -\entry {\code {gf}}{41} -\entry {\code {GFFONTS}}{41} +\entry {\code {gf}}{40} +\entry {\code {GFFONTS}}{40} \entry {globally writable directories}{15} -\entry {glyph lookup}{44} -\entry {glyph lookup bitmap tolerance}{44} -\entry {\code {GLYPHFONTS}}{41, 42} +\entry {glyph lookup}{43} +\entry {glyph lookup bitmap tolerance}{43} +\entry {\code {GLYPHFONTS}}{40, 41} \entry {GNU C compiler bugs}{26} \entry {GNU General Public License}{1} \entry {Gopher CTAN access}{18} \entry {group-writable directories}{15} -\entry {\code {GSFTOPK_DEBUG \r {(128)}}}{23, 24} +\entry {\code {GSFTOPK_DEBUG \r {(128)}}}{23} \entry {GUTenberg}{19} \initial {H} \entry {hash table buckets, printing}{24} -\entry {hash table routines}{48} +\entry {hash table routines}{47} \entry {\code {hash_summary_only \r {variable for debugging}}}{24} \entry {help, mailing list for general \TeX{}}{22} \entry {\code {HIER}}{6} \entry {history of Kpathsea}{1} -\entry {home directories in paths}{33} -\entry {\code {HOME\r {, as ~ expansion}}}{33} -\entry {HP-UX, compiling on}{27} +\entry {home directories in paths}{32} +\entry {\code {HOME\r {, as ~ expansion}}}{32} +\entry {HP-UX, compiling on}{26} \initial {I} -\entry {identifiers, characters valid in}{31} -\entry {illegal pointer combination warnings}{29} -\entry {\code {include \r {fontmap directive}}}{45} -\entry {\code {INDEXSTYLE}}{42} +\entry {identifiers, characters valid in}{30} +\entry {illegal pointer combination warnings}{28} +\entry {\code {include \r {fontmap directive}}}{44} +\entry {\code {INDEXSTYLE}}{41} \entry {\code {info-tex@shsu.edu}}{22} -\entry {input lines, reading}{48} +\entry {input lines, reading}{47} \entry {\code {install-data \r {Make target}}}{11} \entry {\code {install-exec \r {Make target}}}{11} \entry {installation}{3} @@ -378,26 +377,26 @@ \entry {installation, getting executables instead of}{3} \entry {installation, simple}{3} \entry {installing files}{10} -\entry {interactive query}{39} +\entry {interactive query}{38} \entry {interface, not frozen}{1} \entry {introduction}{1} \initial {K} \entry {\samp {kdebug:}}{24} -\entry {\code {kdefault.c}}{33} +\entry {\code {kdefault.c}}{32} \entry {Knuth, Donald E.}{1} \entry {Knuth, Donald E., archive of programs by}{20} \entry {Knuth, Donald E., original author}{18} \entry {Korn shell\r {, losing with \code {configure}}}{7} -\entry {Kpathsea config file, source for path}{31} +\entry {Kpathsea config file, source for path}{30} \entry {Kpathsea version number}{5} -\entry {\code {kpathsea.h}}{47} +\entry {\code {kpathsea.h}}{46} \entry {\code {kpathsea/HIER}}{6} \entry {\code {kpathsea/README.CONFIGURE}}{7} \entry {\code {kpathsea_debug}}{22} -\entry {\code {KPATHSEA_DEBUG}}{22, 47} -\entry {\code {kpathsea_debug \r {variable}}}{48} -\entry {\code {KPSE_BITMAP_TOLERANCE}}{44} -\entry {\code {kpse_cnf_get}}{49} +\entry {\code {KPATHSEA_DEBUG}}{22, 46} +\entry {\code {kpathsea_debug \r {variable}}}{47} +\entry {\code {KPSE_BITMAP_TOLERANCE}}{43} +\entry {\code {kpse_cnf_get}}{48} \entry {\code {KPSE_DEBUG_EXPAND \r {(16)}}}{23} \entry {\code {KPSE_DEBUG_FOPEN \r {(4)}}}{23} \entry {\code {KPSE_DEBUG_HASH \r {(2)}}}{23} @@ -405,41 +404,41 @@ \entry {\code {KPSE_DEBUG_SEARCH \r {(32)}}}{23} \entry {\code {KPSE_DEBUG_STAT \r {(1)}}}{23} \entry {\code {KPSE_DEBUG_VARS \r {(64)}}}{23} -\entry {\code {KPSE_DOT \r {expansion}}}{34} -\entry {\code {kpse_fallback_font}}{46} -\entry {\code {kpse_find_*}}{48} -\entry {\code {kpse_find_file}}{44, 48} -\entry {\code {kpse_find_glyph_format}}{44} -\entry {\code {kpse_format_info}}{48} +\entry {\code {KPSE_DOT \r {expansion}}}{33} +\entry {\code {kpse_fallback_font}}{45} +\entry {\code {kpse_find_*}}{47} +\entry {\code {kpse_find_file}}{43, 47} +\entry {\code {kpse_find_glyph_format}}{43} +\entry {\code {kpse_format_info}}{47} \entry {\code {kpse_format_info_type}}{23} -\entry {\code {kpse_init_prog}}{48} +\entry {\code {kpse_init_prog}}{47} \entry {\code {kpse_init_prog\r {, and \code {MAKETEX_MODE}}}}{6} -\entry {\code {kpse_make_specs}}{13} -\entry {\code {kpse_open_file}}{48} -\entry {\code {kpse_program_name}}{47} -\entry {\code {kpse_set_progname}}{48} -\entry {\code {kpse_set_program_name}}{47} -\entry {\code {kpse_var_value}}{49} -\entry {\code {kpsewhich}}{37} -\entry {Kpsewhich, and debugging}{23} +\entry {\code {kpse_make_specs}}{14} +\entry {\code {kpse_open_file}}{47} +\entry {\code {kpse_program_name}}{46} +\entry {\code {kpse_set_progname}}{47} +\entry {\code {kpse_set_program_name}}{46} +\entry {\code {kpse_var_value}}{48} +\entry {\code {kpsewhich}}{36} +\entry {Kpsewhich, and debugging}{22} \entry {\code {ksh\r {, losing with \code {configure}}}}{7} \initial {L} \entry {\code {labrea.stanford.edu}}{20} \entry {LaserJet drive}{5} -\entry {last-resort font}{46} +\entry {last-resort font}{44} \entry {La\TeX{} help mailing list}{22} -\entry {\code {lcircle10}}{45} +\entry {\code {lcircle10}}{44} \entry {\code {LDFLAGS}}{8} -\entry {leading colons}{32} +\entry {leading colons}{31} \entry {leaf directories wrongly guessed}{25} -\entry {leaf directory trick}{35} -\entry {\code {libdl.a}}{28} +\entry {leaf directory trick}{33} +\entry {\code {libdl.a}}{27} \entry {libraries, changing}{10} \entry {libraries, specifying additional}{8} \entry {\code {LIBS}}{8} \entry {\code {libucb\r {, avoiding}}}{10} \entry {license for using the library}{1} -\entry {lines, reading arbitrary-length}{48} +\entry {lines, reading arbitrary-length}{47} \entry {Linux File System Standard}{13} \entry {Linux shells and \code {configure}}{7} \entry {Linux, using Web2c}{20} @@ -450,42 +449,43 @@ \entry {local cache of fonts}{15} \entry {log file}{24} \entry {logging successful searches}{24} -\entry {\code {lost+found \r {directory}}}{30} -\entry {\code {lostchar}}{46} -\entry {\code {ls-R}}{42} +\entry {\code {lost+found \r {directory}}}{29} +\entry {\code {lostchar}}{45} +\entry {\code {ls-R}}{41} \entry {\code {ls-R \r {and AFS}}}{11} -\entry {\code {ls-R \r {database file}}}{35} -\entry {\code {ls-R\r {, simplest build}}}{36} +\entry {\code {ls-R \r {database file}}}{34} +\entry {\code {ls-R\r {, simplest build}}}{34} \initial {M} \entry {Mach10 \code {configure} error}{27} \entry {Macintosh \TeX{} implementations}{20} -\entry {MacKenzie, David}{2, 35} -\entry {magic characters}{30} +\entry {MacKenzie, David}{2, 33} +\entry {magic characters}{29} \entry {mailing lists}{22} \entry {\code {maintainer-clean \r {Make target}}}{11} \entry {Make arguments, additional}{10} \entry {\code {make\r {, running}}}{10} \entry {\code {Makefile.in}}{7} \entry {Makefiles, empty}{27} -\entry {\code {MAKETEX_DEBUG \r {(512)}}}{23, 24} -\entry {\code {MAKETEX_FINE_DEBUG \r {(1024)}}}{23, 24} +\entry {\code {MAKETEX_DEBUG \r {(512)}}}{23} +\entry {\code {MAKETEX_FINE_DEBUG \r {(1024)}}}{24} \entry {\code {MAKETEX_MODE}}{6} -\entry {memory allocation routines}{48} +\entry {memory allocation routines}{47} +\entry {metafont driver files}{13} \entry {Metafont failures}{26} \entry {Metafont installation}{26} \entry {Metafont making too-large fonts}{26} \entry {Metafont using the wrong resolution}{26} -\entry {\code {MFBASES}}{41} -\entry {\code {MFINPUTS}}{42} -\entry {\code {MFPOOL}}{42} -\entry {\code {MFTINPUTS}}{42} +\entry {\code {MFBASES}}{40} +\entry {\code {MFINPUTS}}{41} +\entry {\code {MFPOOL}}{41} +\entry {\code {MFTINPUTS}}{41} \entry {mirrors, FTP}{18} -\entry {mismatched checksum warnings}{46} +\entry {mismatched checksum warnings}{45} \entry {\code {missfont.log}}{14} \entry {\code {MISSFONT_LOG}}{14} -\entry {missing character warnings}{46} +\entry {missing character warnings}{45} \entry {\file {mktex} script configuration}{12} -\entry {\file {mktex} script names}{13} +\entry {\file {mktex} script names}{14} \entry {\file {mktex} scripts}{12} \entry {\code {mktex.cnf}}{12} \entry {\code {mktex.opt}}{12} @@ -498,41 +498,40 @@ \entry {mode directory, omitting}{13} \entry {Morgan, Tim}{1} \entry {\code {mostlyclean \r {Make target}}}{11} -\entry {\code {MPINPUTS}}{42} -\entry {\code {MPMEMS}}{42} -\entry {\code {MPPOOL}}{42} -\entry {\code {MPSUPPORT}}{42} +\entry {\code {MPINPUTS}}{41} +\entry {\code {MPMEMS}}{41} +\entry {\code {MPPOOL}}{41} +\entry {\code {MPSUPPORT}}{41} \entry {\code {MT_FEATURES}}{12} \entry {multiple architectures, compiling on}{9} \entry {multiple architectures, directories for}{9} \entry {multiple architectures, installing on}{11} -\entry {multiple \TeX{} hierarchies}{34} -\entry {must exist}{30} +\entry {multiple \TeX{} hierarchies}{33} +\entry {must exist}{29} \initial {N} -\entry {names for \file {mktex} scripts}{13} +\entry {names for \file {mktex} scripts}{14} \entry {NetBSD \code {configure} error}{27} \entry {NetBSD shells and \code {configure}}{7} \entry {Neumann, Gustaf}{2} \entry {newsgroup for \TeX{}}{22} \entry {NeXT \code {sed} error}{27} \entry {NeXT, lacking X11}{5} -\entry {NFS and \file {ls-R}}{36} +\entry {NFS and \file {ls-R}}{35} \entry {NFS CTAN access}{18} +\entry {\code {nomfdrivers}}{13} \entry {\code {nomode}}{13} \entry {non-English typesetting}{5} \entry {non-Unix operating systems}{4} -\entry {Northwest Computing Support Center}{20} -\entry {NTG}{19} +\entry {\code {none}}{45} +\entry {NTG}{20} \entry {null pointers, dereferencing}{21} -\entry {numeric debugging values}{23} +\entry {numeric debugging values}{22} \initial {O} \entry {obtaining \TeX{}}{17} -\entry {obtaining \TeX{} on tape}{20} \entry {obtaining Web2c by ftp}{17} \entry {obtaining Web2c on CD-ROM}{19} -\entry {\code {OCPINPUTS}}{42} -\entry {\code {office@tug.org}}{1} -\entry {\code {OFMFONTS}}{42} +\entry {\code {OCPINPUTS}}{41} +\entry {\code {OFMFONTS}}{41} \entry {online Metafont display, spurious}{26} \entry {OpenWin libraries, dynamic linking problems}{28} \entry {optimization caveat}{26} @@ -541,33 +540,33 @@ \entry {options to \code {configure}}{7} \entry {OS/2 support}{4} \entry {other \TeX{} distributions}{20} -\entry {\code {OTPINPUTS}}{42} -\entry {overview of path searching}{30} -\entry {overview of programming with Kpathsea}{47} -\entry {\code {OVFFONTS}}{42} -\entry {\code {OVPFONTS}}{42} +\entry {\code {OTPINPUTS}}{41} +\entry {overview of path searching}{29} +\entry {overview of programming with Kpathsea}{46} +\entry {\code {OVFFONTS}}{41} +\entry {\code {OVPFONTS}}{41} \initial {P} \entry {patches, Sun OpenWin}{28} -\entry {path expansion}{32} -\entry {path searching}{30} -\entry {path searching options}{38} -\entry {path searching, overview}{30} -\entry {path searching, standalone}{37} -\entry {path sources}{31} +\entry {path expansion}{31} +\entry {path searching}{29} +\entry {path searching options}{36} +\entry {path searching, overview}{29} +\entry {path searching, standalone}{36} +\entry {path sources}{30} \entry {paths, changing default}{5, 6} \entry {paths, device name included in}{6} \entry {\code {paths.h}}{7} \entry {\code {paths.h\r {, creating}}}{10} -\entry {\code {pathsearch.h}}{47} +\entry {\code {pathsearch.h}}{46} \entry {\code {pc \r {Pascal compiler}}}{1} \entry {PCL driver}{5} \entry {PDF generation}{5} -\entry {permission denied}{30} +\entry {permission denied}{29} \entry {permissions, directory}{15} \entry {permissions, file}{15} -\entry {\code {PKFONTS}}{42} +\entry {\code {PKFONTS}}{41} \entry {\code {plain.base}}{26} -\entry {pointer combination warnings}{29} +\entry {pointer combination warnings}{28} \entry {PostScript driver}{5} \entry {PostScript fonts, additional}{4} \entry {precompiled executables, instead of installation}{3} @@ -579,61 +578,61 @@ \entry {privacy, semblance of}{24} \entry {problems, common}{24} \entry {\code {proginit.c}}{6} -\entry {\code {proginit.h}}{48} -\entry {program-varying paths}{41} -\entry {\code {program_invocation_name}}{47} -\entry {\code {program_invocation_short_name}}{47} -\entry {programming overview}{47} -\entry {programming with config files}{49} -\entry {programming with Kpathsea}{47} +\entry {\code {proginit.h}}{47} +\entry {program-varying paths}{40} +\entry {\code {program_invocation_name}}{46} +\entry {\code {program_invocation_short_name}}{46} +\entry {programming overview}{46} +\entry {programming with config files}{48} +\entry {programming with Kpathsea}{46} \entry {programs using the library}{1} \entry {proof mode}{26} -\entry {\code {PSHEADERS}}{42} +\entry {\code {PSHEADERS}}{41} \entry {\code {pxp \r {Pascal preprocessor}}}{1} \initial {Q} -\entry {quoting variable values}{33} +\entry {quoting variable values}{32} \initial {R} -\entry {\code {readable}}{46} -\entry {reading arbitrary-length lines}{48} +\entry {\code {readable}}{45} +\entry {reading arbitrary-length lines}{47} \entry {\code {README.CONFIGURE}}{7} \entry {\code {README.mirrors}}{18} \entry {recording successful searches}{24} -\entry {relative filenames}{30} +\entry {relative filenames}{29} \entry {relative filenames in \file {ls-R}}{11} \entry {reporting bugs}{20} -\entry {\code {resident.c}}{48} -\entry {resolution, setting}{38} +\entry {\code {resident.c}}{47} +\entry {resolution, setting}{37} \entry {resolution, wrong}{26} -\entry {resolutions, last-resort}{46} +\entry {resolutions, last-resort}{44} \entry {retrieving \TeX{}}{17} -\entry {right-hand side of variable assignments}{32} +\entry {right-hand side of variable assignments}{30} \entry {Rokicki, Tom}{1} -\entry {\t {root} user}{34} -\entry {runtime configuration files}{31} +\entry {\t {root} user}{32} +\entry {runtime configuration files}{30} \entry {runtime debugging}{22} \initial {S} \entry {Sauter fonts, and dynamic source creation}{12} \entry {scripts for file creation}{12} -\entry {search path, defined}{30} +\entry {search path, defined}{29} \entry {search paths, changing default}{5} -\entry {searching for files}{44} -\entry {searching for glyphs}{44} -\entry {searching overview}{30} -\entry {searching the database}{30} -\entry {searching the disk}{30} +\entry {searching for files}{42} +\entry {searching for glyphs}{43} +\entry {searching overview}{29} +\entry {searching the database}{29} +\entry {searching the disk}{29} \entry {security considerations}{15} \entry {\code {sed \r {error from \code {configure}}}}{27} -\entry {SELFAUTODIR}{47} -\entry {SELFAUTOLOC}{47} -\entry {SELFAUTOPARENT}{47} +\entry {SELFAUTODIR}{46} +\entry {SELFAUTOLOC}{46} +\entry {SELFAUTOPARENT}{46} \entry {sending patches}{21} \entry {setgid scripts}{15} \entry {\code {sh5\r {, ok with \code {configure}}}}{7} \entry {shar\r {, recommended}}{21} \entry {shared library, making}{9} -\entry {shell scripts as configuration files}{32} -\entry {shell variables}{33} -\entry {\code {shell_escape\r {, example for code}}}{49} +\entry {shell scripts as configuration files}{31} +\entry {shell variables}{32} +\entry {\code {shell_escape\r {, example for code}}}{48} \entry {shells and \code {configure}}{7} \entry {simple installation}{3} \entry {site overrides for \code {mktex\dots {}}}{12} @@ -641,152 +640,150 @@ \entry {skeleton \TeX{} directory}{15} \entry {slow startup time}{25} \entry {Solaris BSD compatibility, not}{10} -\entry {\code {source files}}{43} -\entry {sources for search paths}{31} -\entry {\code {special}}{46} -\entry {\code {st_nlink}}{35} +\entry {\code {source files}}{41} +\entry {sources for search paths}{30} +\entry {\code {special}}{45} +\entry {\code {st_nlink}}{33} \entry {stack trace}{21} -\entry {standalone path searching}{37} +\entry {standalone path searching}{36} \entry {standard error and debugging output}{22} -\entry {standard options}{40} +\entry {standard options}{39} \entry {startup time, excessive}{25} \entry {static linking}{28} -\entry {static linking and \code {dlsym}}{28} -\entry {string routines}{48} +\entry {static linking and \code {dlsym}}{27} +\entry {string routines}{47} \entry {\code {strip}}{13} \entry {\code {stripsupplier}}{13} \entry {\code {striptypeface}}{13} -\entry {subdirectory searching}{34} +\entry {subdirectory searching}{33} \entry {suggestions, making}{1} \entry {Sun 2}{1} \entry {Sun OpenWin patches}{28} \entry {supplier directory, omitting}{13} -\entry {support organization}{20} -\entry {supported file formats}{41} -\entry {suppressing warnings}{46} +\entry {supported file formats}{40} +\entry {suppressing warnings}{45} \entry {symbolic link trees, for multiple architectures}{9} \entry {symbolic links not found}{25} -\entry {symbolic links, and \file {ls-R}}{36} -\entry {symlinks, resolving}{47} +\entry {symbolic links, and \file {ls-R}}{35} +\entry {symlinks, resolving}{46} \entry {system C compiler bugs}{26} \entry {system dependencies}{7} \entry {system V universe}{10} \initial {T} -\entry {\code {T1FONTS}}{43} -\entry {\code {T1INPUTS}}{43} -\entry {\code {T42FONTS}}{43} -\entry {tape distribution}{20} +\entry {\code {T1FONTS}}{42} +\entry {\code {T1INPUTS}}{42} +\entry {\code {T42FONTS}}{42} \entry {TDS}{15} \entry {testing, post-installation}{14} \entry {tests, simple}{4} \entry {te\TeX{}}{20} \entry {\code {tex-archive@math.utah.edu}}{22} -\entry {\code {tex-file.c}}{44} -\entry {\code {tex-file.h}}{47} -\entry {\code {tex-glyph.c}}{44} -\entry {\code {tex-glyph.h}}{47} +\entry {\code {tex-file.c}}{43} +\entry {\code {tex-file.h}}{46} +\entry {\code {tex-glyph.c}}{43} +\entry {\code {tex-glyph.h}}{46} \entry {\code {tex-k-request@mail.tug.org}}{22} \entry {\code {tex-k@mail.tug.org \r {(bug address)}}}{20} -\entry {\code {tex-make.c}}{13} -\entry {\code {TEX_HUSH}}{30, 46} +\entry {\code {tex-make.c}}{14} +\entry {\code {TEX_HUSH}}{29, 45} \entry {\TeX{} directory structure}{15} \entry {\TeX{} distributions besides Web2c}{20} -\entry {\TeX{} environment variables}{41} +\entry {\TeX{} environment variables}{40} \entry {\TeX{} failures}{26} -\entry {\TeX{} file lookup}{44} -\entry {\TeX{} glyph lookup}{44} +\entry {\TeX{} file lookup}{42} +\entry {\TeX{} glyph lookup}{43} \entry {\TeX{} help mailing list}{22} \entry {\TeX{} hierarchy, one}{9} \entry {\TeX{} Live CD-ROM}{19} -\entry {\TeX{} support}{41} +\entry {\TeX{} support}{40} \entry {\TeX{} Users Group}{1} -\entry {\code {TEXBIB}}{41} -\entry {\code {TEXCONFIG}}{41} -\entry {\code {TEXDOCS}}{43} -\entry {\code {TEXFONTMAPS}}{42} -\entry {\code {TEXFONTS}}{41, 42, 43} -\entry {\code {texfonts.map}}{45} -\entry {\code {TEXFORMATS}}{41} -\entry {\code {TEXINDEXSTYLE}}{42} -\entry {\code {TEXINPUTS}}{42} +\entry {\code {TEXBIB}}{40} +\entry {\code {TEXCONFIG}}{40} +\entry {\code {TEXDOCS}}{41} +\entry {\code {TEXFONTMAPS}}{41} +\entry {\code {TEXFONTS}}{40, 41, 42} +\entry {\code {texfonts.map}}{43} +\entry {\code {TEXFORMATS}}{40} +\entry {\code {TEXINDEXSTYLE}}{41} +\entry {\code {TEXINPUTS}}{40, 41} \entry {\code {TEXMF}}{15} -\entry {\code {texmf.cnf\r {, and variable expansion}}}{33} +\entry {\code {texmf.cnf\r {, and variable expansion}}}{32} \entry {\code {texmf.cnf\r {, creating}}}{10} -\entry {\code {texmf.cnf\r {, definition for}}}{31} +\entry {\code {texmf.cnf\r {, definition for}}}{30} \entry {\code {texmf.cnf\r {, generated}}}{6} -\entry {\code {texmf.cnf\r {, source for path}}}{31} +\entry {\code {texmf.cnf\r {, source for path}}}{30} \entry {\code {texmf.in}}{6} \entry {\code {texmf.in\r {, editing}}}{5} \entry {\code {texmf.sed}}{6} -\entry {\code {TEXMFCNF}}{31, 41} -\entry {\code {TEXMFDBS}}{35, 42} -\entry {\code {TEXMFINI}}{41, 42} +\entry {\code {TEXMFCNF}}{30, 40} +\entry {\code {TEXMFDBS}}{34, 41} +\entry {\code {TEXMFINI}}{40, 41} \entry {\code {TEXMFLOG}}{24} \entry {\code {TEXMFOUTPUT}}{14} -\entry {\code {TEXPICTS}}{42} -\entry {\code {TEXPKS}}{42} -\entry {\code {TEXPOOL}}{43} -\entry {\code {TEXPSHEADERS}}{42, 43} -\entry {\code {TEXSIZES}}{46} -\entry {\code {TEXSOURCES}}{43} -\entry {\code {TFMFONTS}}{43} -\entry {tilde expansion}{33} -\entry {\code {tilde.c}}{34} +\entry {\code {TEXPICTS}}{40} +\entry {\code {TEXPKS}}{41} +\entry {\code {TEXPOOL}}{42} +\entry {\code {TEXPSHEADERS}}{41, 42} +\entry {\code {TEXSIZES}}{44} +\entry {\code {TEXSOURCES}}{41} +\entry {\code {TFMFONTS}}{42} +\entry {tilde expansion}{32} +\entry {\code {tilde.c}}{33} \entry {\code {time \r {system call}}}{24} -\entry {tolerance for glyph lookup}{44} +\entry {tolerance for glyph lookup}{43} \entry {total disk space}{4} -\entry {trailing \samp {/} in home directory}{34} -\entry {trailing colons}{32} -\entry {\code {TRFONTS}}{43} -\entry {trick for detecting leaf directories}{35} +\entry {trailing \samp {/} in home directory}{32} +\entry {trailing colons}{31} +\entry {\code {TRFONTS}}{42} +\entry {trick for detecting leaf directories}{33} \entry {trojan horse attack}{15} -\entry {\code {TTFONTS}}{43} +\entry {\code {TTFONTS}}{42} \entry {TUG}{19} \entry {\code {tug.org}}{17} +\entry {\code {tug@tug.org}}{1} \entry {typeface directory, omitting}{13} \initial {U} \entry {\code {ucbinclude\r {, avoiding}}}{10} \entry {UKTUG}{19} \entry {Ultrix shells and \code {configure}}{7} -\entry {unable to find files}{25} +\entry {unable to find files}{24} \entry {unable to generate fonts}{26} \entry {\code {uname}}{21} \entry {universe, BSD vs.\spacefactor =1000 system V}{10} -\entry {\code {UNIX_ST_LINK}}{35} +\entry {\code {UNIX_ST_LINK}}{34} \entry {\code {unixtex.ftp}}{17} -\entry {\code {unixtex@u.washington.edu}}{20} -\entry {unknown special warnings}{46} -\entry {unreadable file warnings}{46} -\entry {unreadable files}{30} -\entry {unusable \file {ls-R} warning}{36} +\entry {unknown special warnings}{45} +\entry {unreadable file warnings}{45} +\entry {unreadable files}{29} +\entry {unusable \file {ls-R} warning}{35} \entry {usage patterns, finding}{24} \entry {\code {USE_VARTEXFONTS}}{13} \entry {Usenet \TeX{} newsgroup}{22} \initial {V} \entry {\code {varfonts}}{13} -\entry {variable expansion}{33} -\entry {\code {variable.c}}{33} -\entry {\code {variable.h}}{49} +\entry {variable expansion}{32} +\entry {\code {variable.c}}{32} +\entry {\code {variable.h}}{48} \entry {\code {VARTEXFONTS}}{13} \entry {VAX 11/750}{1} \entry {version number, of Kpathsea}{5} \entry {version numbers, determining}{21} -\entry {VF files, not found}{30} -\entry {\code {VFFONTS}}{43} +\entry {VF files, not found}{29} +\entry {\code {VFFONTS}}{42} \entry {VMS support}{4} \entry {VMS \TeX{} implementations}{20} \entry {Vojta, Paul}{2} \initial {W} \entry {Walnut Creek \TeX{} CD-ROM}{20} \entry {Walsh, Norman}{2} -\entry {warning about unusable \file {ls-R}}{36} -\entry {warnings, file access}{30} -\entry {warnings, pointer combinations}{29} -\entry {warnings, suppressing}{46} -\entry {\code {wcstombs}}{28} +\entry {warning about unusable \file {ls-R}}{35} +\entry {warnings, file access}{29} +\entry {warnings, pointer combinations}{28} +\entry {warnings, suppressing}{45} +\entry {\code {wcstombs}}{27} \entry {Weber, Olaf}{2} -\entry {whitespace, in fontmap files}{45} -\entry {whitespace, not ignored on continuation lines}{31} +\entry {whitespace, in fontmap files}{44} +\entry {whitespace, not ignored on continuation lines}{30} \entry {Windows \TeX{} implementations}{20} \entry {World Wide Web CTAN access}{18} \entry {\code {www.tug.org}}{17} @@ -796,9 +793,9 @@ \entry {\code {XCFLAGS}}{10} \entry {\code {XCPPFLAGS}}{10} \entry {\code {XDEFS}}{10} -\entry {\code {XDVIFONTS}}{43} +\entry {\code {XDVIFONTS}}{42} \entry {\code {XDVIMAKEPK}}{14} -\entry {\code {XDVISIZES}}{46} +\entry {\code {XDVISIZES}}{44} \entry {\code {XLDFLAGS}}{10} \entry {\code {XLOADLIBES}}{10} \entry {\code {XMAKEARGS}}{10} diff -Naur xdvik-22.40n/texk/kpathsea/kpathsea.h xdvik-22.40o/texk/kpathsea/kpathsea.h --- xdvik-22.40n/texk/kpathsea/kpathsea.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/kpathsea.h Wed Oct 16 22:26:22 2002 @@ -1,48 +1,49 @@ -#include "kpathsea/config.h" -#include "kpathsea/absolute.h" -#include "kpathsea/c-ctype.h" -#include "kpathsea/c-dir.h" -#include "kpathsea/c-errno.h" -#include "kpathsea/c-fopen.h" -#include "kpathsea/c-limits.h" -#include "kpathsea/c-memstr.h" -#include "kpathsea/c-minmax.h" -#include "kpathsea/c-namemx.h" -#include "kpathsea/c-pathch.h" -#include "kpathsea/c-pathmx.h" -#include "kpathsea/c-proto.h" -#include "kpathsea/c-stat.h" -#include "kpathsea/c-std.h" -#include "kpathsea/c-unistd.h" -#include "kpathsea/c-vararg.h" -#include "kpathsea/cnf.h" -#include "kpathsea/concatn.h" -#include "kpathsea/db.h" -#include "kpathsea/debug.h" -#include "kpathsea/default.h" -#include "kpathsea/expand.h" -#include "kpathsea/fn.h" -#include "kpathsea/fontmap.h" -#include "kpathsea/getopt.h" -#include "kpathsea/hash.h" -#include "kpathsea/lib.h" -#include "kpathsea/line.h" -#include "kpathsea/magstep.h" -#include "kpathsea/paths.h" -#include "kpathsea/pathsearch.h" -#include "kpathsea/proginit.h" -#include "kpathsea/progname.h" -#include "kpathsea/readable.h" -#include "kpathsea/str-list.h" -#include "kpathsea/str-llist.h" -#include "kpathsea/systypes.h" -#include "kpathsea/tex-file.h" -#include "kpathsea/tex-glyph.h" -#include "kpathsea/tex-hush.h" -#include "kpathsea/tex-make.h" -#include "kpathsea/tilde.h" -#include "kpathsea/truncate.h" -#include "kpathsea/types.h" -#include "kpathsea/variable.h" -#include "kpathsea/xopendir.h" -#include "kpathsea/xstat.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff -Naur xdvik-22.40n/texk/kpathsea/kpathsea.info xdvik-22.40o/texk/kpathsea/kpathsea.info --- xdvik-22.40n/texk/kpathsea/kpathsea.info Sat May 19 11:20:13 2001 +++ xdvik-22.40o/texk/kpathsea/kpathsea.info Wed Oct 16 22:26:22 2002 @@ -14,7 +14,7 @@ This file documents the Kpathsea library for path searching. - Copyright (C) 1993, 94, 95, 96, 97 K. Berry & O. Weber. + Copyright (C) 1993-2001 K. Berry & O. Weber. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are @@ -31,94 +31,4269 @@ translation approved by the Free Software Foundation.  -Indirect: -kpathsea.info-1: 1415 -kpathsea.info-2: 50811 -kpathsea.info-3: 99708 -kpathsea.info-4: 139709 +File: kpathsea.info, Node: Top, Next: Introduction, Up: (dir) + +Kpathsea library +**************** + + This manual documents how to install and use the Kpathsea library for +filename lookup. It corresponds to version 3.3.8, released in +October 2002. + +* Menu: + +* Introduction:: Overview. +* Installation:: Compilation, installation, and bug reporting. + +* Path searching:: How filename lookups work. +* TeX support:: Special support for TeX-related file lookups. + +* Programming:: How to use Kpathsea features in your program. + +* Index:: General index. + + +File: kpathsea.info, Node: Introduction, Next: Installation, Prev: Top, Up: Top + +Introduction +************ + + This manual corresponds to version 3.3.8 of the Kpathsea library, +released in October 2002. + + The library's fundamental purpose is to return a filename from a list +of directories specified by the user, similar to what shells do when +looking up program names to execute. + + The following software, all of which we maintain, uses this library: + + * Dviljk (see the `dvilj' man page) + + * Dvipsk (*note Introduction: (dvips)Top.) + + * GNU font utilities (*note Introduction: (fontu)Top.) + + * Web2c (*note Introduction: (web2c)Top.) + + * Xdvik (see the `xdvi' man page) + +Other software that we do not maintain also uses it. + + We are still actively maintaining the library (and probably always +will be, despite our hopes). If you have comments or suggestions, +please send them to us (*note Reporting bugs::). + + We distribute the library under the GNU Library General Public License +(LGPL). In short, this means if you write a program using the library, +you must (offer to) distribute the source to the library, along with any +changes you have made, and allow anyone to modify the library source and +distribute their modifications. It does not mean you have to distribute +the source to your program, although we hope you will. See the files +`COPYING' and `COPYING.LIB' for the text of the GNU licenses. + + If you know enough about TeX to be reading this manual, then you (or +your institution) should consider joining the TeX Users Group (if +you're already a member, great!). TUG produces the periodical +`TUGboat', sponsors an annual meeting and publishes the proceedings, +and arranges courses on TeX for all levels of users throughout the +world. Anyway, here is the address: + + TeX Users Group + P.O. Box 2311 + Portland OR 97208-2311 + USA + phone: +1 503 223-9994 + fax: +1 503 223-3960 + email: + +* Menu: + +* History:: + + +File: kpathsea.info, Node: History, Up: Introduction + +History +======= + + (This section is for those people who are curious about how the +library came about.) (If you like to read historical accounts of +software, we urge you to seek out the GNU Autoconf manual and the +"Errors of TeX" paper by Don Knuth, published in `Software--Practice and +Experience' 19(7), July 1989.) + + [Karl writes.] My first ChangeLog entry for Web2c seems to be +February 1990, but I may have done some work before then. In any case, +Tim Morgan and I were jointly maintaining it for a time. (I should +mention here that Tim had made Web2c into a real distribution long +before I had ever used it or even heard of it, and Tom Rokicki did the +original implementation. I was using `pxp' and `pc' on VAX 11/750's +and the hot new Sun 2 machines.) + + It must have been later in 1990 and 1991 that I started working on +`TeX for the Impatient'. Dvips, Xdvi, Web2c, and the GNU fontutils +(which I was also writing at the time) all used different environment +variables, and, more importantly, had different bugs in their path +searching. This became extremely painful, as I was stressing everything +to the limit working on the book. I also desperately wanted to +implement subdirectory searching, since I couldn't stand putting +everything in one big directory, and also couldn't stand having to +explicitly specify `cm', `pandora', ... in a path. + + In the first incarnation, I just hacked separately on each +program--that was the original subdirectory searching code in both Xdvi +and Dvips, though I think Paul Vojta has completely rewritten Xdvi's +support by now. That is, I tried to go with the flow in each program, +rather than changing the program's calling sequences to conform to +common routines. + + Then, as bugs inevitably appeared, I found I was fixing the same thing +three times (Web2c and fontutils were always sharing code, since I +maintained those--there was no Dvipsk or Xdvik or Dviljk at this +point). After a while, I finally started sharing source files. They +weren't yet a library, though. I just kept things up to date with shell +scripts. (I was developing on a 386 running ISC 2.2 at the time, and so +didn't have symbolic links. An awful experience.) + + The ChangeLogs for Xdvik and Dvipsk record initial releases of those +distributions in May and June 1992. I think it was because I was tired +of the different configuration strategies of each program, not so much +because of the path searching. (Autoconf was being developed by David +MacKenzie and others, and I was adapting it to TeX and friends.) + + I started to make a separate library that other programs could link +with on my birthday in April 1993, according to the ChangeLog. I don't +remember exactly why I finally took the time to make it a separate +library; a conversation with david zuhn that initiated it. Just seemed +like it was time. + + Dviljk got started in March 1994 after I bought a Laserjet 4. +(Kpathsea work got suspended while Norm Walsh and I, with Gustaf +Neumann's help, implemented a way for TeX to get at all those neat +builtin LJ4 fonts ... such a treat to have something to typeset in +besides Palatino!) + + By spring of 1995, I had implemented just about all the path-searching +features in Kpathsea that I plan to, driven beyond my initial goals by +Thomas Esser and others. I then started to integrate Web2c with +Kpathsea. After the release of a stable Web2c, I hope to be able to stop +development, and turn most of my attention back to making fonts for GNU. +(Always assuming Micros**t hasn't completely obliterated Unix by then, +or that software patents haven't stopped software development by anybody +smaller than a company with a million-dollar-a-year legal budget. Which +is actually what I think is likely to happen, but that's another +story...) + + [Olaf writes.] At the end of 1997, UNIX is still alive and kicking, +individuals still develop software, and Web2c development still +continues. Karl had been looking for some time for someone to take up +part of the burden, and I volunteered. + + +File: kpathsea.info, Node: Installation, Next: Path searching, Prev: Introduction, Up: Top + +Installation +************ + + (A copy of this chapter is in the distribution file +`kpathsea/INSTALL'.) + + The procedure for Kpathsea (and Web2c, etc.) configuration and +installation follows. If you encounter trouble, see *Note Common +problems::, a copy of which is in the file `kpathsea/BUGS'. + +* Menu: + +* Simple installation:: If you just want to do it. +* Custom installation:: If you want to change things around. +* Security:: Who can write what files, etc. +* TeX directory structure:: Managing the horde of TeX input files. +* unixtex.ftp:: Getting software via FTP, on CD-ROM, or on tape. +* Reporting bugs:: Where and how to report bugs. + + +File: kpathsea.info, Node: Simple installation, Next: Custom installation, Up: Installation + +Simple installation +=================== + + Installing TeX and friends for the first time can be a daunting +experience. Thus, you may prefer to skip this whole thing and just get +precompiled executables: see *Note unixtex.ftp::. + + This section explains what to do if you wish to take the defaults for +everything, and generally to install in the simplest possible way. Most +steps here refer to corresponding subsection in the next section which +explains how to override defaults and generally gives more details. + + By default everything will be installed under `/usr/local' and the +following discussion assumes this. However, if you already have TeX +installed, its location is used to derive the directory under which +everything is to be installed. + + 1. Be sure you have enough disk space: approximately 8 megabytes for + the compressed archives, 15MB for sources, 50MB for compilation, + 40MB for the (initial) installed system (including library files). + *Note Disk space::. + + 2. Retrieve these distribution archives: + + These are the sources, which you will be compiling. + + + This is a basic set of input files. You should unpack it in + the directory `/usr/local/share'; doing so will create a + `texmf' subdirectory there. + + These archives are mirrored on the CTAN hosts, in the + `systems/web2c' directory. + + *Note Kpathsea application distributions::. + + 3. When using the default search paths, there is no need to edit any + distribution files. *Note Changing search paths::. + + 4. At the top level of the distribution, run `sh configure'. (If you + have the GNU Bash shell installed, run `bash configure'.) *Note + Running configure::. + + 5. `make'. *Note Running make::. If you are using a BSD 4.4 system + such as FreeBSD or NetBSD, you may have to use GNU make (often + installed in `/usr/local/bin'), not the BSD make. + + 6. `make install'. *Note Installing files::. + + 7. `make distclean'. *Note Cleaning up::. + + 8. Set up a cron job to rebuild the filename database that makes + searching faster. This line will rebuild it every midnight: + 0 0 * * * cd /usr/local/share/texmf && /BINDIR/mktexlsr + *Note Filename database generation::, and *Note Filename + database::. + + 9. If you're installing Dvips, you also need to set up configuration + files for your printers and make any additional PostScript fonts + available. *Note Installation: (dvips)Installation. If you have + any color printers, see *Note Color device configuration: + (dvips)Color device configuration. + + 10. The first time you run a DVI driver, a bunch of PK fonts will be + built by Metafont via `mktexpk' (and added to the filename + database). This will take some time. Don't be alarmed; they will + created only this first time (unless something is wrong with your + path definitions). + + By default, `mktexpk' will create these fonts in a hierarchy under + `/var/tmp/texfonts'; it simply assumes that `/var/tmp' exists and + is globally writable. If you need a different arrangement, see + *Note mktex configuration::. + + *Note mktex scripts::. + + 11. For some simple tests, try `tex story \\bye' and `latex sample2e'. + Then run `xdvi story' or `dvips sample2e' on the resulting DVI + files to preview/print the documents. *Note Installation + testing::. + + +File: kpathsea.info, Node: Custom installation, Next: Security, Prev: Simple installation, Up: Installation + +Custom installation +=================== + + Most sites need to modify the default installation procedure in some +way, perhaps merely changing the prefix from `/usr/local', perhaps +adding extra compiler or loader options to work around `configure' +bugs. This section explains how to override default choices. For +additional distribution-specific information: + * `dviljk/INSTALL'. + + * *Note Installation: (dvips)Installation. + + * *Note Installation: (web2c)Installation. + + * `xdvik/INSTALL'. + + These instructions are for Unix systems. Other operating-system +specific distributions have their own instructions. The code base +itself supports Amiga, DOS, OS/2, and VMS. + + Following are the same steps as in the previous section (which +describes the simplest installation), but with much more detail. + +* Menu: + +* Disk space:: +* Kpathsea application distributions:: +* Changing search paths:: +* Running configure:: +* Running make:: +* Installing files:: +* Cleaning up:: +* Filename database generation:: +* mktex scripts:: +* Installation testing:: + + +File: kpathsea.info, Node: Disk space, Next: Kpathsea application distributions, Up: Custom installation + +Disk space +---------- + + Here is a table showing the disk space needed for each distribution +(described in the next section). The `(totals)' line reflects the +`texk' source distribution and `texklib'; the individual distributions +don't enter into it. Sizes are in megabytes. All numbers are +approximate. + +Distribution .tar.gz Unpacked Compiled Installed +dviljk .9 3.8 +dvipsk .9 3.2 +xdvik .7 2.5 +web2c 1.3 5.0 +web 1.9 6.5 - - +texk 7.5 32.1 95.3 33.5 +texklib 6.3 15.0 - 15.0 +(totals) 14.6 47.1 95.3 48.5 + + +File: kpathsea.info, Node: Kpathsea application distributions, Next: Changing search paths, Prev: Disk space, Up: Custom installation + +Kpathsea application distributions +---------------------------------- + + The archive contains all of the +Kpathsea applications I maintain, and the library itself. For example, +since NeXT does not generally support X11, you'd probably want to skip +`xdvik' (or simply remove it after unpacking `texk.tar.gz'. If you are +not interested in all of them, you can also retrieve them separately: + +`dviljk.tar.gz' + DVI to PCL, for LaserJet printers. + +`dvipsk.tar.gz' + DVI to PostScript, for previewers, printers, or PDF generation. + +`web2c.tar.gz' + The software needed to compile TeX and friends. + +`web.tar.gz' + The original WEB source files, also used in compilation. + +`xdvik.tar.gz' + DVI previewing under the X window system. + + If you want to use the Babel LaTeX package for support of non-English +typesetting, you may need to retrieve additional files. See the file +`install.txt' in the Babel distribution. + + +File: kpathsea.info, Node: Changing search paths, Next: Running configure, Prev: Kpathsea application distributions, Up: Custom installation + +Changing search paths +--------------------- + + If the search paths for your installation differ from the standard +TeX directory structure (*note Introduction: (tds)Top.), edit the file +`kpathsea/texmf.in' as desired, before running `configure'. For +example, if you have all your fonts or macros in one big directory. + + You may also wish to edit the file `mktex.cnf', either before or +after installation, to control various aspects of `mktexpk' and +friends. *Note mktex configuration::. + + You do not need to edit `texmf.in' to change the default top-level or +other installation _directories_ (only the paths). You can and should +do that when you run `configure' (next step). + + You also do not need to edit `texmf.in' if you are willing to rely on +`texmf.cnf' at runtime to define the paths, and let the compile-time +default paths be incorrect. Usually there is no harm in doing this. + + The section below explains default generation in more detail. + +* Menu: + +* Default path features:: +* Default path generation:: + + +File: kpathsea.info, Node: Default path features, Next: Default path generation, Up: Changing search paths + +Default path features +..................... + + The purpose of having all the different files described in the section +above is to avoid having the same information in more than one place. If +you change the installation directories or top-level prefix at +`configure'-time, those changes will propagate through the whole +sequence. And if you change the default paths in `texmf.in', those +changes are propagated to the compile-time defaults. + + The Make definitions are all repeated in several Makefile's; but +changing the top-level `Makefile' should suffice, as it passes down all +the variable definitions, thus overriding the submakes. (The +definitions are repeated so you can run Make in the subdirectories, if +you should have occasion to.) + + By default, the bitmap font paths end with `/$MAKETEX_MODE', thus +including the device name (usually a Metafont mode name such as +`ljfour'). This distinguishes two different devices with the same +resolution--a write/white from a write/black 300dpi printer, for +example. + + However, since most sites don't have this complication, Kpathsea +(specifically, the `kpse_init_prog' function in `kpathsea/proginit.c') +has a special case: if the mode has not been explicitly set by the user +(or in a configuration file), it sets `MAKETEX_MODE' to `/'. This +makes the default PK path, for example, expand into `.../pk//', so +fonts will be found even if there is no subdirectory for the mode (if +you arranged things that way because your site has only one printer, +for example) or if the program is mode-independent (e.g., `pktype'). + + To make the paths independent of the mode, simply edit `texmf.in' +before installation, or the installed `texmf.cnf', and remove the +`$MAKETEX_MODE'. + + *Note mktex script arguments::, for how this interacts with `mktexpk'. + + *Note TeX directory structure: TeX directory structure, for a +description of the default arrangement of the input files that comprise +the TeX system. The file `kpathsea/HIER' is a copy of that section. + + +File: kpathsea.info, Node: Default path generation, Prev: Default path features, Up: Changing search paths + +Default path generation +....................... + + This section describes how the default paths are constructed. + + You may wish to ignore the whole mess and simply edit `texmf.cnf' +after it is installed, perhaps even copying it into place beforehand so +you can complete the installation, if it seems necessary. + + To summarize the chain of events that go into defining the default +paths: + + 1. `configure' creates a `Makefile' from each `Makefile.in'. + + 2. When Make runs in the `kpathsea' directory, it creates a file + `texmf.sed' that substitutes the Make value of `$(var)' for a + string `@var@'. The variables in question are the one that define + the installation directories. + + 3. `texmf.sed' (together with a little extra magic--see + `kpathsea/Makefile') is applied to `texmf.in' to generate + `texmf.cnf'. This is the file that will eventually be installed + and used. + + 4. The definitions in `texmf.cnf' are recast as C `#define''s in + `paths.h'. These values will be the compile-time defaults; they + are not used at runtime unless no `texmf.cnf' file can be found. + + (That's a lie: the compile-time defaults are what any extra :'s in + `texmf.cnf' expand into; but the paths as distributed have no extra + :'s, and there's no particular reason for them to.) + + +File: kpathsea.info, Node: Running configure, Next: Running make, Prev: Changing search paths, Up: Custom installation + +Running `configure' +------------------- + + Run `sh configure OPTIONS' (in the top-level directory, the one +containing `kpathsea/'), possibly using a shell other than `sh' (*note +configure shells::). + + `configure' adapts the source distribution to the present system via +`#define''s in `*/c-auto.h', which are created from the corresponding +`c-auto.in'. It also creates a `Makefile' from the corresponding +`Makefile.in', doing `@VAR@' and `ac_include' substitutions). + + `configure' is the best place to control the configuration, +compilation, and installed location of the software, either via +command-line options, or by setting environment variables before +invoking it. For example, you can disable `mktexpk' by default with +the option `--disable-mktexpk'. *Note configure options::. + +* Menu: + +* configure shells:: +* configure options:: +* configure environment:: +* configure scenarios:: +* Shared library:: + + +File: kpathsea.info, Node: configure shells, Next: configure options, Up: Running configure + +`configure' shells +.................. + + Considerable effort has gone into trying to ensure that the +`configure' scripts can be run by most Bourne shell variants. Should +`sh' run into trouble, your best bet is to use Bash, the GNU shell +(*note Top: (features)Top.). + + Bourne shell variants for which problems have been reported in the +past are: +`ksh' + Old versions of the Korn shell may fail to handle the scripts. + The Korn shell may be installed as `/bin/sh' on AIX, in which case + `/bin/bsh' may serve instead. + +`ash' + Old versions of ash are unable to handle the scripts. Ash is + sometimes installed as `/bin/sh' on NetBSD, FreeBSD, and Linux + systems. `/bin/bash' should be available for those systems, but + might not be part of a default installation. + +`Ultrix /bin/sh' + `/bin/sh' under Ultrix is a DEC-grown shell that is notably + deficient in many ways. `/bin/sh5' may be necessary. + + +File: kpathsea.info, Node: configure options, Next: configure environment, Prev: configure shells, Up: Running configure + +`configure' options +................... + + For a complete list of all `configure' options, run `configure +--help' or see *Note Running `configure' scripts: (autoconf)Invoking +configure, (a copy is in the file `kpathsea/README.CONFIGURE'). The +generic options are listed first in the `--help' output, and the +package-specific options come last. The environment variables +`configure' pays attention to are listed below. + + Options particularly likely to be useful are `--prefix', `--datadir', +and the like; see *Note configure scenarios::. + + This section gives pointers to descriptions of the `--with' and +`--enable' options to `configure' that Kpathsea-using programs accept. + +`--without-mktexmf-default' +`--without-mktexpk-default' +`--without-mktextfm-default' +`--with-mktextex-default' + Enable or disable the dynamic generation programs. *Note mktex + configuration::. + +`--enable-shared' + Build Kpathsea as a shared library, and link against it. Also + build the usual static library. *Note Shared library::. + +`--disable-static' + Build only the shared library. Implies `--enable-shared'. + +`--enable-maintainer-mode' + Enables make targets that are useful for the maintainer and likely + to be a pain for anyone else; the makefiles created when this + option is enabled may not work at all for you. You have been + warned. + + +File: kpathsea.info, Node: configure environment, Next: configure scenarios, Prev: configure options, Up: Running configure + +`configure' environment +....................... + + `configure' uses the value of the following environment variables in +determining your system's characteristics, and substitutes for them in +Makefile's: + +`CC' + The compiler to use: default is `gcc' if it's installed, otherwise + `cc'. + +`CFLAGS' + Options to give the compiler: default is `-g -O2' for `gcc', `-g' + otherwise. `CFLAGS' comes after any other options. You may need + to include `-w' here if your compilations commonly have useless + warnings (e.g., `NULL redefined'), or `configure' may fail to + detect the presence of header files (it takes the messages on + standard error to mean the header file doesn't exist). + +`CPPFLAGS' + Options to pass to the compiler preprocessor; this matters most for + configuration, not the actual source compilation. The `configure' + script often does only preprocessing (e.g., to check for the + existence of #include files), and `CFLAGS' is not used for this. + You may need to set this to something like + `-I/usr/local/include/wwwhatever' if you have the libwww library + installed for hyper-xdvik (see `xdvik/INSTALL'). + +`DEFS' + Additional preprocessor options, but not used by `configure'. + Provided for enabling or disabling program features, as documented + in the various program-specific installation instructions. `DEFS' + comes before any compiler options included by the distribution + `Makefile's or by `configure'. + +`LDFLAGS' + Additional options to give to the loader. `LDFLAGS' comes before + any other linker options. + +`LIBS' + Additional libraries to link with. + + +File: kpathsea.info, Node: configure scenarios, Next: Shared library, Prev: configure environment, Up: Running configure + +`configure' scenarios +..................... + + Here are some common installation scenarios: + + * Including X support in Metafont. This is disabled by default, + since many sites have no use for it, and it's a leading cause of + configuration problems. + configure --with-x + + * Putting the binaries, TeX files, GNU info files, etc. into a single + TeX hierarchy, say `/here/texmf', requires overriding defaults in + `configure': + configure --prefix=/here/texmf --datadir=/here + + * You can compile on multiple architectures simultaneously either by + building symbolic link trees with the `lndir' script from the X11 + distribution, or with the `--srcdir' option: + configure --srcdir=SRCDIR + + * If you are installing binaries for multiple architectures into a + single hierarchy, you will probably want to override the default + `bin' and `lib' directories, something like this: + configure --prefix=TEXMF --datadir=TEXMF \ + --bindir=TEXMF/ARCH/bin --libdir=TEXMF/ARCH/lib + make texmf=TEXMF + (Unless you make provisions for architecture-specific files in + other ways, e.g., with Depot or an automounter.) + + * To compile with optimization (to compile without debugging, remove + the `-g'): + env CFLAGS="-g -O" sh configure ... + For a potential problem if you optimize, see *Note TeX or + Metafont failing: TeX or Metafont failing. + + +File: kpathsea.info, Node: Shared library, Prev: configure scenarios, Up: Running configure + +Shared library +.............. + + You can compile Kpathsea as a shared library on a few systems, by +specifying the option `--enable-shared' when you run `configure'. + + The main advantage in doing this is that the executables can then +share the code, thus decreasing memory and disk space requirements. + + On some systems, you can record the location of shared libraries in a +binary, usually by giving certain options to the linker. Then +individual users do not need to set their system's environment variable +(e.g., `LD_LIBRARY_PATH') to find shared libraries. If you want to do +this, you will need to add the necessary options to `LDFLAGS' yourself; +for example, on Solaris, include something like `-R${prefix}/lib', on +IRIX or Linux, use `-rpath${prefix}/lib'. (Unfortunately, making this +happen by default is very difficult, because of interactions with an +existing installed shared library.) + + Currently, shared library support is implemented only on Linux, SunOS +4 (Solaris 1), SunOS 5 (Solaris 2), IRIX 5, and IRIX 6. If you're +interested and willing in adding support for other systems, please see +the `configure' mode in the `klibtool' script, especially the +host-specific case statement around line 250. + + +File: kpathsea.info, Node: Running make, Next: Installing files, Prev: Running configure, Up: Custom installation + +Running `make' +-------------- + + `make' (still in the top-level directory). This also creates the +`texmf.cnf' and `paths.h' files that define the default search paths, +and (by default) the `plain' and `latex' TeX formats. + + You can override directory names and other values at `make'-time. +`make/paths.make' lists the variables most commonly reset. For +example, `make default_texsizes=600' changes the list of fallback +resolutions. + + You can also override each of `configure''s environment variables +(*note configure environment::). The Make variables have the same +names. + + Finally, you can supply additional options via the following +variables. (`configure' does not use these.) + +`XCPPFLAGS' +`XDEFS' + Preprocessor options. + +`XCFLAGS' + Compiler options. + +`XLDFLAGS' + Loader options (included at beginning of link commands). + +`XLOADLIBES' + More loader options (included at end of link commands). + +`XMAKEARGS' + Additional Make arguments passed to all sub-`make''s. You may need + to include assignments to the other variables here via `XMAKEARGS'; + for example: `make XMAKEARGS="CFLAGS=-O XDEFS=-DA4"'. + + It's generally a bad idea to use a different compiler (`CC') or +libraries (`LIBS') for compilation than you did for configuration, +since the values `configure' determined may then be incorrect. + + Adding compiler options to change the "universe" you are using +(typically BSD vs. system V) is generally a cause of trouble. It's +best to use the native environment, whatever that is; `configure' and +the software usually adapt best to that. In particular, under Solaris +2.x, you should not use the BSD-compatibility library (`libucb') or +include files (`ucbinclude'). + + If you want to use the Babel LaTeX package for support of non-English +typesetting, you need to modify some files before making the LaTeX +format. See the file `install.txt' in the Babel distribution. + + +File: kpathsea.info, Node: Installing files, Next: Cleaning up, Prev: Running make, Up: Custom installation + +Installing files +---------------- + + The basic command is the usual `make install'. For security issues, +*note Security::. + + The first time you install any manual in the GNU Info system, you +should add a line (you choose where) to the file `dir' in your +`$(infodir)' directory. Sample text for this is given near the top of +the Texinfo source files (`kpathsea/kpathsea.texi', +`dvipsk/dvips.texi', and `web2c/doc/web2c.texi'). If you have a recent +version of the GNU Texinfo distribution installed +( or later), this +should happen automatically. + + On the offchance that this is your first Info installation, the `dir' +file I use is included in the distribution as `etc/dir-example'. + + You may wish to use one of the following targets, especially if you +are installing on multiple architectures: + * `make install-exec' to install in architecture-dependent + directories, i.e., ones that depend on the `$(exec_prefix)' Make + variable. This includes links to binaries, libraries, etc., not + just "executables". + + * `make install-data' to install in architecture-independent + directories, such as documentation, configuration files, pool + files, etc. + + If you use the Andrew File System, the normal path (e.g., PREFIX/bin) +only gets you to a read-only copy of the files, and you must specify a +different path for installation. The best way to do this is by setting +the `prefix' variable on the `make' command line. The sequence becomes +something like this: + configure --prefix=/whatever + make + make install prefix=/afs/.SYSTEM.NAME/system/1.3/@sys/whatever + With AFS, you will definitely want to use relative filenames in +`ls-R' (*note Filename database::), not absolute filenames. This is +done by default, but check anyway. + + +File: kpathsea.info, Node: Cleaning up, Next: Filename database generation, Prev: Installing files, Up: Custom installation + +Cleaning up +----------- + +The basic command is `make distclean'. This removes all files created +by the build. + + Alternatively, + * `make mostlyclean' if you intend to compile on another + architecture. For Web2C, since the generated C files are portable, + they are not removed. If the `lex' vs. `flex' situation is going + to be different on the next machine, `rm web2c/lex.yy.c'. + + * `make clean' to remove files created by compiling, but leave + configuration files and Makefiles. + + * `make maintainer-clean' to remove everything that the Makefiles can + rebuild. This is more than `distclean' removes, and you should + only use it if you are thoroughly conversant with (and have the + necessary versions of) Autoconf. + + * `make extraclean' to remove other junk, e.g., core files, log + files, patch rejects. This is independent of the other `clean' + targets. + + +File: kpathsea.info, Node: Filename database generation, Next: mktex scripts, Prev: Cleaning up, Up: Custom installation + +Filename database generation +---------------------------- + + You will probably want to set up a `cron' entry on the appropriate +machine(s) to rebuild the filename database nightly or so, as in: + 0 0 * * * cd TEXMF && /BINDIR/mktexlsr + *Note Filename database::. + +Although the `mktex...' scripts make every effort to add newly-created +files on the fly, it can't hurt to make sure you get a fresh version +every so often. + + +File: kpathsea.info, Node: mktex scripts, Next: Installation testing, Prev: Filename database generation, Up: Custom installation + +`mktex' scripts +--------------- + + If Kpathsea cannot otherwise find a file, for some file types it is +configured by default to invoke an external program to create it +dynamically (*note mktex configuration::). This is most useful for +fonts (bitmaps, TFM's, and arbitrarily-sizable Metafont sources such as +the Sauter and EC fonts), since any given document can use fonts never +before referenced. Trying to build all fonts in advance is therefore +impractical, if not impossible. + + The script is passed the name of the file to create and possibly other +arguments, as explained below. It must echo the full pathname of the +file it created (and nothing else) to standard output; it can write +diagnostics to standard error. + +* Menu: + +* mktex configuration:: +* mktex script names:: +* mktex script arguments:: + + +File: kpathsea.info, Node: mktex configuration, Next: mktex script names, Up: mktex scripts + +`mktex' configuration +..................... + + The following file types can run an external program to create missing +files: `pk', `tfm', `mf', `tex'; the scripts are named `mktexpk', +`mktextfm', `mktexmf', and `mktextex'. + + In the absence of `configure' options specifying otherwise, +everything but `mktextex' will be enabled by default. The `configure' +options to change the defaults are: + + --without-mktexmf-default + --without-mktexpk-default + --without-mktextfm-default + --with-mktextex-default + + The `configure' setting is overridden if the environment variable or +configuration file value named for the script is set; e.g., `MKTEXPK' +(*note mktex script arguments::). + + As distributed, all the scripts source a file `texmf/web2c/mktex.cnf' +if it exists, so you can override various defaults. See `mktex.opt', +for instance, which defines the default mode, resolution, some special +directory names, etc. If you prefer not to change the distributed +scripts, you can simply create `mktex.cnf' with the appropriate +definitions (you do not need to create it if you have nothing to put in +it). `mktex.cnf' has no special syntax; it's an arbitrary Bourne shell +script. The distribution contains a sample `mktex.cnf' for you to copy +and modify as you please (it is not installed anywhere). + + In addition, you can configure a number of features with the +`MT_FEATURES' variable, which you can define: + * in `mktex.opt', as just mentioned; + + * by editing the file `mktex.opt', either before `make install' (in + the source hierarchy) or after (in the installed hierarchy); + + * or in the environment. + + If none of the options below are enabled, `mktexpk', `mktextfm', and +`mktexmf' follow the following procedure to decide where fonts should +be installed. Find the tree where the font's sources are, and test the +permissions of the `fonts' directory of that tree to determine whether +it is writable. If it is, put the files in the tree in appropriate +locations. If it isn't writable, see whether the tree is a system tree +(named in `SYSTEXMF'). If so, the `VARTEXFONTS' tree is used. In all +other cases the working directory is used. + + The `appendonlydir' option is enabled by default. + +`appendonlydir' + Tell `mktexdir' to create directories append-only, i.e., set their + sticky bit (*note Mode Structure: (fileutils)Mode Structure.). + This feature is silently ignored on non-Unix platforms (e.g. + Windows/NT and MS-DOS) which don't support similar functionality. + This feature is enabled by default. + +`dosnames' + Use 8.3 names; e.g., `dpi600/cmr10.pk' instead of `cmr10.600pk'. + Note that this feature only affects filenames that would otherwise + clash with other TeX-related filenames; `mktex' scripts do nothing + about filenames which exceed the 8+3 MS-DOS limits but remain + unique when truncated (by the OS) to these limits, and nether do + the scripts care about possible clashes with files which aren't + related with TeX. For example, `cmr10.600pk' would clash with + `cmr10.600gf' and is therefore changed when `dosnames' is in + effect, but `mf.pool' and `mp.base' don't clash with any + TeX-related files and are therefore unchanged. + + This feature is turned on by default on MS-DOS. If you do not wish + `dosnames' to be set on an MS-DOS platform, you need to set the + `MT_FEATURES' environment variable to a value that doesn't include + `dosnames'. You can also change the default setting by editing + `mktex.opt', but only if you use the `mktex' shell scripts; the + emulation programs don't consult `mktex.opt'. + +`fontmaps' + Instead of deriving the location of a font in the destination tree + from the location of the sources, the aliases and directory names + from the Fontname distribution are used. (*note Introduction: + (fontname)Top.). + +`nomfdrivers' + Let mktexpk and mktextfm create metafont driver files in a + temporary directory. These will be used for just one metafont run + and not installed permanently. + +`nomode' + Omit the directory level for the mode name; this is fine as long as + you generate fonts for only one mode. + +`stripsupplier' + Omit the font supplier name directory level. + +`striptypeface' + Omit the font typeface name directory level. + +`strip' + Omit the font supplier and typeface name directory levels. This + feature is deprecated in favour of `stripsupplier' and + `striptypeface'. + +`varfonts' + When this option is enabled, fonts that would otherwise be written + in system texmf tree go to the `VARTEXFONTS' tree instead. The + default value in `kpathsea/Makefile.in' is `/var/tmp/texfonts'. + The `Linux File System Standard' recommends `/var/tex/fonts'. + + The `varfonts' setting in `MT_FEATURES' is overridden by the + `USE_VARTEXFONTS' environment variable: if set to `1', the feature + is enabled, and if set to `0', the feature is disabled. + + +File: kpathsea.info, Node: mktex script names, Next: mktex script arguments, Prev: mktex configuration, Up: mktex scripts + +`mktex' script names +.................... + + The following table shows the default name of the script for each +possible file types. (The source is the variable `kpse_make_specs' in +`kpathsea/tex-make.c'.) + +`mktexpk' + Glyph fonts. + +`mktextex' + TeX input files. + +`mktexmf' + Metafont input files. + +`mktextfm' + TFM files. + +These names are overridden by an environment variable specific to the +program--for example, `DVIPSMAKEPK' for Dvipsk. + + If a `mktex...' script fails, the invocation is appended to a file +`missfont.log' (by default) in the current directory. You can then +execute the log file to create the missing files after fixing the +problem. + + If the current directory is not writable and the environment variable +or configuration file value `TEXMFOUTPUT' is set, its value is used. +Otherwise, nothing is written. The name `missfont.log' is overridden +by the `MISSFONT_LOG' environment variable or configuration file value. + + +File: kpathsea.info, Node: mktex script arguments, Prev: mktex script names, Up: mktex scripts + +`mktex' script arguments +........................ + + The first argument to a `mktex' script is always the name of the file +to be created. + + In the default `mktexpk' implementation, additional arguments may +also be passed: + +`--dpi NUM' + Sets the resolution of the generated font to NUM. + +`--mfmode NAME' + Sets the Metafont mode to NAME. + +`--bdpi NUM' + Sets the the "base dpi" for the font. This must match the mode + being used. + +`--mag STRING' + A "magstep" string suitable for the Metafont `mag' variable. This + must match the combination of BDPI and DPI being used. + +`--destdir STRING' + A directory name. If the directory is absolute, it is used as-is. + Otherwise, it is appended to the root destination directory set in + the script. + + +File: kpathsea.info, Node: Installation testing, Prev: mktex scripts, Up: Custom installation + +Installation testing +-------------------- + + Besides the tests listed in *Note Simple installation::, you can try +running `make check'. This includes the torture tests (trip, trap, and +mptrap) that come with Web2c (*note Triptrap: (web2c)Triptrap.). + + +File: kpathsea.info, Node: Security, Next: TeX directory structure, Prev: Custom installation, Up: Installation + +Security +======== + + None of the programs in the TeX system require any special system +privileges, so there's no first-level security concern of people gaining +illegitimate root access. + + A TeX document, however, can write to arbitrary files, e.g., +`~/.rhosts', and thus an unwitting user who runs TeX on a random +document is vulnerable to a trojan horse attack. This loophole is +closed by default, but you can be permissive if you so desire in +`texmf.cnf'. *Note tex invocation: (web2c)tex invocation. MetaPost has +the same issue. + + Dvips, Xdvi, and TeX can also execute shell commands under some +circumstances. To disable this, see the `-R' option in *Note Option +details: (dvips)Option details, the xdvi man page, and *Note tex +invocation: (web2c)tex invocation, respectively. + + Another security issue arises because it's very useful--almost +necessary--to make arbitrary fonts on user demand with `mktexpk' and +friends. Where do these files get installed? By default, the +`mktexpk' distributed with Kpathsea assumes a world-writable `/var/tmp' +directory; this is a simple and convenient approach, but it may not +suit your situation because it means that a local cache of fonts is +created on every machine. + + To avoid this duplication, many people consider a shared, globally +writable font tree desirable, in spite of the potential security +problems. To do this you should change the value of `VARTEXFONTS' in +`texmf.cnf' to refer to some globally known directory. *Note mktex +configuration::. + + The first restriction you can apply is to make newly-created +directories under `texmf' be append-only with an option in `mktex.cnf'. +*Note mktex configuration::. + + Another approach is to establish a group (or user) for TeX files, +make the `texmf' tree writable only to that group (or user), and make +`mktexpk' et al. setgid to that group (or setuid to that user). Then +users must invoke the scripts to install things. (If you're worried +about the inevitable security holes in scripts, then you could write a +C wrapper to exec the script.) + + The `mktex...' scripts install files with the same read and write +permissions as the directory they are installed in. The executable, +sgid, suid, and sticky bits are always cleared. + + Any directories created by the `mktex...' scripts have the same +permissions as their parent directory, unless the `appendonlydir' +feature is used, in which case the sticky bit is always set. + + +File: kpathsea.info, Node: TeX directory structure, Next: unixtex.ftp, Prev: Security, Up: Installation + +TeX directory structure +======================= + + This section describes the default installation hierarchy of the +distribution. It conforms to both the GNU coding standards and the TeX +directory structure (TDS) standard. For rationale and further +explanation, please see those documents. The GNU standard is available +as and +mirrors. The TDS document is available from `CTAN:/tex-archive/tds' +(*note unixtex.ftp::). + + You can change the default paths in many ways (*note Changing search +paths::). One common desire is to put everything (binaries and all) +under a single top-level directory such as `/usr/local/texmf' or +`/opt/texmf'--in the terms used below, make PREFIX and TEXMF the same. +For specific instructions on doing that, see *Note configure +scenarios::. + + Here is a skeleton of the default directory structure, extracted from +the TDS document: + + PREFIX/ installation root (`/usr/local' by default) + bin/ executables + man/ man pages + include/ C header files + info/ GNU info files + lib/ libraries (`libkpathsea.*') + share/ architecture-independent files + texmf/ TDS root + bibtex/ BibTeX input files + bib/ BibTeX databases + base/ base distribution (e.g., `xampl.bib') + misc/ single-file databases + PKG/ name of a package + bst/ BibTeX style files + base/ base distribution (e.g., `plain.bst', `acm.bst') + misc/ single-file styles + PKG/ name of a package + doc/ additional documentation + dvips/ `.pro', `.ps', `psfonts.map' + fonts/ font-related files + TYPE/ file type (e.g., `tfm', `pk') + MODE/ type of output device (types `pk' and `gf' only) + SUPPLIER/ name of a font supplier (e.g., `public') + TYPEFACE/ name of a typeface (e.g., `cm') + dpiNNN/ font resolution (types `pk' and `gf' only) + metafont/ Metafont (non-font) input files + base/ base distribution (e.g., `plain.mf') + misc/ single-file packages (e.g., `modes.mf') + PKG/ name of a package (e.g., `mfpic') + metapost/ MetaPost input files + base/ base distribution (e.g., `plain.mp') + misc/ single-file packages + PKG/ name of a package + support/ support files for MetaPost-related utilities (e.g., `trfonts.map') + mft/ `MFT' inputs (e.g., `plain.mft') + tex/ TeX input files + FORMAT/ name of a format (e.g., `plain') + base/ base distribution for FORMAT (e.g., `plain.tex') + misc/ single-file packages (e.g., `webmac.tex') + local/ local additions to or local configuration files for FORMAT + PKG/ name of a package (e.g., `graphics', `mfnfss') + generic/ format-independent packages + hyphen/ hyphenation patterns (e.g., `hyphen.tex') + images/ image input files (e.g., Encapsulated PostScript) + misc/ single-file format-independent packages (e.g., `null.tex'). + PKG/ name of a package (e.g., `babel') + web2c/ implementation-dependent files (`.pool', `.fmt', `texmf.cnf', etc.) + + Some concrete examples for most file types: + + /usr/local/bin/tex + /usr/local/man/man1/xdvi.1 + /usr/local/info/kpathsea.info + /usr/local/lib/libkpathsea.a + /usr/local/share/texmf/bibtex/bst/base/plain.bst + /usr/local/share/texmf/fonts/pk/ljfour/public/cm/cmr10.600pk + /usr/local/share/texmf/fonts/source/public/pandora/pnr10.mf + /usr/local/share/texmf/fonts/tfm/public/cm/cmr10.tfm + /usr/local/share/texmf/fonts/type1/adobe/utopia/putr.pfa + /usr/local/share/texmf/metafont/base/plain.mf + /usr/local/share/texmf/metapost/base/plain.mp + /usr/local/share/texmf/tex/plain/base/plain.tex + /usr/local/share/texmf/tex/generic/hyphen/hyphen.tex + /usr/local/share/texmf/web2c/tex.pool + /usr/local/share/texmf/web2c/tex.fmt + /usr/local/share/texmf/web2c/texmf.cnf + + +File: kpathsea.info, Node: unixtex.ftp, Next: Reporting bugs, Prev: TeX directory structure, Up: Installation + +`unixtex.ftp': Obtaining TeX +============================ + + This is , last updated 26 April +2000. Also available as . The IP +address is currently `[158.121.106.10]', and the canonical host name is +currently `tug.org'. It is also in Kpathsea source distributions as +`etc/unixtex.ftp' (although the network version is usually newer). +Mail with comments or questions. + + Following are general instructions for Unix or other sites who wish to +acquire the Web2c distribution, (plain) TeX, LaTeX (2e), BibTeX, +Metafont, MetaPost, DVI processors for the X window system, PostScript, +the PCL language in the HP LaserJet, and related programs. They are +oriented towards building from the original sources, though some +information on alternative packages is included in the last section. +See also , the Web2c and Kpathsea home page. + + Please note that the Web2c distribution is a bare-bones distribution +in source form, and building a complete installation from it is a +non-trivial matter. For most uses, it is a better idea to install a +distribution with pre-packaged binaries for your platform. An example +of such a distribution is teTeX, which is based on the Web2c sources. + + Please consider joining the TeX Users Group (TUG) to help support the +maintenance and development of the programs you retrieve. Email + or see for information and a +membership form. + + For actual installation instructions after obtaining the necessary +sources, see *Note Installation::. A copy is in the distribution file +`kpathsea/INSTALL'. + +* Menu: + +* Electronic distribution:: CTAN and so forth. +* CD-ROM distribution:: +* Other TeX packages:: + + +File: kpathsea.info, Node: Electronic distribution, Next: CD-ROM distribution, Up: unixtex.ftp + +Electronic distribution +----------------------- + + In many places we refer to CTAN:. This is _both_ a host name and a +directory name. Here are some primary locations: + + (California, USA) + (Germany) + (England) + +CTAN has many mirrors worldwide; see the top-level file +`README.mirrors' from one of the sites above, or finger +, or see . A list +current as of the time of distribution is in the top-level file +`./MIRROR'. + + You can also access CTAN via the World Wide Web, Gopher, electronic +mail, or NFS. The same `README.mirrors' file explains how. + + You will need to retrieve some or all of the following archives, +depending on your needs (don't forget to set binary mode for file +transfers): + +`CTAN:/systems/web2c/texmflib.tar.gz' + A basic collection of fonts (TFM files only) and macro packages + (including Texinfo and LaTeX 2e). It unpacks into `texmf/'; if + you change the structure of this hierarchy, you will also have to + change the default search paths (*note Changing search paths::). + It is required unless you already have these files, in which case + you should change the default paths as necessary to find them. + +`CTAN:/systems/web2c/web.tar.gz' + The original WEB source files, written mostly by Don Knuth. + Required unless you already have this `web' version. (The WEB + sources change irregularly with respect to Web2c itself.) Unpacks + into `web2c-VERSION'. + +`CTAN:/systems/web2c/web2c.tar.gz' + The Web2c system. Required. Also unpacks into `web2c-VERSION'. + +`CTAN:/systems/web2c/web2c-etex.tar.gz' + Additions to the Web2c system for building e-TeX. Optional. + Unpacks into `web2c-VERSION'. + +`CTAN:/systems/web2c/etexlib.tar.gz' + Additions to the texmf tree needed to build e-TeX. Optional. + Unpacks into `texmf/'. + +`CTAN:/systems/web2c/etexdoc.tar.gz' + Documentation for e-TeX as an addition to the texmf tree. + Optional. Unpacks into `texmf/'. + +`CTAN:/systems/web2c/web2c-omega.tar.gz' + Additions to the Web2c system for building Omega. Optional. + Unpacks into `web2c-VERSION'. + +`CTAN:/systems/web2c/omegalib.tar.gz' + Additions to the texmf tree needed to build Omega. Optional. + Unpacks into `texmf/'. + +`CTAN:/systems/web2c/omegadoc.tar.gz' + Documentation for Omega as an addition to the texmf tree. + Optional. Unpacks into `texmf/'. + +`CTAN:/systems/web2c/web2c-pdftex.tar.gz' + Additions to the Web2c system for building pdfTeX. Optional. + Unpacks into `web2c-VERSION'. + +`CTAN:/systems/web2c/pdftexlib.tar.gz' + Additions to the texmf tree needed to build pdfTeX. Optional. + Unpacks into `texmf/'. + +`CTAN:/systems/web2c/pdftexdoc.tar.gz' + Unpacks into `texmf/'. Documentation for pdfTeX as an addition to + the texmf tree. Optional. Unpacks into `texmf/'. + +`CTAN:/systems/web2c/texk.tar.gz' + The web and web2c sources, plus the additions for web2c, plus the + dvi drivers mentioned below, plus extra dvi drivers and tools not + packaged separately. Recommended if you want to build a complete + system, but may contain an older version of the separate packages. + Unpacks into `texk-VERSION'. + +`CTAN:/systems/web2c/texklib.tar.gz' + The basic texmf tree, plus the additions for e-TeX, Omega, and + pdfTeX. The match for texk.tar.gz, and therefore may also be older + than the separate packages. Unpacks into `texmf/'. + +`CTAN:/dviware/dvipsk/dvipsk.tar.gz' + DVI-to-PostScript translator. Unpacks into `dvipsk-VERSION'. + Optional. + +`CTAN:/dviware/xdvik/xdvik.tar.gz' + X window system DVI previewer. Unpacks into `xdvik-VERSION'. + Optional. + +`CTAN:/dviware/dviljk/dviljk.tar.gz' + DVI-to-PCL (HP LaserJet) translator. Unpacks into + `dviljk-VERSION'. Optional. + + All that said, the originating host for the software above is +`ftp.tug.org'. You can retrieve these distributions (but not much +else) from the `tex/' directory on that host. + + +File: kpathsea.info, Node: CD-ROM distribution, Next: Other TeX packages, Prev: Electronic distribution, Up: unixtex.ftp + +CD-ROM distribution +------------------- + + Numerous organizations distribute various TeX CD-ROM's: + + * TUG, UK TUG, and GUTenberg (French-speaking TeX user group) + collaborated to produce the `TeX Live' CD-ROM, based on teTeX, + which in turn is based on Web2c; email or + see . + + * Dante (the German-speaking TeX user group) has produced a CD-ROM. + See , and + for + information about TeX CD's in general. Both are in German. + + * The Free Software Foundation's `Source Code CD-ROM' contains the + minimal TeX source distribution described in the previous section + (i.e., enough to print GNU documentation); email + . + + * The Gateway! CD-ROM set contains a runnable NetBSD/Amiga + distribution and sources; see + . + + * The InfoMagic CD-ROM is a copy of CTAN (see previous section); see + . + + * NTG (Dutch-speaking TeX user group) produced the 4allTeX CD-ROM; + email , or see . + This is a runnable system. + + * The Prime Time TeXcetera CD-ROM is also a copy of CTAN; email + or see . + + * Walnut Creek's TeX CD-ROM is also a copy of CTAN; email + or see . + + * Most Linux distributions include some TeX package based on Web2c; + see the Linux documentation file `Distribution-HOWTO' for a + comparison of Linux distributions, available (for example) via + . + + If you know of additional TeX CD-ROM distributions to add to this +list, please inform . + + +File: kpathsea.info, Node: Other TeX packages, Prev: CD-ROM distribution, Up: unixtex.ftp + +Other TeX packages +------------------ + + Many other TeX implementations are available in `CTAN:/systems', +including ready-to-run distributions for Unix, Amiga, Acorn, VMS, +Macintosh, DOS, and Windows (in various forms). Although Web2c has +support in the source code for many operating systems, and in fact some +of the other distributions are based on it, it's unlikely to work as +distributed on anything but Unix. (Please contribute improvements!) + + The Unix distribution alluded to above is the teTeX distribution. +This includes both complete sources and precompiled binaries for many +popular Unix variants, including Linux. It is based on Web2c, and +contains many other TeX-related programs as well. + + The host labrea.stanford.edu is the original source for the files for +which Donald Knuth is directly responsible: `tex.web', `plain.tex', +etc. However, unless you want to build your TeX library tree ab initio, +it is more reliable and less work to retrieve these files as part of +the above packages. In any case, labrea is not the canonical source for +anything except what was created by Stanford TeX project, so do not +rely on all the files available at that ftp site being up-to-date. + + +File: kpathsea.info, Node: Reporting bugs, Prev: unixtex.ftp, Up: Installation + +Reporting bugs +============== + + (A copy of this chapter is in the file `kpathsea/BUGS'.) + + If you have problems or suggestions, please report them to + using the bug checklist below. + + Please report bugs in the documentation; not only factual errors or +inconsistent behavior, but unclear or incomplete explanations, typos, +wrong fonts, ... + +* Menu: + +* Bug checklist:: What to include in a good bug report. +* Mailing lists:: Joining the bugs or announcements mailing lists. +* Debugging:: Analyzing runtime problems. +* Logging:: Recording searches. +* Common problems:: When things go wrong. + + +File: kpathsea.info, Node: Bug checklist, Next: Mailing lists, Up: Reporting bugs + +Bug checklist +------------- + + Before reporting a bug, please check below to be sure it isn't already +known (*note Common problems::). + + Bug reports should be sent via electronic mail to +, or by postal mail to 135 Center Hill Road / +Plymouth, MA 02360 / USA. + + The general principle is that a good bug report includes all the +information necessary for reproduction. Therefore, to enable +investigation, your report should include the following: + + * The version number(s) of the program(s) involved, and of Kpathsea + itself. You can get the former by giving a sole option `--version' + to the program, and the latter by running `kpsewhich --version'. + The `NEWS' and `ChangeLog' files also contain the version number. + + * The hardware, operating system (including version number), + compiler, and `make' program you are using (the output of `uname + -a' is a start on the first two, though often incomplete). If the + bug involves the X window system, include X version and supplier + information as well (examples: X11R6 from MIT; X11R4 from HP; + OpenWindows 3.3 bundled with SunOS 4.1.4). + + * Any options you gave to `configure'. This is recorded in the + `config.status' files. + + If you are reporting a bug in `configure' itself, it's probably + system-dependent, and it will be unlikely the maintainers can do + anything useful if you merely report that thus-and-such is broken. + Therefore, you need to do some additional work: for some bugs, you + can look in the file `config.log' where the test that failed should + appear, along with the compiler invocation and source program in + question. You can then compile it yourself by hand, and discover + why the test failed. Other `configure' bugs do not involve the + compiler; in that case, the only recourse is to inspect the + `configure' shell script itself, or the Autoconf macros that + generated `configure'. + + * The log of all debugging output, if the bug is in path searching. + You can get this by setting the environment variable + `KPATHSEA_DEBUG' to `-1' before running the program. Please look + at the log yourself to make sure the behavior is really a bug + before reporting it; perhaps "old" environment variable settings + are causing files not to be found, for example. + + * The contents of any input files necessary to reproduce the bug. + For bugs in DVI-reading programs, for example, this generally + means a DVI file (and any EPS or other files it uses)--TeX source + files are helpful, but the DVI file is necessary, because that's + the actual program input. + + GNU `shar', available from is a + convenient way of packaging multiple (possibly binary) files for + electronic mail. If you feel your input files are too big to send + by email, you can ftp them to (that + directory is writable, but not readable). + + * If you are sending a patch (do so if you can!), please do so in + the form of a context diff (`diff -c') against the original + distribution source. Any other form of diff is either not as + complete or harder for me to understand. Please also include a + `ChangeLog' entry. + + * If the bug involved is an actual crash (i.e., core dump), it is + easy and useful to include a stack trace from a debugger (I + recommend the GNU debugger GDB, available from + ). If the cause is apparent (a + `NULL' value being dereferenced, for example), please send the + details along. If the program involved is TeX or Metafont, and + the crash is happening at apparently-sound code, however, the bug + may well be in the compiler, rather than in the program or the + library (*note TeX or Metafont failing: TeX or Metafont failing.). + + * Any additional information that will be helpful in reproducing, + diagnosing, or fixing the bug. + + +File: kpathsea.info, Node: Mailing lists, Next: Debugging, Prev: Bug checklist, Up: Reporting bugs + +Mailing lists +------------- + + Web2c and Kpathsea in general are discussed on the mailing list +. To join, email with +a line consisting of + + subscribe YOU@YOUR.PREFERRED.EMAIL.ADDRESS + +in the body of the message. + + You do not need to join to submit a report, nor will it affect whether +you get a response. There is no Usenet newsgroup equivalent (if you can +be the one to set this up, email `tex-k-request'). Traffic on the list +is fairly light, and is mainly bug reports and enhancement requests to +the software. The best way to decide if you want to join or not is +read some of the archives from . + + Be aware that large data files are sometimes included in bug reports. +If this is a problem for you, do not join the list. + + If you only want announcements of new releases, not bug reports and +discussion, join (via mail to +). + + If you are looking for general TeX help, such as how to use LaTeX, +please use the mailing list mailing list, which is +gatewayed to the `comp.text.tex' Usenet newsgroup (or post to the +newsgroup; the gateway is bidirectional). + + +File: kpathsea.info, Node: Debugging, Next: Logging, Prev: Mailing lists, Up: Reporting bugs + +Debugging +--------- + + Kpathsea provides a number of runtime debugging options, detailed +below by their names and corresponding numeric values. When the files +you expect aren't being found, the thing to do is enable these options +and examine the output. + + You can set these with some runtime argument (e.g., `-d') to the +program; in that case, you should use the numeric values described in +the program's documentation (which, for Dvipsk and Xdvik, are different +than those below). It's best to give the `-d' (or whatever) option +first, for maximal output. Dvipsk and Xdvik have additional +program-specific debugging options as well. + + You can also set the environment variable `KPATHSEA_DEBUG'; in this +case, you should use the numbers below. If you run the program under a +debugger and set the variable `kpathsea_debug', also use the numbers +below. + + In any case, by far the simplest value to use is `-1', which will +turn on all debugging output. This is usually better than guessing +which particular values will yield the output you need. + + Debugging output always goes to standard error, so you can redirect it +easily. For example, in Bourne-compatible shells: + dvips -d -1 ... 2>/tmp/debug + + It is sometimes helpful to run the standalone Kpsewhich utility +(*note Invoking kpsewhich::), instead of the original program. + + In any case, you can _not_ use the _names_ below; you must always use +somebody's numbers. (Sorry.) To set more than one option, just sum +the corresponding numbers. + +`KPSE_DEBUG_STAT (1)' + Report `stat'(2) calls. This is useful for verifying that your + directory structure is not forcing Kpathsea to do many additional + file tests (*note Slow path searching::, and *note Subdirectory + expansion::). If you are using an up-to-date `ls-R' database + (*note Filename database::), this should produce no output unless a + nonexistent file that must exist is searched for. + +`KPSE_DEBUG_HASH (2)' + Report lookups in all hash tables: `ls-R' and `aliases' (*note + Filename database::); font aliases (*note Fontmap::); and config + file values (*note Config files::). Useful when expected values + are not being found, e.g.., file searches are looking at the disk + instead of using `ls-R'. + +`KPSE_DEBUG_FOPEN (4)' + Report file openings and closings. Especially useful when your + system's file table is full, for seeing which files have been + opened but never closed. In case you want to set breakpoints in a + debugger: this works by redefining `fopen' (`fclose') to be + `kpse_fopen_trace' (`kpse_fclose_trace'). + +`KPSE_DEBUG_PATHS (8)' + Report general path information for each file type Kpathsea is + asked to search. This is useful when you are trying to track down + how a particular path got defined--from `texmf.cnf', `config.ps', + an environment variable, the compile-time default, etc. This is + the contents of the `kpse_format_info_type' structure defined in + `tex-file.h'. + +`KPSE_DEBUG_EXPAND (16)' + Report the directory list corresponding to each path element + Kpathsea searches. This is only relevant when Kpathsea searches + the disk, since `ls-R' searches don't look through directory lists + in this way. + +`KPSE_DEBUG_SEARCH (32)' + Report on each file search: the name of the file searched for, the + path searched in, whether or not the file must exist (when drivers + search for `cmr10.vf', it need not exist), and whether or not we + are collecting all occurrences of the file in the path (as with, + e.g., `texmf.cnf' and `texfonts.map'), or just the first (as with + most lookups). This can help you correlate what Kpathsea is doing + with what is in your input file. + +`KPSE_DEBUG_VARS (64)' + Report the value of each variable Kpathsea looks up. This is + useful for verifying that variables do indeed obtain their correct + values. + +`GSFTOPK_DEBUG (128)' + Activates debugging printout specific to `gsftopk' program. + +`MAKETEX_DEBUG (512)' + If you use the optional `mktex' programs instead of the + traditional shell scripts, this will report the name of the site + file (`mktex.cnf' by default) which is read, directories created by + `mktexdir', the full path of the `ls-R' database built by + `mktexlsr', font map searches, `MT_FEATURES' in effect, parameters + from `mktexnam', filenames added by `mktexupd', and some + subsidiary commands run by the programs. + +`MAKETEX_FINE_DEBUG (1024)' + When the optional `mktex' programs are used, this will print + additional debugging info from functions internal to these + programs. + + Debugging output from Kpathsea is always written to standard error, +and begins with the string `kdebug:'. (Except for hash table buckets, +which just start with the number, but you can only get that output +running under a debugger. See comments at the `hash_summary_only' +variable in `kpathsea/db.c'.) + + +File: kpathsea.info, Node: Logging, Next: Common problems, Prev: Debugging, Up: Reporting bugs + +Logging +------- + + Kpathsea can record the time and filename found for each successful +search. This may be useful in finding good candidates for deletion when +your filesystem is full, or in discovering usage patterns at your site. + + To do this, define the environment or config file variable +`TEXMFLOG'. The value is the name of the file to append the +information to. The file is created if it doesn't exist, and appended +to if it does. + + Each successful search turns into one line in the log file: two words +separated by a space. The first word is the time of the search, as the +integer number of seconds since "the epoch", i.e., UTC midnight 1 +January 1970 (more precisely, the result of the `time' system call). +The second word is the filename. + + For example, after `setenv TEXMFLOG /tmp/log', running Dvips on +`story.dvi' appends the following lines: + + 774455887 /usr/local/share/texmf/dvips/config.ps + 774455887 /usr/local/share/texmf/dvips/psfonts.map + 774455888 /usr/local/share/texmf/dvips/texc.pro + 774455888 /usr/local/share/texmf/fonts/pk/ljfour/public/cm/cmbx10.600pk + 774455889 /usr/local/share/texmf/fonts/pk/ljfour/public/cm/cmsl10.600pk + 774455889 /usr/local/share/texmf/fonts/pk/ljfour/public/cm/cmr10.600pk + 774455889 /usr/local/share/texmf/dvips/texc.pro + +Only filenames that are absolute are recorded, to preserve some +semblance of privacy. + + +File: kpathsea.info, Node: Common problems, Prev: Logging, Up: Reporting bugs + +Common problems +--------------- + + Here are some common problems with configuration, compilation, +linking, execution, ... + +* Menu: + +* Unable to find files:: If your program can't find fonts (or whatever). +* Slow path searching:: If it takes forever to find anything. +* Unable to generate fonts:: If mktexpk fails. +* TeX or Metafont failing:: Likely compiler bugs. + +* Empty Makefiles:: When configure produces empty makefiles. +* XtStrings:: When _XtStrings is undefined. +* dlopen:: When dlopen is undefined. +* ShellWidgetClass:: For dynamic linking troubles under OpenWindows. +* Pointer combination warnings:: For old compilers that don't grok char *. + + +File: kpathsea.info, Node: Unable to find files, Next: Slow path searching, Up: Common problems + +Unable to find files +.................... + + If a program complains it cannot find fonts (or other input files), +any of several things might be wrong. In any case, you may find the +debugging options helpful. *Note Debugging::. + + * Perhaps you simply haven't installed all the necessary files; the + basic fonts and input files are distributed separately from the + programs. *Note unixtex.ftp::. + + * You have (perhaps unknowingly) told Kpathsea to use search paths + that don't reflect where the files actually are. One common cause + is having environment variables set from a previous installation, + thus overriding what you carefully set in `texmf.cnf' (*note + Supported file formats::). System `/etc/profile' or other files + such may be the culprit. + + * Your files reside in a directory that is only pointed to via a + symbolic link, in a leaf directory and is not listed in `ls-R'. + + Unfortunately, Kpathsea's subdirectory searching has an + irremediable deficiency: If a directory D being searched for + subdirectories contains plain files and symbolic links to other + directories, but no true subdirectories, D will be considered a + leaf directory, i.e., the symbolic links will not be followed. + *Note Subdirectory expansion::. + + You can work around this problem by creating an empty dummy + subdirectory in D. Then D will no longer be a leaf, and the + symlinks will be followed. + + The directory immediately followed by the `//' in the path + specification, however, is always searched for subdirectories, + even if it is a leaf. Presumably you would not have asked for the + directory to be searched for subdirectories if you didn't want it + to be. + + * If the fonts (or whatever) don't already exist, `mktexpk' (or + `mktexmf' or `mktextfm') will try to create them. If these rather + complicated shell scripts fail, you'll eventually get an error + message saying something like `Can't find font FONTNAME'. The best + solution is to fix (or at least report) the bug in `mktexpk'; the + workaround is to generate the necessary fonts by hand with + Metafont, or to grab them from a CTAN site (*note unixtex.ftp::). + + * There is a bug in the library. *Note Reporting bugs::. + + +File: kpathsea.info, Node: Slow path searching, Next: Unable to generate fonts, Prev: Unable to find files, Up: Common problems + +Slow path searching +................... + + If your program takes an excessively long time to find fonts or other +input files, but does eventually succeed, here are some possible +culprits: + + * Most likely, you just have a lot of directories to search, and that + takes a noticeable time. The solution is to create and maintain a + separate `ls-R' file that lists all the files in your main TeX + hierarchy. *Note Filename database::. Kpathsea always uses `ls-R' + if it's present; there's no need to recompile or reconfigure any + of the programs. + + * Your recursively-searched directories (e.g., + `/usr/local/share/texmf/fonts//'), contain a mixture of files and + directories. This prevents Kpathsea from using a useful + optimization (*note Subdirectory expansion::). + + It is best to have only directories (and perhaps a `README') in the + upper levels of the directory structure, and it's very important + to have _only_ files, and no subdirectories, in the leaf + directories where the dozens of TFM, PK, or whatever files reside. + + In any case, you may find the debugging options helpful in determining +precisely when the disk or network is being pounded. *Note Debugging::. + + +File: kpathsea.info, Node: Unable to generate fonts, Next: TeX or Metafont failing, Prev: Slow path searching, Up: Common problems + +Unable to generate fonts +........................ + + This can happen if either `mktexpk' hasn't been installed properly, +or if the local installation of Metafont isn't correct. + + If `mf' is a command not found by `mktexpk', then you need to install +Metafont (*note unixtex.ftp::). + + If Metafont runs, but generates fonts at the wrong resolution, you +need to be sure the `M' and `D' lines in your Dvips configuration file +match (*note Config files: (dvips)Config files.). For example, if +`mktexpk' is generating 300dpi fonts, but you need 600dpi fonts, you +should have: + M ljfour + D 600 + + If Metafont runs but generates fonts at a resolution of 2602dpi (and +prints out the name of each character as well as just a character +number, and maybe tries to display the characters), then your Metafont +base file probably hasn't been made properly. (It's using the default +`proof' mode, instead of an actual device mode.) To make a proper +`plain.base', assuming the local mode definitions are contained in a +file `modes.mf', run the following command (assuming Unix): + + inimf "plain; input modes; dump" + +Then copy the `plain.base' file from the current directory to where the +base files are stored on your system (`/usr/local/share/texmf/web2c' by +default), and make a link (either hard or soft) from `plain.base' to +`mf.base' in that directory. *Note inimf invocation: (web2c)inimf +invocation. + + +File: kpathsea.info, Node: TeX or Metafont failing, Next: Empty Makefiles, Prev: Unable to generate fonts, Up: Common problems + +TeX or Metafont failing +....................... + + If TeX or Metafont get a segmentation fault or otherwise fail while +running a normal input file, the problem is usually a compiler bug +(unlikely as that may sound). Even if the trip and trap tests are +passed, problems may lurk. Optimization occasionally causes trouble in +programs other than TeX and Metafont themselves, too. + + Insufficient swap space may also cause core dumps or other erratic +behavior. + + For a workaround, if you enabled any optimization flags, it's best to +omit optimization entirely. In any case, the way to find the facts is +to run the program under the debugger and see where it's failing. + + Also, if you have trouble with a system C compiler, I advise trying +the GNU C compiler. And vice versa, unfortunately; but in that case I +also recommend reporting a bug to the GCC mailing list; see *Note Bugs: +(gcc)Bugs. + + To report compiler bugs effectively requires perseverance and +perspicacity: you must find the miscompiled line, and that usually +involves delving backwards in time from the point of error, checking +through TeX's (or whatever program's) data structures. Things are not +helped by all-too-common bugs in the debugger itself. Good luck. + + One known cause of trouble is the way arrays are handled. Some of the +Pascal arrays have a lower index other than 0, and the C code will take +the pointer to the allocated memory, subtract the lower index, and use +the resulting pointer for the array. While this trick often works, ANSI +C doesn't guarantee that it will. It it known to fail on HP-UX 10 +mchines when the native compiler is used, unless the `+u' compiler +switch was specified. Using GCC will work on this platform as well. + + +File: kpathsea.info, Node: Empty Makefiles, Next: XtStrings, Prev: TeX or Metafont failing, Up: Common problems + +Empty Makefiles +............... + + On some systems (NetBSD, FreeBSD, AIX 4.1, and Mach10), `configure' +may fail to properly create the Makefiles. Instead, you get an error +which looks something like this: + + prompt$ ./configure + ... + creating Makefile + sed: 1: "\\@^ac_include make/pat ...": \ can not be used as a string delimiter + + So far as I know, the bug here is in `/bin/sh' on these systems. I +don't have access to a machine running any of them, so if someone can +find a workaround that avoids the quoting bug, I'd be most grateful. +(Search for `ac_include' in the `configure' script to get to the +problematic code.) + + It should work to run `bash configure', instead of using `/bin/sh'. +You can get Bash from and mirrors. + + Another possible cause (reported for NeXT) is a bug in the `sed' +command. In that case the error may look like this: + + Unrecognized command: \@^ac_include make/paths.make@r make/paths.make + + In this case, installing GNU `sed' should solve the problem. You can +get GNU `sed' from the same places as Bash. + + +File: kpathsea.info, Node: XtStrings, Next: dlopen, Prev: Empty Makefiles, Up: Common problems + +`XtStrings' +........... + + You may find that linking X programs results in an error from the +linker that `XtStrings' is undefined, something like this: + + gcc -o virmf ... + .../x11.c:130: undefined reference to `XtStrings' + + This generally happens because of a mismatch between the X include +files with which you compiled and the X libraries with which you linked; +often, the include files are from MIT and the libraries from Sun. + + The solution is to use the same X distribution for compilation and +linking. Probably `configure' was unable to guess the proper +directories from your installation. You can use the `configure' +options `--x-includes=PATH' and `--x-libraries=PATH' to explicitly +specify them. + + +File: kpathsea.info, Node: dlopen, Next: ShellWidgetClass, Prev: XtStrings, Up: Common problems + +`dlopen' +........ + + (This section adapted from the file `dlsym.c' in the X distribution.) + + The `Xlib' library uses the standard C function `wcstombs'. Under +SunOS 4.1, `wcstombs' uses the `dlsym' interface defined in `libdl.so'. +Unfortunately, the SunOS 4.1 distribution does not include a static +`libdl.a' library. + + As a result, if you try to link an X program statically under SunOS, +you may get undefined references to `dlopen', `dlsym', and `dlclose'. +One workaround is to include these definitions when you link: + + void *dlopen() { return 0; } + void *dlsym() { return 0; } + int dlclose() { return -1; } + +These are contained in the `dlsym.c' file in the MIT X distribution. + + +File: kpathsea.info, Node: ShellWidgetClass, Next: Pointer combination warnings, Prev: dlopen, Up: Common problems + +`ShellWidgetClass' +.................. + + (This section adapted from the comp.sys.sun.admin FAQ.) + + If you are linking with Sun's OpenWindows libraries in SunOS 4.1.x, +you may get undefined symbols `_get_wmShellWidgetClass' and +`_get_applicationShellWidgetClass' when linking. This problem does not +arise using the standard MIT X libraries under SunOS. + + The cause is bugs in the `Xmu' shared library as shipped from Sun. +There are several fixes: + + * Install the free MIT distribution from `ftp.x.org' and mirrors. + + * Get the OpenWindows patches listed below. + + * Statically link the `Xmu' library into the executable. + + * Avoid using `Xmu' at all. If you are compiling Metafont, see *Note + Online Metafont graphics: (web2c)Online Metafont graphics. If you + are compiling Xdvi, see the `-DNOTOOL' option in `xdvik/INSTALL'. + + * Ignore the errors. The binary runs fine regardless. + + + Here is the information for getting the two patches: + + Patch ID: 100512-02 + Bug ID's: 1086793, 1086912, 1074766 + Description: 4.1.x OpenWindows 3.0 `libXt' jumbo patch + + Patch ID: 100573-03 + Bug ID: 1087332 + Description: 4.1.x OpenWindows 3.0 undefined symbols when using shared `libXmu'. + + The way to statically link with `libXmu' depends on whether you are +using a Sun compiler (e.g., `cc') or `gcc'. If the latter, alter the +`x_libs' Make variable to include + + -static -lXmu -dynamic + + If you are using the Sun compiler, use `-Bstatic' and `-Bdynamic'. + + +File: kpathsea.info, Node: Pointer combination warnings, Prev: ShellWidgetClass, Up: Common problems + +Pointer combination warnings +............................ + + When compiling with old C compilers, you may get some warnings about +"illegal pointer combinations". These are spurious; just ignore them. +I decline to clutter up the source with casts to get rid of them. + + +File: kpathsea.info, Node: Path searching, Next: TeX support, Prev: Installation, Up: Top + +Path searching +************** + + This chapter describes the generic path searching mechanism Kpathsea +provides. For information about searching for particular file types +(e.g., TeX fonts), see the next chapter. + +* Menu: + +* Searching overview:: Basic scheme for searching. +* Path sources:: Where search paths can be defined. +* Path expansion:: Special constructs in search paths. +* Filename database:: Using an externally-built list to search. +* Invoking kpsewhich:: Standalone path lookup. + + +File: kpathsea.info, Node: Searching overview, Next: Path sources, Up: Path searching + +Searching overview +================== + + A "search path" is a colon-separated list of "path elements", which +are directory names with a few extra frills. A search path can come +from (a combination of) many sources; see below. To look up a file +`foo' along a path `.:/dir', Kpathsea checks each element of the path +in turn: first `./foo', then `/dir/foo', returning the first match (or +possibly all matches). + + The "colon" and "slash" mentioned here aren't necessarily `:' and `/' +on non-Unix systems. Kpathsea tries to adapt to other operating +systems' conventions. + + To check a particular path element E, Kpathsea first sees if a +prebuilt database (*note Filename database::) applies to E, i.e., if +the database is in a directory that is a prefix of E. If so, the path +specification is matched against the contents of the database. + + If the database does not exist, or does not apply to this path +element, or contains no matches, the filesystem is searched (if this +was not forbidden by the specification with `!!' and if the file being +searched for must exist). Kpathsea constructs the list of directories +that correspond to this path element, and then checks in each for the +file being searched for. (To help speed future lookups of files in the +same directory, the directory in which a file is found is floated to the +top of the directory list.) + + The "file must exist" condition comes into play with VF files and +input files read by the TeX `\openin' command. These files may not +exist (consider `cmr10.vf'), and so it would be wrong to search the +disk for them. Therefore, if you fail to update `ls-R' when you +install a new VF file, it will never be found. + + Each path element is checked in turn: first the database, then the +disk. If a match is found, the search stops and the result is +returned. This avoids possibly-expensive processing of path +specifications that are never needed on a particular run. (Unless the +search explicitly requested all matches.) + + Although the simplest and most common path element is a directory +name, Kpathsea supports additional features in search paths: layered +default values, environment variable names, config file values, users' +home directories, and recursive subdirectory searching. Thus, we say +that Kpathsea "expands" a path element, meaning transforming all the +magic specifications into the basic directory name or names. This +process is described in the sections below. It happens in the same +order as the sections. + + Exception to all of the above: If the filename being searched for is +absolute or explicitly relative, i.e., starts with `/' or `./' or +`../', Kpathsea simply checks if that file exists. + + Ordinarily, if Kpathsea tries to access a file or directory that +cannot be read, it gives a warning. This is so you will be alerted to +directories or files that accidentally lack read permission (for +example, a `lost+found'). If you prefer not to see these warnings, +include the value `readable' in the `TEX_HUSH' environment variable or +config file value. + + This generic path searching algorithm is implemented in +`kpathsea/pathsearch.c'. It is employed by a higher-level algorithm +when searching for a file of a particular type (*note File lookup::, +and *Note Glyph lookup::). + + +File: kpathsea.info, Node: Path sources, Next: Path expansion, Prev: Searching overview, Up: Path searching + +Path sources +============ + + A search path can come from many sources. In the order in which +Kpathsea uses them: + + 1. A user-set environment variable, e.g., `TEXINPUTS'. Environment + variables with an underscore and the program name appended + override; for example, `TEXINPUTS_latex' overrides `TEXINPUTS' if + the program being run is named `latex'. + + 2. A program-specific configuration file, e.g., an `S /a:/b' line in + Dvips' `config.ps' (*note Config files: (dvips)Config files.). + + 3. A line in a Kpathsea configuration file `texmf.cnf', e.g., + `TEXINPUTS=/c:/d' (see below). + + 4. The compile-time default (specified in `kpathsea/paths.h'). + + You can see each of these values for a given search path by using the +debugging options (*note Debugging::). + + These sources may be combined via default expansion (*note Default +expansion::). + +* Menu: + +* Config files:: Kpathsea's runtime config files (texmf.cnf). + + +File: kpathsea.info, Node: Config files, Up: Path sources + +Config files +------------ + + As mentioned above, Kpathsea reads "runtime configuration files" +named `texmf.cnf' for search path and other definitions. The search +path used to look for these configuration files is named `TEXMFCNF', +and is constructed in the usual way, as described above, except that +configuration files cannot be used to define the path, naturally; also, +an `ls-R' database is not used to search for them. + + Kpathsea reads _all_ `texmf.cnf' files in the search path, not just +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'. + + 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: + + * Comments start with `%' and continue to the end of the line. + + * Blank lines are ignored. + + * A `\' at the end of a line acts as a continuation character, i.e., + the next line is appended. Whitespace at the beginning of + continuation lines is not ignored. + + * Each remaining line must look like + + VARIABLE [. PROGNAME] [=] VALUE + + where the `=' and surrounding whitespace is optional. + + * The VARIABLE name may contain any character other than whitespace, + `=', or `.', but sticking to `A-Za-z_' is safest. + + * If `.PROGNAME' is present, the definition only applies if the + program that is running is named (i.e., the last component of + `argv[0]' is) PROGNAME or `PROGNAME.exe'. This allows different + flavors of TeX to have different search paths, for example. + + * VALUE may contain any characters except `%' and `@'. (These + restrictions are only necessary because of the processing done on + `texmf.cnf' at build time, so you can stick those characters in + after installation if you have to.) The `$VAR.PROG' feature is + not available on the right-hand side; instead, you must use an + additional variable (see below for example). A `;' in VALUE is + translated to `:' if running under Unix; this is useful to write a + single `texmf.cnf' which can be used under both Unix and NT. (If + you really want `;''s in your filenames, add + `-DALLOW_SEMICOLON_IN_FILENAMES' to `CFLAGS'.) + + * All definitions are read before anything is expanded, so you can + use variables before they are defined (like Make, unlike most other + programs). + +Here is a configuration file fragment illustrating most of these points: + + % TeX input files -- i.e., anything to be found by \input or \openin ... + latex209_inputs = .:$TEXMF/tex/latex209//:$TEXMF/tex// + latex2e_inputs = .:$TEXMF/tex/latex//:$TEXMF/tex// + TEXINPUTS = .:$TEXMF/tex// + TEXINPUTS.latex209 = $latex209_inputs + TEXINPUTS.latex2e = $latex2e_inputs + TEXINPUTS.latex = $latex2e_inputs + + Although this format has obvious similarities to Bourne shell +scripts--change the comment character to `#', disallow spaces around +the `=', and get rid of the `.NAME' convention, and it could be run +through the shell. But there seemed little advantage to doing this, +since all the information would have to passed back to Kpathsea and +parsed there anyway, since the `sh' process couldn't affect its +parent's environment. + + The implementation of all this is in `kpathsea/cnf.c'. + + +File: kpathsea.info, Node: Path expansion, Next: Filename database, Prev: Path sources, Up: Path searching + +Path expansion +============== + + Kpathsea recognizes certain special characters and constructions in +search paths, similar to that in shells. As a general example: +`~$USER/{foo,bar}//baz' expands to all subdirectories under directories +`foo' and `bar' in $USER's home directory that contain a directory or +file `baz'. These expansions are explained in the sections below. + +* Menu: + +* Default expansion:: a: or :a or a::b expands to a default. +* Variable expansion:: $foo and ${foo} expand to environment values. +* Tilde expansion:: ~ and ~user expand to home directories. +* Brace expansion:: a{foo,bar}b expands to afoob abarb. +* KPSE_DOT expansion:: . is replaced with $KPSE_DOT if it is defined. +* Subdirectory expansion:: a// and a//b recursively expand to subdirs. + + +File: kpathsea.info, Node: Default expansion, Next: Variable expansion, Up: Path expansion + +Default expansion +----------------- + + If the highest-priority search path (*note Path sources::) contains an +"extra colon" (i.e., leading, trailing, or doubled), Kpathsea inserts +at that point the next-highest-priority search path that is defined. +If that inserted path has an extra colon, the same happens with the +next-highest. (An extra colon in the compile-time default value has +unpredictable results, so installers beware.) + + For example, given an environment variable setting + + setenv TEXINPUTS /home/karl: + +and a `TEXINPUTS' value from `texmf.cnf' of + + .:$TEXMF//tex + +then the final value used for searching will be: + + /home/karl:.:$TEXMF//tex + + Since Kpathsea looks for multiple configuration files, it would be +natural to expect that (for example) an extra colon in `./texmf.cnf' +would expand to the path in `$TEXMF/texmf.cnf'. Or, with Dvips' +configuration files, that an extra colon in `config.$PRINTER' would +expand to the path in `config.ps'. This doesn't happen. It's not +clear this would be desirable in all cases, and trying to devise a way +to specify the path to which the extra colon should expand seemed truly +baroque. + + Technicality: Since it would be useless to insert the default value in +more than one place, Kpathsea changes only one extra `:' and leaves any +others in place (they will eventually be ignored). Kpathsea checks +first for a leading `:', then a trailing `:', then a doubled `:'. + + You can trace this by debugging "paths" (*note Debugging::). Default +expansion is implemented in the source file `kpathsea/kdefault.c'. + + +File: kpathsea.info, Node: Variable expansion, Next: Tilde expansion, Prev: Default expansion, Up: Path expansion + +Variable expansion +------------------ + + `$foo' or `${foo}' in a path element is replaced by (1) the value of +an environment variable `foo' (if defined); (2) the value of `foo' from +`texmf.cnf' (if defined); (3) the empty string. + + If the character after the `$' is alphanumeric or `_', the variable +name consists of all consecutive such characters. If the character +after the `$' is a `{', the variable name consists of everything up to +the next `}' (braces may not be nested around variable names). +Otherwise, Kpathsea gives a warning and ignores the `$' and its +following character. + + You must quote the $'s and braces as necessary for your shell. +_Shell_ variable values cannot be seen by Kpathsea, i.e., ones defined +by `set' in C shells and without `export' in Bourne shells. + + For example, given + setenv tex /home/texmf + setenv TEXINPUTS .:$tex:${tex}prev + the final `TEXINPUTS' path is the three directories: + .:/home/texmf:/home/texmfprev + + The `.PROGNAME' suffix on variables and `_PROGNAME' on environment +variable names are not implemented for general variable expansions. +These are only recognized when search paths are initialized (*note Path +sources::). + + Variable expansion is implemented in the source file +`kpathsea/variable.c'. + + +File: kpathsea.info, Node: Tilde expansion, Next: Brace expansion, Prev: Variable expansion, Up: Path expansion + +Tilde expansion +--------------- + + A leading `~' in a path element is replaced by the value of the +environment variable `HOME', or `.' if `HOME' is not set. + + A leading `~USER' in a path element is replaced by USER's home +directory from the system `passwd' database. + + For example, + setenv TEXINPUTS ~/mymacros: + +will prepend a directory `mymacros' in your home directory to the +default path. + + As a special case, if a home directory ends in `/', the trailing +slash is dropped, to avoid inadvertently creating a `//' construct in +the path. For example, if the home directory of the user `root' is +`/', the path element `~root/mymacros' expands to just `/mymacros', not +`//mymacros'. + + Tilde expansion is implemented in the source file `kpathsea/tilde.c'. + + +File: kpathsea.info, Node: Brace expansion, Next: KPSE_DOT expansion, Prev: Tilde expansion, Up: Path expansion + +Brace expansion +--------------- + + `x{A,B}y' expands to `xAy:xBy'. For example: + + foo/{1,2}/baz + +expands to `foo/1/baz:foo/2/baz'. `:' is the path separator on the +current system; e.g., on a DOS system, it's `;'. + + Braces can be nested; for example, `x{A,B{1,2}}y' expands to +`xAy:xB1y:xB2y'. + + Multiple non-nested braces are expanded from right to left; for +example, `x{A,B}{1,2}y' expands to `x{A,B}1y:x{A,B}2y', which expands +to `xA1y:xB1y:xA2y:xB2y'. + + This feature can be used to implement multiple TeX hierarchies, by +assigning a brace list to `$TEXMF', as mentioned in `texmf.in'. + + You can also use the path separator in stead of the comma. The last +example could have been written `x{A:B}{1:2}y'. + + Brace expansion is implemented in the source file +`kpathsea/expand.c'. It is a modification of the Bash sources, and is +thus covered by the GNU General Public License, rather than the Library +General Public License that covers the rest of Kpathsea. + + +File: kpathsea.info, Node: KPSE_DOT expansion, Next: Subdirectory expansion, Prev: Brace expansion, Up: Path expansion + +`KPSE_DOT' expansion +-------------------- + + When `KPSE_DOT' is defined in the environment, it names a directory +that should be considered the current directory for the purpose of +looking up files in the search paths. This feature is needed by the +`mktex...' scripts *Note mktex scripts::, because these change the +working directory. You should not ever define it yourself. + + +File: kpathsea.info, Node: Subdirectory expansion, Prev: KPSE_DOT expansion, Up: Path expansion + +Subdirectory expansion +---------------------- + + Two or more consecutive slashes in a path element following a +directory D is replaced by all subdirectories of D: first those +subdirectories directly under D, then the subsubdirectories under +those, and so on. At each level, the order in which the directories are +searched is unspecified. (It's "directory order", and definitely not +alphabetical.) + + If you specify any filename components after the `//', only +subdirectories which match those components are included. For example, +`/a//b' would expand into directories `/a/1/b', `/a/2/b', `/a/1/1/b', +and so on, but not `/a/b/c' or `/a/1'. + + You can include multiple `//' constructs in the path. + + `//' at the beginning of a path is ignored; you didn't really want to +search every directory on the system, did you? + + I should mention one related implementation trick, which I took from +GNU find. Matthew Farwell suggested it, and David MacKenzie +implemented it. + + The trick is that in every real Unix implementation (as opposed to the +POSIX specification), a directory which contains no subdirectories will +have exactly two links (namely, one for `.' and one for `..'). That is +to say, the `st_nlink' field in the `stat' structure will be two. +Thus, we don't have to stat everything in the bottom-level (leaf) +directories--we can just check `st_nlink', notice it's two, and do no +more work. + + But if you have a directory that contains a single subdirectory and +500 regular files, `st_nlink' will be 3, and Kpathsea has to stat every +one of those 501 entries. Therein lies slowness. + + You can disable the trick by undefining `UNIX_ST_LINK' in +`kpathsea/config.h'. (It is undefined by default except under Unix.) + + Unfortunately, in some cases files in leaf directories are `stat''d: +if the path specification is, say, `$TEXMF/fonts//pk//', then files in +a subdirectory `.../pk', even if it is a leaf, are checked. The reason +cannot be explained without reference to the implementation, so read +`kpathsea/elt-dirs.c' (search for `may descend') if you are curious. +And if you can find a way to _solve_ the problem, please let me know. + + Subdirectory expansion is implemented in the source file +`kpathsea/elt-dirs.c'. + + +File: kpathsea.info, Node: Filename database, Next: Invoking kpsewhich, Prev: Path expansion, Up: Path searching + +Filename database (`ls-R') +========================== + + Kpathsea goes to some lengths to minimize disk accesses for searches +(*note Subdirectory expansion::). Nevertheless, at installations with +enough directories, searching each possible directory for a given file +can take an excessively long time (depending on the speed of the disk, +whether it's NFS-mounted, how patient you are, etc.). + + In practice, a font tree containing the standard PostScript and PCL +fonts is large enough for searching to be noticeably slow on typical +systems these days. Therefore, Kpathsea can use an externally-built +"database" file named `ls-R' that maps files to directories, thus +avoiding the need to exhaustively search the disk. + + A second database file `aliases' allows you to give additional names +to the files listed in `ls-R'. This can be helpful to adapt to "8.3" +filename conventions in source files. + + The `ls-R' and `aliases' features are implemented in the source file +`kpathsea/db.c'. + +* Menu: + +* ls-R:: The main filename database. +* Filename aliases:: Aliases for those names. +* Database format:: Syntax details of the database file. + + +File: kpathsea.info, Node: ls-R, Next: Filename aliases, Up: Filename database + +`ls-R' +------ + + As mentioned above, you must name the main filename database `ls-R'. +You can put one at the root of each TeX installation hierarchy you wish +to search (`$TEXMF' by default); most sites have only one hierarchy. +Kpathsea looks for `ls-R' files along the `TEXMFDBS' path, so that +should presumably match the list of hierarchies. + + The recommended way to create and maintain `ls-R' is to run the +`mktexlsr' script, which is installed in `$(bindir)' (`/usr/local/bin' +by default). That script goes to some trouble to follow symbolic links +as necessary, etc. It's also invoked by the distributed `mktex...' +scripts. + + At its simplest, though, you can build `ls-R' with the command + cd /YOUR/TEXMF/ROOT && ls -LAR ./ >ls-R + +presuming your `ls' produces the right output format (see the section +below). GNU `ls', for example, outputs in this format. Also presuming +your `ls' hasn't been aliased in a system file (e.g., `/etc/profile') +to something problematic, e.g., `ls --color=tty'. In that case, you +will have to disable the alias before generating `ls-R'. For the +precise definition of the file format, see *Note Database format::. + + Regardless of whether you use the supplied script or your own, you +will almost certainly want to invoke it via `cron', so when you make +changes in the installed files (say if you install a new LaTeX +package), `ls-R' will be automatically updated. + + The `-A' option to `ls' includes files beginning with `.' (except for +`.' and `..'), such as the file `.tex' included with the LaTeX tools +package. (On the other hand, _directories_ whose names begin with `.' +are always ignored.) + + If your system does not support symbolic links, omit the `-L'. + + `ls -LAR /YOUR/TEXMF/ROOT' will also work. But using `./' avoids +embedding absolute pathnames, so the hierarchy can be easily +transported. It also avoids possible trouble with automounters or +other network filesystem conventions. + + Kpathsea warns you if it finds an `ls-R' file, but the file does not +contain any usable entries. The usual culprit is running plain `ls -R' +instead of `ls -LR ./' or `ls -R /YOUR/TEXMF/ROOT'. Another +possibility is some system directory name starting with a `.' (perhaps +if you are using AFS); Kpathsea ignores everything under such +directories. + + Because the database may be out-of-date for a particular run, if a +file is not found in the database, by default Kpathsea goes ahead and +searches the disk. If a particular path element begins with `!!', +however, _only_ the database will be searched for that element, never +the disk. If the database does not exist, nothing will be searched. +Because this can surprise users ("I see the font `foo.tfm' when I do an +`ls'; why can't Dvips find it?"), it is not in any of the default +search paths. + + +File: kpathsea.info, Node: Filename aliases, Next: Database format, Prev: ls-R, Up: Filename database + +Filename aliases +---------------- + + In some circumstances, you may wish to find a file under several +names. For example, suppose a TeX document was created using a DOS +system and tries to read `longtabl.sty'. But now it's being run on a +Unix system, and the file has its original name, `longtable.sty'. The +file won't be found. You need to give the actual file `longtable.sty' +an alias `longtabl.sty'. + + You can handle this by creating a file `aliases' as a companion to +the `ls-R' for the hierarchy containing the file in question. (You +must have an `ls-R' for the alias feature to work.) + + The format of `aliases' is simple: two whitespace-separated words per +line; the first is the real name `longtable.sty', and second is the +alias (`longtabl.sty'). These must be base filenames, with no +directory components. `longtable.sty' must be in the sibling `ls-R'. + + Also, blank lines and lines starting with `%' or `#' are ignored in +`aliases', to allow for comments. + + If a real file `longtabl.sty' exists, it is used regardless of any +aliases. + + +File: kpathsea.info, Node: Database format, Prev: Filename aliases, Up: Filename database + +Database format +--------------- + + The "database" read by Kpathsea is a line-oriented file of plain +text. The format is that generated by GNU (and most other) `ls' +programs given the `-R' option, as follows. + + * Blank lines are ignored. + + * If a line begins with `/' or `./' or `../' and ends with a colon, + it's the name of a directory. (`../' lines aren't useful, + however, and should not be generated.) + + * All other lines define entries in the most recently seen directory. + /'s in such lines will produce possibly-strange results. + + * Files with no preceding directory line are ignored. + + For example, here's the first few lines of `ls-R' (which totals about +30K bytes) on my system: + + bibtex + dvips + fonts + ls-R + metafont + metapost + tex + web2c + + ./bibtex: + bib + bst + doc + + ./bibtex/bib: + asi.bib + btxdoc.bib + ... + + +File: kpathsea.info, Node: Invoking kpsewhich, Prev: Filename database, Up: Path searching + +`kpsewhich': Standalone path searching +====================================== + + The Kpsewhich program exercises the path searching functionality +independent of any particular application. This can also be useful as a +sort of `find' program to locate files in your TeX hierarchies, perhaps +in administrative scripts. It is used heavily in the distributed +`mktex...' scripts. + + Synopsis: + kpsewhich OPTION... FILENAME... + + The options and filename(s) to look up can be intermixed. Options +can start with either `-' or `--', and any unambiguous abbreviation is +accepted. + +* Menu: + +* Path searching options:: Changing the mode, resolution, etc. +* Auxiliary tasks:: Path and variable expansion. +* Standard options:: --help and --version. + + +File: kpathsea.info, Node: Path searching options, Next: Auxiliary tasks, Up: Invoking kpsewhich + +Path searching options +---------------------- + + Kpsewhich looks up each non-option argument on the command line as a +filename, and returns the first file found. There is no option to +return all the files with a particular name (you can run the Unix +`find' utility for that, *note Invoking find: (findutils)Invoking +find.). + + Various options alter the path searching behavior: + +`--dpi=NUM' + Set the resolution to NUM; this only affects `gf' and `pk' + lookups. `-D' is a synonym, for compatibility with Dvips. + Default is 600. + +`--format=NAME' + Set the format for lookup to NAME. By default, the format is + guessed from the filename, with `tex' being used if nothing else + fits. The recognized filename extensions (including any leading + `.') are also allowable NAMEs. + + All formats also have a name, which is the only way to specify + formats with no associated suffix. For example, for Dvips + configuration files you can use `--format="dvips config"'. (The + quotes are for the sake of the shell.) + + Here's the current list of recognized names and the associated + suffixes. *Note Supported file formats::, for more information on + each of these. + gf: gf + pk: pk + bitmap font + afm: .afm + base: .base + bib: .bib + bst: .bst + cnf: .cnf + ls-R: ls-R + fmt: .fmt + map: .map + mem: .mem + mf: .mf + mfpool: .pool + mft: .mft + mp: .mp + mppool: .pool + MetaPost support + ocp: .ocp + ofm: .ofm .tfm + opl: .opl + otp: .otp + ovf: .ovf + ovp: .ovp + graphic/figure: .eps .epsi + tex: .tex + TeX system documentation + texpool: .pool + TeX system sources + PostScript header/font: .pro + Troff fonts + tfm: .tfm + type1 fonts: .pfa .pfb + vf: .vf + dvips config + ist: .ist + truetype fonts: .ttf .ttc + type42 fonts + web2c files + other text files + other binary files + + This option and `--path' are mutually exclusive. + +`--interactive' + After processing the command line, read additional filenames to + look up from standard input. + +`-mktex=FILETYPE' +`-no-mktex=FILETYPE' + Turn on or off the `mktex' script associated with FILETYPE. The + only values that make sense for FILETYPE are `pk', `mf', `tex', + and `tfm'. By default, all are off in Kpsewhich. *Note mktex + scripts::. + +`--mode=STRING' + Set the mode name to STRING; this also only affects `gf' and `pk' + lookups. No default: any mode will be found. *Note mktex script + arguments::. + +`--must-exist' + Do everything possible to find the files, notably including + searching the disk. By default, only the `ls-R' database is + checked, in the interest of efficiency. + +`--path=STRING' + Search along the path STRING (colon-separated as usual), instead + of guessing the search path from the filename. `//' and all the + usual expansions are supported (*note Path expansion::). This + option and `--format' are mutually exclusive. To output the + complete directory expansion of a path, instead of doing a + one-shot lookup, see `--expand-path' in the following section. + +`--progname=NAME' + Set the program name to NAME; default is `kpsewhich'. This can + affect the search paths via the `.PROGNAM' feature in + configuration files (*note Config files::). + + +File: kpathsea.info, Node: Auxiliary tasks, Next: Standard options, Prev: Path searching options, Up: Invoking kpsewhich + +Auxiliary tasks +--------------- + + Kpsewhich provides some additional features not strictly related to +path lookup: + + * `--debug=NUM' sets the debugging options to NUM. *Note + Debugging::. + + * `--expand-braces=STRING' outputs the variable and brace expansion + of STRING. *Note Path expansion::. + + * `--expand-var=STRING' outputs the variable expansion of STRING. + For example, the `mktex...' scripts run `kpsewhich + --expand-var='$TEXMF'' to find the root of the TeX system + hierarchy. *Note Path expansion::. + + * `--expand-path=STRING' outputs the complete expansion of STRING as + a colon-separated path. This is useful to construct a search path + for a program that doesn't accept recursive subdirectory + specifications. + + For one-shot uses of an arbitrary (not built in to Kpathsea) path, + see `--path' in the previous section. + + * `--show-path=NAME' shows the path that would be used for file + lookups of file type NAME. Either a filename extension (`pk', + `.vf', etc.) or an integer can be used, just as with `--format', + described in the previous section. + + +File: kpathsea.info, Node: Standard options, Prev: Auxiliary tasks, Up: Invoking kpsewhich + +Standard options +---------------- + + Kpsewhich accepts the standard GNU options: + + * `--help' prints a help message on standard output and exits. + + * `--version' prints the Kpathsea version number and exits. + + +File: kpathsea.info, Node: TeX support, Next: Programming, Prev: Path searching, Up: Top + +TeX support +*********** + + Although the basic features in Kpathsea can be used for any type of +path searching, it came about (like all libraries) with a specific +application in mind: I wrote Kpathsea specifically for TeX system +programs. I had been struggling with the programs I was using (Dvips, +Xdvi, and TeX itself) having slightly different notions of how to +specify paths; and debugging was painful, since no code was shared. + + Therefore, Kpathsea provides some TeX-specific formats and features. +Indeed, many of the supposedly generic path searching features were +provided because they seemed useful in that conTeXt (font lookup, +particularly). + + Kpathsea provides a standard way to search for files of any of the +supported file types; glyph fonts are a bit different than all the rest. +Searches are based solely on filenames, not file contents--if a GF file +is named `cmr10.600pk', it will be found as a PK file. + +* Menu: + +* Supported file formats:: File types Kpathsea knows about. +* File lookup:: Searching for most kinds of files. +* Glyph lookup:: Searching for bitmap fonts. +* Suppressing warnings:: Avoiding warnings via TEX_HUSH. + + +File: kpathsea.info, Node: Supported file formats, Next: File lookup, Up: TeX support + +Supported file formats +====================== + + Kpathsea has support for a number of file types. Each file type has a +list of environment and config file variables that are checked to define +the search path, and most have a default suffix that plays a role in +finding files (see the next section). Some also define additional +suffixes, and/or a program to be run to create missing files on the fly. + + Since environment variables containing periods, such as +`TEXINPUTS.latex', are not allowed on some systems, Kpathsea looks for +environment variables with an underscore, e.g., `TEXINPUTS_latex' +(*note Config files::). + + The following table lists the above information. + +`afm' + (Adobe font metrics, *note Metric files: (dvips)Metric files.) + `AFMFONTS'; suffix `.afm'. + +`base' + (Metafont memory dump, *note Memory dumps: (web2c)Memory dumps.) + `MFBASES', `TEXMFINI'; suffix `.base'. + +`bib' + (BibTeX bibliography source, *note bibtex invocation: + (web2c)bibtex invocation.) `BIBINPUTS', `TEXBIB'; suffix `.bib'. + +`bst' + (BibTeX style file, *note Basic BibTeX style files: (web2c)Basic + BibTeX style files.) `BSTINPUTS'; suffix `.bst'. + +`cnf' + (Runtime configuration files, *note Config files::) `TEXMFCNF'; + suffix `.cnf'. + +`dvips config' + (Dvips `config.*' files, such as `config.ps', *note Config files: + (dvips)Config files.) `TEXCONFIG'. + +`fmt' + (TeX memory dump, *note Memory dumps: (web2c)Memory dumps.) + `TEXFORMATS', `TEXMFINI'; suffix `.fmt'. + +`gf' + (generic font bitmap, *note Glyph files: (dvips)Glyph files.) + `PROGRAMFONTS', `GFFONTS', `GLYPHFONTS', `TEXFONTS'; suffix `gf'. + +`graphic/figure' + (Encapsulated PostScript figures, *note PostScript figures: + (dvips)PostScript figures.) `TEXPICTS', `TEXINPUTS'; additional + suffixes: `.eps', `.epsi'. + +`ist' + (makeindex style files) `TEXINDEXSTYLE', `INDEXSTYLE'; suffix + `.ist'. + +`ls-R' + (Filename databases, *note Filename database::) `TEXMFDBS'. + +`map' + (Fontmaps, *note Fontmap::) `TEXFONTMAPS'; suffix `.map'. + +`mem' + (MetaPost memory dump, *note Memory dumps: (web2c)Memory dumps.) + `MPMEMS', `TEXMFINI'; suffix `.mem'. + +`MetaPost support' + (MetaPost support files, used by DMP; *note dmp invocation: + (web2c)dmp invocation.) `MPSUPPORT'. + +`mf' + (Metafont source, *note mf invocation: (web2c)mf invocation.) + `MFINPUTS'; suffix `.mf'; dynamic creation program: `mktexmf'. + +`mfpool' + (Metafont program strings, *note pooltype invocation: + (web2c)pooltype invocation.) `MFPOOL', `TEXMFINI'; suffix `.pool'. + +`mft' + (`MFT' style file, *note mft invocation: (web2c)mft invocation.) + `MFTINPUTS'; suffix `.mft'. + +`mp' + (MetaPost source, *note mpost invocation: (web2c)mpost invocation.) + `MPINPUTS'; suffix `.mp'. + +`mppool' + (MetaPost program strings, *note pooltype invocation: + (web2c)pooltype invocation.) `MPPOOL', `TEXMFINI'; suffix `.pool'. + +`ocp' + (Omega compiled process files) `OCPINPUTS'; + suffix `.ocp'; dynamic creation program: `MakeOmegaOCP'. + +`ofm' + (Omega font metrics) `OFMFONTS', `TEXFONTS'; + suffixes `.ofm', `.tfm'; dynamic creation program: `MakeOmegaOFM'. + +`opl' + (Omega property lists) `OPLFONTS', `TEXFONTS'; suffix `.opl'. + +`otp' + (Omega translation process files) `OTPINPUTS'; suffix `.otp'. + +`ovf' + (Omega virtual fonts) `OVFFONTS', `TEXFONTS'; suffix `.ovf'. + +`ovp' + (Omega virtual property lists) `OVPFONTS', `TEXFONTS'; suffix + `.ovp'. + +`pk' + (packed bitmap fonts, *note Glyph files: (dvips)Glyph files.) + `PROGRAMFONTS' (PROGRAM being `XDVI', etc.), `PKFONTS', `TEXPKS', + `GLYPHFONTS', `TEXFONTS'; suffix `pk'; dynamic creation program: + `mktexpk'. + +`PostScript header' + (downloadable PostScript, *note Header files: (dvips)Header files.) + `TEXPSHEADERS', `PSHEADERS'; additional suffix `.pro'. + +`tex' + (TeX source, *note tex invocation: (web2c)tex invocation.) + `TEXINPUTS'; suffix `.tex'; additional suffixes: none, because + such a list cannot be complete; dynamic creation program: + `mktextex'. + +`TeX system documentation' + (Documentation files for the TeX system) `TEXDOCS'. + +`TeX system sources' + (Source files for the TeX system) `TEXSOURCES'. + +`texpool' + (TeX program strings, *note pooltype invocation: (web2c)pooltype + invocation.) `TEXPOOL', `TEXMFINI'; suffix `.pool'. + +`tfm' + (TeX font metrics, *note Metric files: (dvips)Metric files.) + `TFMFONTS', `TEXFONTS'; suffix `.tfm'; dynamic creation program: + `mktextfm'. + +`Troff fonts' + (Troff fonts, used by DMP; *note DMP invocation: (web2c)DMP + invocation.) `TRFONTS'. + +`truetype fonts' + (TrueType outline fonts) `TTFONTS'; suffixes `.ttf', `.ttc'. + +`type1 fonts' + (Type 1 PostScript outline fonts, *note Glyph files: (dvips)Glyph + files.) `T1FONTS', `T1INPUTS', `TEXPSHEADERS', `DVIPSHEADERS'; + suffixes `.pfa', `.pfb'. + +`type42 fonts' + (Type 42 PostScript outline fonts) `T42FONTS'. + +`vf' + (virtual fonts, *note Virtual fonts: (dvips)Virtual fonts.) + `VFFONTS', `TEXFONTS'; suffix `.vf'. + + There are two special cases, because the paths and environment +variables always depend on the name of the program: the variable name is +constructed by converting the program name to upper case, and then +appending `INPUTS'. Assuming the program is called `foo', this gives +us the following table. + +`other text files' + (text files used by `foo') `FOOINPUTS'. + +`other binary files' + (binary files used by `foo') `FOOINPUTS'. + + If an environment variable by these names are set, the corresponding +`texmf.cnf' definition won't be looked at (unless, as usual, the +environment variable value has an extra `:'). *Note Default +expansion::. + + For the font variables, the intent is that: + * `TEXFONTS' is the default for everything. + + * `GLYPHFONTS' is the default for bitmap (or, more precisely, + non-metric) files. + + * Each font format has a variable of its own. + + * Each program has its own font override path as well; e.g., + `DVIPSFONTS' for Dvipsk. Again, this is for bitmaps, not metrics. + + + +File: kpathsea.info, Node: File lookup, Next: Glyph lookup, Prev: Supported file formats, Up: TeX support + +File lookup +=========== + + This section describes how Kpathsea searches for most files (bitmap +font searches are the exception, as described in the next section). + + Here is the search strategy for a file NAME: + 1. If the file format defines default suffixes, and the suffix of + NAME name is not already a known suffix for that format, try the + name with each default appended, and use alternative names found + in the fontmaps if necessary. We postpone searching the disk as + long as possible. Example: given `foo.sty', look for `foo.sty.tex' + before `foo.sty'. This is unfortunate, but allows us to find + `foo.bar.tex' before `foo.bar' if both exist and we were given + `foo.bar'. + + 2. Search for NAME, and if necessary for alternative names found in + the fontmaps. Again we avoid searching the disk if possible. + Example: given `foo', we look for `foo'. + + 3. If the file format defines a program to invoke to create missing + files, run it (*note mktex scripts::). + + This is implemented in the routine `kpse_find_file' in +`kpathsea/tex-file.c'. You can watch it in action with the debugging +options (*note Debugging::). + + +File: kpathsea.info, Node: Glyph lookup, Next: Suppressing warnings, Prev: File lookup, Up: TeX support + +Glyph lookup +============ + + This section describes how Kpathsea searches for a bitmap font in GF +or PK format (or either) given a font name (e.g., `cmr10') and a +resolution (e.g., 600). + + Here is an outline of the search strategy (details in the sections +below) for a file NAME at resolution DPI. The search stops at the +first successful lookup. + + 1. Look for an existing file NAME.DPIFORMAT in the specified + format(s). + + 2. If NAME is an alias for a file F in the fontmap file + `texfonts.map', look for F.DPI. + + 3. Run an external program (typically named `mktexpk') to generate + the font (*note mktex scripts::) + + 4. Look for FALLBACK.DPI, where FALLBACK is some last-resort font + (typically `cmr10'). + + This is implemented in `kpse_find_glyph_format' in +`kpathsea/tex-glyph.c'. + +* Menu: + +* Basic glyph lookup:: Features common to all glyph lookups. +* Fontmap:: Aliases for fonts. +* Fallback font:: Resolutions and fonts of last resort. + + +File: kpathsea.info, Node: Basic glyph lookup, Next: Fontmap, Up: Glyph lookup + +Basic glyph lookup +------------------ + + When Kpathsea looks for a bitmap font NAME at resolution DPI in a +format FORMAT, it first checks each directory in the search path for a +file `NAME.DPIFORMAT'; for example, `cmr10.600pk'. Kpathsea looks for +a PK file first, then a GF file. + + If that fails, Kpathsea looks for `dpiDPI/NAME.FORMAT'; for example, +`dpi600/cmr10.pk'. This is how fonts are typically stored on +filesystems (such as DOS) that permit only three-character extensions. + + If that fails, Kpathsea looks for a font with a close-enough DPI. +"Close enough" is defined by the macro `KPSE_BITMAP_TOLERANCE' in +`kpathsea/tex-glyph.h' to be `DPI / 500 + 1'. This is slightly more +than the 0.2% minimum allowed by the DVI standard +(). + + +File: kpathsea.info, Node: Fontmap, Next: Fallback font, Prev: Basic glyph lookup, Up: Glyph lookup + +Fontmap +------- + + If a bitmap font or metric file is not found with the original name +(see the previous section), Kpathsea looks through any "fontmap" files +for an "alias" for the original font name. These files are named +`texfonts.map' and searched for along the `TEXFONTMAPS' +environment/config file variable. All `texfonts.map' files that are +found are read; earlier definitions override later ones. + + This feature is intended to help in two respects: + + 1. An alias name is limited in length only by available memory, not + by your filesystem. Therefore, if you want to ask for + `Times-Roman' instead of `ptmr', you can (you get `ptmr8r'). + + 2. A few fonts have historically had multiple names: specifically, + LaTeX's "circle font" has variously been known as `circle10', + `lcircle10', and `lcirc10'. Aliases can make all the names + equivalent, so that it no longer matters what the name of the + installed file is; TeX documents will find their favorite name. + + + The format of fontmap files is straightforward: + + * Comments start with `%' and continue to the end of the line. + + * Blank lines are ignored. + + * Each nonblank line is broken up into a series of "words": a + sequence of non-whitespace characters. + + * If the first word is `include', the second word is used as a + filename, and it is searched for and read. + + * Otherwise, the first word on each line is the true filename; + + * the second word is the alias; + + * subsequent words are ignored. + + If an alias has an extension, it matches only those files with that +extension; otherwise, it matches anything with the same root, regardless +of extension. For example, an alias `foo.tfm' matches only when +`foo.tfm' is being searched for; but an alias `foo' matches `foo.vf', +`foo.600pk', etc. + + As an example, here is an excerpt from the `texfonts.map' in the +Web2c distribution. It makes the circle fonts equivalent and includes +automatically generated maps for most PostScript fonts available from +various font suppliers. + + circle10 lcircle10 + circle10 lcirc10 + lcircle10 circle10 + lcircle10 lcirc10 + lcirc10 circle10 + lcirc10 lcircle10 + ... + include adobe.map + include apple.map + include bitstrea.map + ... + + Fontmaps are implemented in the file `kpathsea/fontmap.c'. The +Fontname distribution has much more information on font naming (*note +Introduction: (fontname)Introduction.). + + +File: kpathsea.info, Node: Fallback font, Prev: Fontmap, Up: Glyph lookup + +Fallback font +------------- + + If a bitmap font cannot be found or created at the requested size, +Kpathsea looks for the font at a set of "fallback resolutions". You +specify these resolutions as a colon-separated list (like search paths). +Kpathsea looks first for a program-specific environment variable (e.g., +`DVIPSSIZES' for Dvipsk), then the environment variable `TEXSIZES', +then a default specified at compilation time (the Make variable +`default_texsizes'). You can set this list to be empty if you prefer +to find fonts at their stated size or not at all. + + Finally, if the font cannot be found even at the fallback resolutions, +Kpathsea looks for a fallback font, typically `cmr10'. Programs must +enable this feature by assigning to the global variable +`kpse_fallback_font' or calling `kpse_init_prog' (*note Calling +sequence::); the default is no fallback font. + + +File: kpathsea.info, Node: Suppressing warnings, Prev: Glyph lookup, Up: TeX support + +Suppressing warnings +==================== + + Kpathsea provides a way to suppress selected usually-harmless +warnings; this is useful at large sites where most users are not +administrators, and thus the warnings are merely a source of confusion, +not a help. To do this, you set the environment variable or +configuration file value `TEX_HUSH' to a colon-separated list of +values. Here are the possibilities: + +`all' + Suppress everything possible. + +`checksum' + Suppress mismatched font checksum warnings. + +`lostchar' + Suppress warnings when a character is missing from a font that a + DVI or VF file tries to typeset. + +`none' + Don't suppress any warnings. + +`readable' + Suppress warnings about attempts to access a file whose permissions + render it unreadable. + +`special' + Suppresses warnings about an unimplemented or unparsable + `\special' command. + +`tex-hush.c' defines the function that checks the variable value. Each +driver implements its own checks where appropriate. + + +File: kpathsea.info, Node: Programming, Next: Index, Prev: TeX support, Up: Top + +Programming +*********** + + This chapter is for programmers who wish to use Kpathsea. *Note +Introduction::, for the conditions under which you may do so. + +* Menu: + +* Overview: Programming overview. Introduction. +* Calling sequence:: Specifics of what to call. +* Program-specific files:: How to handle these. +* Config: Programming with config files. Getting info from texmf.cnf. + + +File: kpathsea.info, Node: Programming overview, Next: Calling sequence, Up: Programming + +Programming overview +==================== + + Aside from this manual, your best source of information is the source +to the programs I've modified to use Kpathsea (*note Introduction::). +Of those, Dviljk is probably the simplest, and hence a good place to +start. Xdvik adds VF support and the complication of X resources. +Dvipsk adds the complication of its own config files. Web2c is source +code I also maintain, so it uses Kpathsea rather straightforwardly, but +is of course complicated by the Web to C translation. Finally, +Kpsewhich is a small utility program whose sole purpose is to exercise +the main path-searching functionality. + + Beyond these examples, the `.h' files in the Kpathsea source describe +the interfaces and functionality (and of course the `.c' files define +the actual routines, which are the ultimate documentation). +`pathsearch.h' declares the basic searching routine. `tex-file.h' and +`tex-glyph.h' define the interfaces for looking up particular kinds of +files. You may wish to use `#include ', which +includes every Kpathsea header. + + The library provides no way for an external program to register new +file types: `tex-file.[ch]' must be modified to do this. For example, +Kpathsea has support for looking up Dvips config files, even though no +program other than Dvips will likely ever want to do so. I felt this +was acceptable, since along with new file types should also come new +defaults in `texmf.cnf' (and its descendant `paths.h'), since it's +simplest for users if they can modify one configuration file for all +kinds of paths. + + Kpathsea does not parse any formats itself; it barely opens any files. +Its primary purpose is to return filenames. The GNU font utilities does +contain libraries to read TFM, GF, and PK files, as do the programs +above, of course. + + +File: kpathsea.info, Node: Calling sequence, Next: Program-specific files, Prev: Programming overview, Up: Programming + +Calling sequence +================ + + The typical way to use Kpathsea in your program goes something like +this: + + 1. Call `kpse_set_program_name' with `argv[0]' as the first argument; + the second argument is a string or `NULL'. The second argument is + used by Kpathsea as the program name for the `.PROGRAM' feature of + config files (*note Config files::). If the second argument is + `NULL', the value of the first argument is used. This function + must be called before any other use of the Kpathsea library. + + If necessary, `kpse_set_program_name' sets the global variables + `program_invocation_name' and `program_invocation_short_name'. + These variables are used in the error message macros defined in + `kpathsea/lib.h'. It sets the global variable `kpse_program_name' + to the program name it uses. It also initializes debugging + options based on the environment variable `KPATHSEA_DEBUG' (if + that is set). Finally, it sets the variables `SELFAUTOLOC', + `SELFAUTODIR' and `SELFAUTOPARENT' to the location, parent and + grandparent directory of the executable, removing `.' and `..' + path elements and resolving symbolic links. These are used in the + default configuration file to allow people to invoke TeX from + anywhere, specifically from a mounted CD-ROM. (You can use + `--expand-var=\$SELFAUTOLOC', etc., to see the values finds.) + + 2. The `kpse_set_progname' is deprecated. A call to + `kpse_set_progname' with `argv[0]' is equivalent to a call of + `kpse_set_program_name' with first argument `argv[0]' and second + argument `NULL'. The function is deprecated because it cannot + ensure that the `.PROGRAM' feature of config files will always + work (*note Config files::). + + 3. Set debugging options. *Note Debugging::. If your program doesn't + have a debugging option already, you can define one and set + `kpathsea_debug' to the number that the user supplies (as in Dviljk + and Web2c), or you can just omit this altogether (people can + always set `KPATHSEA_DEBUG'). If you do have runtime debugging + already, you need to merge Kpathsea's options with yours (as in + Dvipsk and Xdvik). + + 4. If your program has its own configuration files that can define + search paths, you should assign those paths to the `client_path' + member in the appropriate element of the `kpse_format_info' array. + (This array is indexed by file type; see `tex-file.h'.) See + `resident.c' in Dvipsk for an example. + + 5. Call `kpse_init_prog' (see `proginit.c'). It's useful for the DVI + drivers, at least, but for other programs it may be simpler to + extract the parts of it that actually apply. This does not + initialize any paths, it just looks for (and sets) certain + environment variables and other random information. (A search + path is always initialized at the first call to find a file of + that type; this eliminates much useless work, e.g., initializing + the BibTeX search paths in a DVI driver.) + + 6. The routine to actually find a file of type FORMAT is + `kpse_find_FORMAT', defined in `tex-file.h'. These are macros that + expand to a call to `kpse_find_file'. You can call, say, + `kpse_find_tfm' after doing only the first of the initialization + steps above--Kpathsea automatically reads the `texmf.cnf' generic + config files, looks for environment variables, and does expansions + at the first lookup. + + 7. To find PK and/or GF bitmap fonts, the routines are `kpse_find_pk', + `kpse_find_gf' and `kpse_find_glyph', defined in `tex-glyph.h'. + These return a structure in addition to the resultant filename, + because fonts can be found in so many ways. See the documentation + in the source. + + 8. To actually open a file, not just return a filename, call + `kpse_open_file'. This function takes the name to look up and a + Kpathsea file format as arguments, and returns the usual `FILE *'. + It always assumes the file must exist, and thus will search the + disk if necessary (unless the search path specified `!!', etc.). + In other words, if you are looking up a VF or some other file that + need not exist, don't use this. + + + Kpathsea also provides many utility routines. Some are generic: hash +tables, memory allocation, string concatenation and copying, string +lists, reading input lines of arbitrary length, etc. Others are +filename-related: default path, tilde, and variable expansion, `stat' +calls, etc. (Perhaps someday I'll move the former to a separate +library.) + + The `c-*.h' header files can also help your program adapt to many +different systems. You will almost certainly want to use Autoconf for +configuring your software if you use Kpathsea; I strongly recommend +using Autoconf regardless. It is available from +. + + +File: kpathsea.info, Node: Program-specific files, Next: Programming with config files, Prev: Calling sequence, Up: Programming + +Program-specific files +====================== + + Many programs will need to find some configuration files. Kpathsea +contains some support to make it easy to place them in their own +directories. The Standard TeX directory structure (*note Introduction: +(tds)Top.), specifies that such files should go into a subdirectory +named after the program, like `texmf/ttf2pk'. + + Two special formats, `kpse_program_text_format' and +`kpse_program_binary_format' exist, which use `.:$TEXMF/PROGRAM//' as +their compiled-in search path. To override this default, you can use +the variable `PROGRAMINPUTS' in the environment and/or `texmf.cnf'. +That is to say, the name of the variable is constructed by converting +the name of the program to upper case, and appending `INPUTS'. + + The only difference between these two formats is whether +`kpse_open_file' will open the files it finds in text or binary mode. + + +File: kpathsea.info, Node: Programming with config files, Prev: Program-specific files, Up: Programming + +Programming with config files +============================= + + You can (and probably should) use the same `texmf.cnf' configuration +file that Kpathsea uses for your program. This helps installers by +keeping all configuration in one place. + + To retrieve a value VAR from config files, the best way is to call +`kpse_var_value' on the string `VAR'. This will look first for an +environment variable VAR, then a config file value. The result will be +the value found or `NULL'. This function is declared in +`kpathsea/variable.h'. For an example, see the `shell_escape' code in +`web2c/lib/texmfmp.c'. + + The routine to do variable expansion in the context of a search path +(as opposed to simply retrieving a value) is `kpse_var_expand', also +declared in `kpathsea/variable.h'. It's generally only necessary to +set the search path structure components as explained in the previous +section, rather than using this yourself. + + If for some reason you want to retrieve a value _only_ from a config +file, not automatically looking for a corresponding environment +variable, call `kpse_cnf_get' (declared in `kpathsea/cnf.h') with the +string VAR. + + No initialization calls are needed. + + +File: kpathsea.info, Node: Index, Prev: Programming, Up: Top + +Index +***** + +* Menu: + +* !! in path specifications: ls-R. +* $ expansion: Variable expansion. +* --color=tty: ls-R. +* --debug=NUM: Auxiliary tasks. +* --disable-static: configure options. +* --dpi=NUM: Path searching options. +* --enable options: configure options. +* --enable-maintainer-mode: configure options. +* --enable-shared <1>: Shared library. +* --enable-shared: configure options. +* --expand-braces=STRING: Auxiliary tasks. +* --expand-path=STRING: Auxiliary tasks. +* --expand-var=STRING: Auxiliary tasks. +* --format=NAME: Path searching options. +* --help: Standard options. +* --interactive: Path searching options. +* --mode=STRING: Path searching options. +* --must-exist: Path searching options. +* --path=STRING: Path searching options. +* --progname=NAME: Path searching options. +* --show-path=NAME: Auxiliary tasks. +* --srcdir, for building multiple architectures: configure scenarios. +* --version: Standard options. +* --with options: configure options. +* --with-mktextex-default: mktex configuration. +* --without-mktexmf-default: mktex configuration. +* --without-mktexpk-default: mktex configuration. +* --without-mktextfm-default: mktex configuration. +* -1 debugging value: Debugging. +* -A option to ls: ls-R. +* -Bdynamic: ShellWidgetClass. +* -Bstatic: ShellWidgetClass. +* -D NUM: Path searching options. +* -dynamic: ShellWidgetClass. +* -g, compiling without: configure scenarios. +* -L option to ls: ls-R. +* -mktex=FILETYPE: Path searching options. +* -no-mktex=FILETYPE: Path searching options. +* -O, compiling with: configure scenarios. +* -static: ShellWidgetClass. +* . directories, ignored: ls-R. +* . files: ls-R. +* .2602gf: Unable to generate fonts. +* .afm: Supported file formats. +* .base: Supported file formats. +* .bib: Supported file formats. +* .bst: Supported file formats. +* .cnf: Supported file formats. +* .eps: Supported file formats. +* .epsi: Supported file formats. +* .fmt: Supported file formats. +* .ist: Supported file formats. +* .map: Supported file formats. +* .mem: Supported file formats. +* .mf: Supported file formats. +* .mft: Supported file formats. +* .mp: Supported file formats. +* .ocp: Supported file formats. +* .ofm: Supported file formats. +* .opl: Supported file formats. +* .otp: Supported file formats. +* .ovf: Supported file formats. +* .ovp: Supported file formats. +* .pfa: Supported file formats. +* .pfb: Supported file formats. +* .pk: Supported file formats. +* .pool: Supported file formats. +* .pro: Supported file formats. +* .rhosts, writable by TeX: Security. +* .tex: Supported file formats. +* .tex file, included in ls-R: ls-R. +* .tfm: Supported file formats. +* .ttc: Supported file formats. +* .ttf: Supported file formats. +* .vf: Supported file formats. +* / may not be /: Searching overview. +* /, trailing in home directory: Tilde expansion. +* //: Subdirectory expansion. +* /afs/... , installing into: Installing files. +* /etc/profile: Unable to find files. +* /etc/profile and aliases: ls-R. +* /var/tmp/texfonts: mktex configuration. +* 2602gf: Unable to generate fonts. +* 4allTeX Live CD-ROM: CD-ROM distribution. +* 8.3 filenames, using: mktex configuration. +* : may not be :: Searching overview. +* :: expansion: Default expansion. +* @VAR@ substitutions: Running configure. +* \, line continuation in texmf.cnf: Config files. +* \openin: Searching overview. +* \special, suppressing warnings about: Suppressing warnings. +* absolute filenames: Searching overview. +* ac_include, Autoconf extension: Running configure. +* access warnings: Searching overview. +* Acorn TeX implementations: Other TeX packages. +* AFMFONTS: Supported file formats. +* AFS: Installing files. +* AIX 4.1 configure error: Empty Makefiles. +* AIX shells and configure: configure shells. +* aliases for fonts: Fontmap. +* aliases, for filenames: Filename aliases. +* all: Suppressing warnings. +* alphabetical order, not: Subdirectory expansion. +* Amiga support: Custom installation. +* Amiga TeX implementations: Other TeX packages. +* Andrew File System, installing with: Installing files. +* announcement mailing list: Mailing lists. +* ANSI C: TeX or Metafont failing. +* append-only directories and mktexpk: Security. +* appendonlydir: mktex configuration. +* architecture-(in)dependent files, installing only: Installing files. +* architectures, compiling multiple: configure scenarios. +* arguments to mktex: mktex script arguments. +* argv[0]: Calling sequence. +* ash, losing with configure: configure shells. +* autoconf, recommended: Calling sequence. +* automounter, and configuration: configure scenarios. +* automounter, and ls-R: ls-R. +* auxiliary tasks: Auxiliary tasks. +* Babel <1>: Running make. +* Babel: Kpathsea application distributions. +* Bach, Johann Sebastian: Default expansion. +* backbone of CTAN: Electronic distribution. +* backslash-newline: Config files. +* bash, recommended for running configure: configure shells. +* basic glyph lookup: Basic glyph lookup. +* Berry, Karl: History. +* BIBINPUTS: Supported file formats. +* binary mode, for file transfers: Electronic distribution. +* blank lines, in texmf.cnf: Config files. +* brace expansion: Brace expansion. +* BSD universe: Running make. +* bsh, ok with configure: configure shells. +* BSTINPUTS: Supported file formats. +* bug address: Reporting bugs. +* bug checklist: Bug checklist. +* bug mailing list: Mailing lists. +* bugs, reporting: Reporting bugs. +* c-*.h: Calling sequence. +* c-auto.in: Running configure. +* cache of fonts, local: Security. +* calling sequence: Calling sequence. +* CC: configure environment. +* cc warnings: Pointer combination warnings. +* cc, compiling with: configure environment. +* CD-ROM distributions: CD-ROM distribution. +* CFLAGS: configure environment. +* ChangeLog entry: Bug checklist. +* checklist for bug reports: Bug checklist. +* checksum: Suppressing warnings. +* circle fonts: Fontmap. +* clean Make target: Cleaning up. +* client_path in kpse_format_info: Calling sequence. +* cmr10, as fallback font: Fallback font. +* cmr10.vf: Searching overview. +* cnf.c: Config files. +* cnf.h: Programming with config files. +* code sharing: Shared library. +* color printers, configuring: Simple installation. +* comments, in fontmap files: Fontmap. +* comments, in texmf.cnf: Config files. +* comments, making: Introduction. +* common features in glyph lookup: Basic glyph lookup. +* common problems: Common problems. +* comp.sys.sun.admin FAQ: ShellWidgetClass. +* comp.text.tex: Mailing lists. +* compilation: Installation. +* compilation value, source for path: Path sources. +* compiler bugs: TeX or Metafont failing. +* compiler bugs, finding: TeX or Metafont failing. +* compiler options, additional: Running make. +* compiler options, specifying: configure environment. +* compiler, changing: Running make. +* compiling on HP-UX: TeX or Metafont failing. +* conditions for use: Introduction. +* config files: Config files. +* config files, for Kpathsea-using programs: Calling sequence. +* config files, programming with: Programming with config files. +* config.log: Bug checklist. +* config.ps, search path for: Supported file formats. +* config.status: Bug checklist. +* configuration: Installation. +* configuration bugs: Bug checklist. +* configuration compiler options: configure environment. +* configuration file, source for path: Path sources. +* configuration files as shell scripts.: Config files. +* configuration of mktex scripts: mktex configuration. +* configuration of optional features: configure options. +* configure error from sed: Empty Makefiles. +* configure options: configure options. +* configure options for mktex scripts: mktex configuration. +* configure, running: Running configure. +* context diff: Bug checklist. +* continuation character: Config files. +* core dumps, reporting: Bug checklist. +* CPPFLAGS: configure environment. +* crashes, reporting: Bug checklist. +* CTAN, defined: Electronic distribution. +* CTAN.sites: Electronic distribution. +* custom installation: Custom installation. +* Dante TeX CD-ROM: CD-ROM distribution. +* database search: Searching overview. +* database, for filenames: Filename database. +* database, format of: Database format. +* debug.h: Debugging. +* debugger: Bug checklist. +* debugging: Debugging. +* debugging options, in Kpathsea-using program: Calling sequence. +* debugging output: Debugging. +* debugging with -g, disabling: configure scenarios. +* DEC shells and configure: configure shells. +* default expansion: Default expansion. +* default path features: Default path features. +* default paths, changing: Default path generation. +* default paths, how they're made: Default path generation. +* default_texsizes: Fallback font. +* DEFS: configure environment. +* depot: configure scenarios. +* directories, changing default installation: Default path generation. +* directories, making append-only: mktex configuration. +* directory permissions: Security. +* directory structure, for TeX files: TeX directory structure. +* disabling mktex scripts: mktex configuration. +* disk search: Searching overview. +* disk searching, avoiding: ls-R. +* disk space, needed: Disk space. +* disk usage, reducing: Logging. +* distclean Make target: Cleaning up. +* distributions, compiling simultaneously: Kpathsea application distributions. +* distributions, not compiling: Kpathsea application distributions. +* distributions, on CD-ROM: CD-ROM distribution. +* distributions, via ftp: Electronic distribution. +* dlclose: dlopen. +* dlopen: dlopen. +* dlsym: dlopen. +* dlsym.c: dlopen. +* doc files: Supported file formats. +* DOS compatible names: mktex configuration. +* DOS support: Custom installation. +* DOS TeX implementations: Other TeX packages. +* dosnames: mktex configuration. +* dot files: ls-R. +* doubled colons: Default expansion. +* dpiNNN directories: mktex configuration. +* DVI drivers: Kpathsea application distributions. +* DVILJMAKEPK: mktex script names. +* DVILJSIZES: Fallback font. +* DVIPSFONTS: Supported file formats. +* DVIPSHEADERS: Supported file formats. +* DVIPSMAKEPK: mktex script names. +* DVIPSSIZES: Fallback font. +* dynamic creation of files: mktex scripts. +* dynamic linking problems with OpenWin libraries: ShellWidgetClass. +* EC fonts, and dynamic source creation: mktex scripts. +* elt-dirs.c: Subdirectory expansion. +* email CTAN access: Electronic distribution. +* enabling mktex scripts: mktex configuration. +* environment variable, source for path: Path sources. +* environment variables for TeX: Supported file formats. +* environment variables in paths: Variable expansion. +* environment variables, old: Unable to find files. +* epoch, seconds since: Logging. +* error message macros: Calling sequence. +* excessive startup time: Slow path searching. +* expand.c: Brace expansion. +* expanding symlinks: Calling sequence. +* expansion, default: Default expansion. +* expansion, path element: Searching overview. +* expansion, search path: Path expansion. +* expansion, subdirectory: Subdirectory expansion. +* expansion, tilde: Tilde expansion. +* expansion, variable: Variable expansion. +* explicitly relative filenames: Searching overview. +* externally-built filename database: Filename database. +* extra colons: Default expansion. +* extraclean Make target: Cleaning up. +* failed mktex... script invocation: mktex script names. +* fallback font: Fallback font. +* fallback resolutions: Fallback font. +* fallback resolutions, overriding: Running make. +* FAQ, comp.sys.sun.admin: ShellWidgetClass. +* FAQ, Kpathsea: Common problems. +* Farwell, Matthew: Subdirectory expansion. +* features, of default paths: Default path features. +* file formats, supported: Supported file formats. +* file lookup: File lookup. +* file permissions: Security. +* file types, registering new: Programming overview. +* filename aliases: Filename aliases. +* filename database: Filename database. +* filename database generation: Filename database generation. +* filenames, absolute or explicitly relative: Searching overview. +* files, unable to find: Unable to find files. +* filesystem search: Searching overview. +* floating directories: Searching overview. +* font alias files: Fontmap. +* font generation failures: Unable to generate fonts. +* font of last resort: Fallback font. +* font set, infinite: mktex scripts. +* fontmap files: Fontmap. +* fontmaps: mktex configuration. +* fontname: mktex configuration. +* fontnames, arbitrary length: Fontmap. +* fonts, being created: Simple installation. +* FOOINPUTS: Supported file formats. +* fopen, redefined: Debugging. +* format of external database: Database format. +* Free Software Foundation: CD-ROM distribution. +* FreeBSD configure error: Empty Makefiles. +* FreeBSD shells and configure: configure shells. +* FSF Source Code CD-ROM: CD-ROM distribution. +* ftp retrieval: Electronic distribution. +* ftp.tug.org: unixtex.ftp. +* fundamental purpose of Kpathsea: Introduction. +* gcc, compiling with: configure environment. +* gdb, recommended: Bug checklist. +* generation of filename database: Filename database generation. +* German TeX CD info: CD-ROM distribution. +* get_applicationShellWidgetClass: ShellWidgetClass. +* get_wmShellWidgetClass: ShellWidgetClass. +* gf: Supported file formats. +* GFFONTS: Supported file formats. +* globally writable directories: Security. +* glyph lookup: Glyph lookup. +* glyph lookup bitmap tolerance: Basic glyph lookup. +* GLYPHFONTS: Supported file formats. +* GNU C compiler bugs: TeX or Metafont failing. +* GNU General Public License: Introduction. +* Gopher CTAN access: Electronic distribution. +* group-writable directories: Security. +* GSFTOPK_DEBUG (128): Debugging. +* GUTenberg: CD-ROM distribution. +* hash table buckets, printing: Debugging. +* hash table routines: Calling sequence. +* hash_summary_only variable for debugging: Debugging. +* help, mailing list for general TeX: Mailing lists. +* HIER: Default path features. +* history of Kpathsea: History. +* home directories in paths: Tilde expansion. +* HOME, as ~ expansion: Tilde expansion. +* HP-UX, compiling on: TeX or Metafont failing. +* identifiers, characters valid in: Config files. +* illegal pointer combination warnings: Pointer combination warnings. +* include fontmap directive: Fontmap. +* INDEXSTYLE: Supported file formats. +* info-tex@shsu.edu: Mailing lists. +* input lines, reading: Calling sequence. +* install-data Make target: Installing files. +* install-exec Make target: Installing files. +* installation: Installation. +* installation testing: Installation testing. +* installation, architecture-(in)dependent files only: Installing files. +* installation, changing default directories: Default path generation. +* installation, customized: Custom installation. +* installation, getting executables instead of: Simple installation. +* installation, simple: Simple installation. +* installing files: Installing files. +* interactive query: Path searching options. +* interface, not frozen: Introduction. +* introduction: Introduction. +* kdebug:: Debugging. +* kdefault.c: Default expansion. +* Knuth, Donald E.: History. +* Knuth, Donald E., archive of programs by: Other TeX packages. +* Knuth, Donald E., original author: Electronic distribution. +* Korn shell, losing with configure: configure shells. +* Kpathsea config file, source for path: Path sources. +* Kpathsea version number: Kpathsea application distributions. +* kpathsea.h: Programming overview. +* kpathsea/HIER: Default path features. +* kpathsea/README.CONFIGURE: Running configure. +* KPATHSEA_DEBUG: Calling sequence. +* kpathsea_debug: Debugging. +* KPATHSEA_DEBUG: Debugging. +* kpathsea_debug: Debugging. +* kpathsea_debug variable: Calling sequence. +* KPSE_BITMAP_TOLERANCE: Basic glyph lookup. +* kpse_cnf_get: Programming with config files. +* KPSE_DEBUG_EXPAND (16): Debugging. +* KPSE_DEBUG_FOPEN (4): Debugging. +* KPSE_DEBUG_HASH (2): Debugging. +* KPSE_DEBUG_PATHS (8): Debugging. +* KPSE_DEBUG_SEARCH (32): Debugging. +* KPSE_DEBUG_STAT (1): Debugging. +* KPSE_DEBUG_VARS (64): Debugging. +* KPSE_DOT expansion: KPSE_DOT expansion. +* kpse_fallback_font: Fallback font. +* kpse_find_*: Calling sequence. +* kpse_find_file <1>: Calling sequence. +* kpse_find_file: File lookup. +* kpse_find_glyph_format: Glyph lookup. +* kpse_format_info: Calling sequence. +* kpse_format_info_type: Debugging. +* kpse_init_prog: Calling sequence. +* kpse_init_prog, and MAKETEX_MODE: Default path features. +* kpse_make_specs: mktex script names. +* kpse_open_file: Calling sequence. +* kpse_program_name: Calling sequence. +* kpse_set_progname: Calling sequence. +* kpse_set_program_name: Calling sequence. +* kpse_var_value: Programming with config files. +* kpsewhich: Invoking kpsewhich. +* Kpsewhich, and debugging: Debugging. +* ksh, losing with configure: configure shells. +* labrea.stanford.edu: Other TeX packages. +* LaserJet drive: Kpathsea application distributions. +* last-resort font: Fallback font. +* LaTeX help mailing list: Mailing lists. +* lcircle10: Fontmap. +* LDFLAGS: configure environment. +* leading colons: Default expansion. +* leaf directories wrongly guessed: Unable to find files. +* leaf directory trick: Subdirectory expansion. +* libdl.a: dlopen. +* libraries, changing: Running make. +* libraries, specifying additional: configure environment. +* LIBS: configure environment. +* libucb, avoiding: Running make. +* license for using the library: Introduction. +* lines, reading arbitrary-length: Calling sequence. +* Linux File System Standard: mktex configuration. +* Linux shells and configure: configure shells. +* Linux, using Web2c: CD-ROM distribution. +* lndir for building symlink trees: configure scenarios. +* loader options: configure environment. +* loader options, final: Running make. +* loader options, initial: Running make. +* local cache of fonts: Security. +* log file: Logging. +* logging successful searches: Logging. +* lost+found directory: Searching overview. +* lostchar: Suppressing warnings. +* ls-R: Supported file formats. +* ls-R and AFS: Installing files. +* ls-R database file: ls-R. +* ls-R, simplest build: ls-R. +* Mach10 configure error: Empty Makefiles. +* Macintosh TeX implementations: Other TeX packages. +* MacKenzie, David <1>: Subdirectory expansion. +* MacKenzie, David: History. +* magic characters: Searching overview. +* mailing lists: Mailing lists. +* maintainer-clean Make target: Cleaning up. +* Make arguments, additional: Running make. +* make, running: Running make. +* Makefile.in: Running configure. +* Makefiles, empty: Empty Makefiles. +* MAKETEX_DEBUG (512): Debugging. +* MAKETEX_FINE_DEBUG (1024): Debugging. +* MAKETEX_MODE: Default path features. +* memory allocation routines: Calling sequence. +* metafont driver files: mktex configuration. +* Metafont failures: TeX or Metafont failing. +* Metafont installation: Unable to generate fonts. +* Metafont making too-large fonts: Unable to generate fonts. +* Metafont using the wrong resolution: Unable to generate fonts. +* MFBASES: Supported file formats. +* MFINPUTS: Supported file formats. +* MFPOOL: Supported file formats. +* MFTINPUTS: Supported file formats. +* mirrors, FTP: Electronic distribution. +* mismatched checksum warnings: Suppressing warnings. +* missfont.log: mktex script names. +* MISSFONT_LOG: mktex script names. +* missing character warnings: Suppressing warnings. +* mktex script configuration: mktex configuration. +* mktex script names: mktex script names. +* mktex scripts: mktex scripts. +* mktex.cnf: mktex configuration. +* mktex.opt: mktex configuration. +* mktexdir: mktex configuration. +* mktexmf: mktex script names. +* mktexpk: mktex script names. +* mktexpk , initial runs: Simple installation. +* mktextex: mktex script names. +* mktextfm: mktex script names. +* mode directory, omitting: mktex configuration. +* Morgan, Tim: History. +* mostlyclean Make target: Cleaning up. +* MPINPUTS: Supported file formats. +* MPMEMS: Supported file formats. +* MPPOOL: Supported file formats. +* MPSUPPORT: Supported file formats. +* MT_FEATURES: mktex configuration. +* multiple architectures, compiling on: configure scenarios. +* multiple architectures, directories for: configure scenarios. +* multiple architectures, installing on: Installing files. +* multiple TeX hierarchies: Brace expansion. +* must exist: Searching overview. +* names for mktex scripts: mktex script names. +* NetBSD configure error: Empty Makefiles. +* NetBSD shells and configure: configure shells. +* Neumann, Gustaf: History. +* newsgroup for TeX: Mailing lists. +* NeXT sed error: Empty Makefiles. +* NeXT, lacking X11: Kpathsea application distributions. +* NFS and ls-R: ls-R. +* NFS CTAN access: Electronic distribution. +* nomfdrivers: mktex configuration. +* nomode: mktex configuration. +* non-English typesetting: Kpathsea application distributions. +* non-Unix operating systems: Custom installation. +* none: Suppressing warnings. +* NTG: CD-ROM distribution. +* null pointers, dereferencing: Bug checklist. +* numeric debugging values: Debugging. +* obtaining TeX: unixtex.ftp. +* obtaining Web2c by ftp: Electronic distribution. +* obtaining Web2c on CD-ROM: CD-ROM distribution. +* OCPINPUTS: Supported file formats. +* OFMFONTS: Supported file formats. +* online Metafont display, spurious: Unable to generate fonts. +* OpenWin libraries, dynamic linking problems: ShellWidgetClass. +* optimization caveat: TeX or Metafont failing. +* optimization, enabling: configure scenarios. +* options for debugging: Debugging. +* options to configure: configure options. +* OS/2 support: Custom installation. +* other TeX distributions: Other TeX packages. +* OTPINPUTS: Supported file formats. +* overview of path searching: Searching overview. +* overview of programming with Kpathsea: Programming overview. +* OVFFONTS: Supported file formats. +* OVPFONTS: Supported file formats. +* patches, Sun OpenWin: ShellWidgetClass. +* path expansion: Path expansion. +* path searching: Path searching. +* path searching options: Path searching options. +* path searching, overview: Searching overview. +* path searching, standalone: Invoking kpsewhich. +* path sources: Path sources. +* paths, changing default <1>: Default path generation. +* paths, changing default: Changing search paths. +* paths, device name included in: Default path features. +* paths.h: Default path generation. +* paths.h, creating: Running make. +* pathsearch.h: Programming overview. +* pc Pascal compiler: History. +* PCL driver: Kpathsea application distributions. +* PDF generation: Kpathsea application distributions. +* permission denied: Searching overview. +* permissions, directory: Security. +* permissions, file: Security. +* PKFONTS: Supported file formats. +* plain.base: Unable to generate fonts. +* pointer combination warnings: Pointer combination warnings. +* PostScript driver: Kpathsea application distributions. +* PostScript fonts, additional: Simple installation. +* precompiled executables, instead of installation: Simple installation. +* precompiled Unix binaries: Other TeX packages. +* preprocessor options: configure environment. +* preprocessor options, additional: Running make. +* Prime Time TeXcetera CD-ROM: CD-ROM distribution. +* printer configuration files: Simple installation. +* privacy, semblance of: Logging. +* problems, common: Common problems. +* proginit.c: Default path features. +* proginit.h: Calling sequence. +* program-varying paths: Supported file formats. +* program_invocation_name: Calling sequence. +* program_invocation_short_name: Calling sequence. +* programming overview: Programming overview. +* programming with config files: Programming with config files. +* programming with Kpathsea: Calling sequence. +* programs using the library: Introduction. +* proof mode: Unable to generate fonts. +* PSHEADERS: Supported file formats. +* pxp Pascal preprocessor: History. +* quoting variable values: Variable expansion. +* readable: Suppressing warnings. +* reading arbitrary-length lines: Calling sequence. +* README.CONFIGURE: Running configure. +* README.mirrors: Electronic distribution. +* recording successful searches: Logging. +* relative filenames: Searching overview. +* relative filenames in ls-R: Installing files. +* reporting bugs: Reporting bugs. +* resident.c: Calling sequence. +* resolution, setting: Path searching options. +* resolution, wrong: Unable to generate fonts. +* resolutions, last-resort: Fallback font. +* retrieving TeX: unixtex.ftp. +* right-hand side of variable assignments: Config files. +* Rokicki, Tom: History. +* root user: Tilde expansion. +* runtime configuration files: Config files. +* runtime debugging: Debugging. +* Sauter fonts, and dynamic source creation: mktex scripts. +* scripts for file creation: mktex scripts. +* search path, defined: Searching overview. +* search paths, changing default: Changing search paths. +* searching for files: File lookup. +* searching for glyphs: Glyph lookup. +* searching overview: Searching overview. +* searching the database: Searching overview. +* searching the disk: Searching overview. +* security considerations: Security. +* sed error from configure: Empty Makefiles. +* SELFAUTODIR: Calling sequence. +* SELFAUTOLOC: Calling sequence. +* SELFAUTOPARENT: Calling sequence. +* sending patches: Bug checklist. +* setgid scripts: Security. +* sh5, ok with configure: configure shells. +* shar, recommended: Bug checklist. +* shared library, making: Shared library. +* shell scripts as configuration files: Config files. +* shell variables: Variable expansion. +* shell_escape, example for code: Programming with config files. +* shells and configure: configure shells. +* simple installation: Simple installation. +* site overrides for mktex...: mktex configuration. +* size of distribution archives: Disk space. +* skeleton TeX directory: TeX directory structure. +* slow startup time: Slow path searching. +* Solaris BSD compatibility, not: Running make. +* source files: Supported file formats. +* sources for search paths: Path sources. +* special: Suppressing warnings. +* st_nlink: Subdirectory expansion. +* stack trace: Bug checklist. +* standalone path searching: Invoking kpsewhich. +* standard error and debugging output: Debugging. +* standard options: Standard options. +* startup time, excessive: Slow path searching. +* static linking: ShellWidgetClass. +* static linking and dlsym: dlopen. +* string routines: Calling sequence. +* strip: mktex configuration. +* stripsupplier: mktex configuration. +* striptypeface: mktex configuration. +* subdirectory searching: Subdirectory expansion. +* suggestions, making: Introduction. +* Sun 2: History. +* Sun OpenWin patches: ShellWidgetClass. +* supplier directory, omitting: mktex configuration. +* supported file formats: Supported file formats. +* suppressing warnings: Suppressing warnings. +* symbolic link trees, for multiple architectures: configure scenarios. +* symbolic links not found: Unable to find files. +* symbolic links, and ls-R: ls-R. +* symlinks, resolving: Calling sequence. +* system C compiler bugs: TeX or Metafont failing. +* system dependencies: Running configure. +* system V universe: Running make. +* T1FONTS: Supported file formats. +* T1INPUTS: Supported file formats. +* T42FONTS: Supported file formats. +* TDS: TeX directory structure. +* testing, post-installation: Installation testing. +* tests, simple: Simple installation. +* teTeX: Other TeX packages. +* TeX directory structure: TeX directory structure. +* TeX distributions besides Web2c: Other TeX packages. +* TeX environment variables: Supported file formats. +* TeX failures: TeX or Metafont failing. +* TeX file lookup: File lookup. +* TeX glyph lookup: Glyph lookup. +* TeX help mailing list: Mailing lists. +* TeX hierarchy, one: configure scenarios. +* TeX Live CD-ROM: CD-ROM distribution. +* TeX support: TeX support. +* TeX Users Group: Introduction. +* tex-archive@math.utah.edu: Mailing lists. +* tex-file.c: File lookup. +* tex-file.h: Programming overview. +* tex-glyph.c: Glyph lookup. +* tex-glyph.h: Programming overview. +* tex-k-request@mail.tug.org: Mailing lists. +* tex-k@mail.tug.org (bug address): Reporting bugs. +* tex-make.c: mktex script names. +* TEX_HUSH <1>: Suppressing warnings. +* TEX_HUSH: Searching overview. +* TEXBIB: Supported file formats. +* TEXCONFIG: Supported file formats. +* TEXDOCS: Supported file formats. +* TEXFONTMAPS: Supported file formats. +* TEXFONTS: Supported file formats. +* texfonts.map: Fontmap. +* TEXFORMATS: Supported file formats. +* TEXINDEXSTYLE: Supported file formats. +* TEXINPUTS: Supported file formats. +* TEXMF: TeX directory structure. +* texmf.cnf, and variable expansion: Variable expansion. +* texmf.cnf, creating: Running make. +* texmf.cnf, definition for: Config files. +* texmf.cnf, generated: Default path generation. +* texmf.cnf, source for path: Path sources. +* texmf.in: Default path generation. +* texmf.in, editing: Changing search paths. +* texmf.sed: Default path generation. +* TEXMFCNF <1>: Supported file formats. +* TEXMFCNF: Config files. +* TEXMFDBS <1>: Supported file formats. +* TEXMFDBS: ls-R. +* TEXMFINI: Supported file formats. +* TEXMFLOG: Logging. +* TEXMFOUTPUT: mktex script names. +* TEXPICTS: Supported file formats. +* TEXPKS: Supported file formats. +* TEXPOOL: Supported file formats. +* TEXPSHEADERS: Supported file formats. +* TEXSIZES: Fallback font. +* TEXSOURCES: Supported file formats. +* TFMFONTS: Supported file formats. +* tilde expansion: Tilde expansion. +* tilde.c: Tilde expansion. +* time system call: Logging. +* tolerance for glyph lookup: Basic glyph lookup. +* total disk space: Disk space. +* trailing / in home directory: Tilde expansion. +* trailing colons: Default expansion. +* TRFONTS: Supported file formats. +* trick for detecting leaf directories: Subdirectory expansion. +* trojan horse attack: Security. +* TTFONTS: Supported file formats. +* TUG: CD-ROM distribution. +* tug.org: unixtex.ftp. +* tug@tug.org: Introduction. +* typeface directory, omitting: mktex configuration. +* ucbinclude, avoiding: Running make. +* UKTUG: CD-ROM distribution. +* Ultrix shells and configure: configure shells. +* unable to find files: Unable to find files. +* unable to generate fonts: Unable to generate fonts. +* uname: Bug checklist. +* universe, BSD vs. system V: Running make. +* UNIX_ST_LINK: Subdirectory expansion. +* unixtex.ftp: unixtex.ftp. +* unknown special warnings: Suppressing warnings. +* unreadable file warnings: Suppressing warnings. +* unreadable files: Searching overview. +* unusable ls-R warning: ls-R. +* usage patterns, finding: Logging. +* USE_VARTEXFONTS: mktex configuration. +* Usenet TeX newsgroup: Mailing lists. +* varfonts: mktex configuration. +* variable expansion: Variable expansion. +* variable.c: Variable expansion. +* variable.h: Programming with config files. +* VARTEXFONTS: mktex configuration. +* VAX 11/750: History. +* version number, of Kpathsea: Kpathsea application distributions. +* version numbers, determining: Bug checklist. +* VF files, not found: Searching overview. +* VFFONTS: Supported file formats. +* VMS support: Custom installation. +* VMS TeX implementations: Other TeX packages. +* Vojta, Paul: History. +* Walnut Creek TeX CD-ROM: CD-ROM distribution. +* Walsh, Norman: History. +* warning about unusable ls-R: ls-R. +* warnings, file access: Searching overview. +* warnings, pointer combinations: Pointer combination warnings. +* warnings, suppressing: Suppressing warnings. +* wcstombs: dlopen. +* Weber, Olaf: History. +* whitespace, in fontmap files: Fontmap. +* whitespace, not ignored on continuation lines: Config files. +* Windows TeX implementations: Other TeX packages. +* World Wide Web CTAN access: Electronic distribution. +* www.tug.org: unixtex.ftp. +* X11 previewer: Kpathsea application distributions. +* X11, lacking on NeXT: Kpathsea application distributions. +* XCFLAGS: Running make. +* XCPPFLAGS: Running make. +* XDEFS: Running make. +* XDVIFONTS: Supported file formats. +* XDVIMAKEPK: mktex script names. +* XDVISIZES: Fallback font. +* XLDFLAGS: Running make. +* XLOADLIBES: Running make. +* XMAKEARGS: Running make. +* Xmu library problems: ShellWidgetClass. +* XtStrings: XtStrings. +* zuhn, david: History. +* { expansion: Brace expansion. +* ~ expansion: Tilde expansion. + +  Tag Table: -(Indirect) -Node: Top1415 -Node: Introduction2061 -Node: History4046 -Node: Installation8122 -Node: Simple installation8912 -Node: Custom installation12486 -Node: Disk space13652 -Node: Kpathsea application distributions14526 -Node: Changing search paths15629 -Node: Default path features16797 -Node: Default path generation18913 -Node: Running configure20340 -Node: configure shells21379 -Node: configure options22410 -Node: configure environment23901 -Node: configure scenarios25689 -Node: Shared library27263 -Node: Running make28580 -Node: Installing files30611 -Node: Cleaning up32544 -Node: Filename database generation33579 -Node: mktex scripts34133 -Node: mktex configuration35079 -Node: mktex script names39970 -Node: mktex script arguments41051 -Node: Installation testing41926 -Node: Security42278 -Node: TeX directory structure44831 -Node: unixtex.ftp49244 -Node: Electronic distribution50811 -Node: CD-ROM distribution54895 -Node: Tape distribution56880 -Node: Other TeX packages57740 -Node: Reporting bugs59029 -Node: Bug checklist59764 -Node: Mailing lists63853 -Node: Debugging65198 -Node: Logging70253 -Node: Common problems71751 -Node: Unable to find files72572 -Node: Slow path searching74969 -Node: Unable to generate fonts76331 -Node: TeX or Metafont failing77875 -Node: Empty Makefiles79734 -Node: XtStrings80946 -Node: dlopen81766 -Node: ShellWidgetClass82568 -Node: Pointer combination warnings84186 -Node: Path searching84561 -Node: Searching overview85206 -Node: Path sources88563 -Node: Config files89626 -Node: Path expansion93119 -Node: Default expansion94062 -Node: Variable expansion95738 -Node: Tilde expansion97126 -Node: Brace expansion98010 -Node: KPSE_DOT expansion99205 -Node: Subdirectory expansion99708 -Node: Filename database102039 -Node: ls-R103344 -Node: Filename aliases106220 -Node: Database format107385 -Node: Invoking kpsewhich108397 -Node: Path searching options109266 -Node: Auxiliary tasks112957 -Node: Standard options114215 -Node: TeX support114525 -Node: Supported file formats115812 -Node: File lookup122064 -Node: Glyph lookup123346 -Node: Basic glyph lookup124465 -Node: Fontmap125332 -Node: Fallback font127930 -Node: Suppressing warnings128885 -Node: Programming129942 -Node: Programming overview130453 -Node: Calling sequence132368 -Node: Program-specific files137389 -Node: Programming with config files138419 -Node: Index139709 +Node: Top1404 +Node: Introduction2052 +Node: History4035 +Node: Installation8111 +Node: Simple installation8901 +Node: Custom installation12476 +Node: Disk space13642 +Node: Kpathsea application distributions14516 +Node: Changing search paths15619 +Node: Default path features16787 +Node: Default path generation18903 +Node: Running configure20330 +Node: configure shells21369 +Node: configure options22400 +Node: configure environment23891 +Node: configure scenarios25679 +Node: Shared library27253 +Node: Running make28570 +Node: Installing files30601 +Node: Cleaning up32534 +Node: Filename database generation33569 +Node: mktex scripts34123 +Node: mktex configuration35069 +Node: mktex script names40147 +Node: mktex script arguments41228 +Node: Installation testing42103 +Node: Security42455 +Node: TeX directory structure45008 +Node: unixtex.ftp49421 +Node: Electronic distribution51317 +Node: CD-ROM distribution55529 +Node: Other TeX packages57518 +Node: Reporting bugs58809 +Node: Bug checklist59544 +Node: Mailing lists63633 +Node: Debugging64978 +Node: Logging70033 +Node: Common problems71531 +Node: Unable to find files72352 +Node: Slow path searching74749 +Node: Unable to generate fonts76111 +Node: TeX or Metafont failing77655 +Node: Empty Makefiles79514 +Node: XtStrings80726 +Node: dlopen81546 +Node: ShellWidgetClass82348 +Node: Pointer combination warnings83966 +Node: Path searching84341 +Node: Searching overview84986 +Node: Path sources88343 +Node: Config files89406 +Node: Path expansion92899 +Node: Default expansion93842 +Node: Variable expansion95518 +Node: Tilde expansion96906 +Node: Brace expansion97790 +Node: KPSE_DOT expansion98880 +Node: Subdirectory expansion99383 +Node: Filename database101714 +Node: ls-R103019 +Node: Filename aliases105895 +Node: Database format107060 +Node: Invoking kpsewhich108072 +Node: Path searching options108941 +Node: Auxiliary tasks112632 +Node: Standard options113890 +Node: TeX support114200 +Node: Supported file formats115487 +Node: File lookup121739 +Node: Glyph lookup123022 +Node: Basic glyph lookup124141 +Node: Fontmap125008 +Node: Fallback font127606 +Node: Suppressing warnings128561 +Node: Programming129660 +Node: Programming overview130171 +Node: Calling sequence132086 +Node: Program-specific files137107 +Node: Programming with config files138137 +Node: Index139427  End Tag Table diff -Naur xdvik-22.40n/texk/kpathsea/kpathsea.texi xdvik-22.40o/texk/kpathsea/kpathsea.texi --- xdvik-22.40n/texk/kpathsea/kpathsea.texi Wed Apr 18 14:24:32 2001 +++ xdvik-22.40o/texk/kpathsea/kpathsea.texi Wed Oct 16 22:26:22 2002 @@ -2,8 +2,8 @@ @setfilename kpathsea.info @settitle Kpathsea: A library for path searching -@set version 3.2 -@set month-year October 1997 +@set version 3.3.8 +@set month-year October 2002 @c Define new indices for commands, filenames, and options. @defcodeindex cm @@ -34,7 +34,7 @@ @ifinfo This file documents the Kpathsea library for path searching. -Copyright (C) 1993, 94, 95, 96, 97 K. Berry & O. Weber. +Copyright (C) 1993-2001 K. Berry & O. Weber. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are @@ -164,15 +164,15 @@ proceedings, and arranges courses on @TeX{} for all levels of users throughout the world. Anyway, here is the address: -@flindex office@@tug.org +@flindex tug@@tug.org @display @TeX{} Users Group -P.O. Box 1239 -Three Rivers, CA 93271-1239 +P.O. Box 2311 +Portland OR 97208-2311 USA -phone: 1 209 561 0112 -fax: 1 209 561 4584 -email: @email{office@@tug.org} +phone: +1 503 223-9994 +fax: +1 503 223-3960 +email: @email{tug@@tug.org} @end display @menu @@ -712,32 +712,31 @@ @kindex @{ @r{expansion} @cindex brace expansion -@samp{x@{@var{a}:@var{b}@}y} expands to @samp{x@var{a}y:x@var{b}y}. +@samp{x@{@var{a},@var{b}@}y} expands to @samp{x@var{a}y:x@var{b}y}. For example: @example -foo/@{1:2@}/baz +foo/@{1,2@}/baz @end example @noindent expands to @samp{foo/1/baz:foo/2/baz}. @samp{:} is the path separator on the current system; e.g., on a DOS system, it's @samp{;}. -Braces can be nested; for example, @samp{x@{A:B@{1:2@}@}y} expands to +Braces can be nested; for example, @samp{x@{A,B@{1,2@}@}y} expands to @samp{xAy:xB1y:xB2y}. Multiple non-nested braces are expanded from right to left; for example, -@samp{x@{A:B@}@{1:2@}y} expands to @samp{x@{A:B@}1y:x@{A:B@}2y}, which -expands to @samp{xA1y:xB1y:xA2y:xB2:y}. +@samp{x@{A,B@}@{1,2@}y} expands to @samp{x@{A,B@}1y:x@{A,B@}2y}, which +expands to @samp{xA1y:xB1y:xA2y:xB2y}. @cindex multiple @TeX{} hierarchies This feature can be used to implement multiple @TeX{} hierarchies, by assigning a brace list to @code{$TEXMF}, as mentioned in @file{texmf.in}. -In old versions of the library you had to use a comma. While this usage -is deprecated, it is still supported for backwards compatibility with -old configurations. The last example could have been written -@samp{x@{A,B@}@{1,2@}y}. +You can also use the path separator in stead of the comma. The last +example could have been written @samp{x@{A:B@}@{1:2@}y}. + @flindex expand.c Brace expansion is implemented in the source file @@ -1641,7 +1640,7 @@ @samp{foo.bar}. @item -Search for @var{name}, and if necssary for alternative names found in +Search for @var{name}, and if necessary for alternative names found in the fontmaps. Again we avoid searching the disk if possible. Example: given @samp{foo}, we look for @samp{foo}. @@ -1866,6 +1865,9 @@ @cindex missing character warnings Suppress warnings when a character is missing from a font that a DVI or VF file tries to typeset. + +@item none +Don't suppress any warnings. @item readable @cindex unreadable file warnings diff -Naur xdvik-22.40n/texk/kpathsea/kpathsea.version xdvik-22.40o/texk/kpathsea/kpathsea.version --- xdvik-22.40n/texk/kpathsea/kpathsea.version Wed Apr 18 14:24:32 2001 +++ xdvik-22.40o/texk/kpathsea/kpathsea.version Wed Oct 16 22:26:22 2002 @@ -1,3 +1,3 @@ # Version information for Klibtool. # MAJOR MINOR DELTA -kpathsea 3 2 1 +kpathsea 3 3 8 diff -Naur xdvik-22.40n/texk/kpathsea/kpsestat.c xdvik-22.40o/texk/kpathsea/kpsestat.c --- xdvik-22.40n/texk/kpathsea/kpsestat.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/kpsestat.c Wed Oct 16 22:26:22 2002 @@ -1,5 +1,5 @@ /* kpsestat -- show file permissions of a file in octal form. - Copyright (C) 1997 Olaf Weber. + Copyright (C) 1997, 2000 Olaf Weber. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,23 +15,18 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" -#include "kpathsea/c-stat.h" +#include +#include #include #include -#ifdef WIN32 -#include -#endif - /* * kpsestat mode x * Print stat bits of file x on stdout, as modified by mode. */ -int main (argc, argv) - int argc; - char *argv[]; +int +main P2C(int, argc, char **, argv) { char * mode_string; int to_set, to_keep, to_clear; @@ -114,7 +109,8 @@ /* does the file exist? */ if (stat (argv[2], &f) < 0) { - perror(argv[0]); + fprintf(stderr, "%s: ", argv[0]); + perror(argv[2]); return 1; } diff -Naur xdvik-22.40n/texk/kpathsea/kpsestat.man xdvik-22.40o/texk/kpathsea/kpsestat.man --- xdvik-22.40n/texk/kpathsea/kpsestat.man Wed Apr 18 14:24:32 2001 +++ xdvik-22.40o/texk/kpathsea/kpsestat.man Wed Oct 16 22:26:22 2002 @@ -49,8 +49,5 @@ .rb Print version information and exit. .\"===================================================================== -.SH BUGS -The error message when the file doesn't exist is rather cryptic. -.\"===================================================================== .SH "SEE ALSO" .BR chmod (1). diff -Naur xdvik-22.40n/texk/kpathsea/kpsewhich.c xdvik-22.40o/texk/kpathsea/kpsewhich.c --- xdvik-22.40n/texk/kpathsea/kpsewhich.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/kpsewhich.c Wed Oct 16 22:26:22 2002 @@ -17,18 +17,18 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" -#include "kpathsea/c-ctype.h" -#include "kpathsea/c-pathch.h" -#include "kpathsea/expand.h" -#include "kpathsea/getopt.h" -#include "kpathsea/line.h" -#include "kpathsea/pathsearch.h" -#include "kpathsea/proginit.h" -#include "kpathsea/tex-file.h" -#include "kpathsea/tex-glyph.h" -#include "kpathsea/variable.h" -#include "kpathsea/progname.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* Base resolution. (-D, -dpi) */ @@ -79,7 +79,10 @@ /* Use the file type from -format if that was specified, else guess dynamically from NAME. Return kpse_last_format if undeterminable. This function is also used to parse the -format string, a case which - we distinguish by setting is_filename to false. */ + we distinguish by setting is_filename to false. + + Note that a few filenames have been hard-coded for format types that + differ from what would be inferred from their extensions. */ static kpse_file_format_type find_format P2C(string, name, boolean, is_filename) @@ -88,33 +91,34 @@ if (is_filename && user_format != kpse_last_format) { ret = user_format; - } else if (FILESTRCASEEQ (name, "psfonts.map")) { + } else if (FILESTRCASEEQ (name, "psfonts.map") || + FILESTRCASEEQ (name, "pdftex.map")) { ret = kpse_dvips_config_format; } else { - kpse_file_format_type f; + int f; /* kpse_file_format_type */ boolean found = false; unsigned name_len = strlen (name); /* Have to rely on `try_len' being declared here, since we can't assume GNU C and statement expressions. */ -#define TRY_SUFFIX(try) (\ - try_len = (try) ? strlen (try) : 0, \ - (try) && try_len <= name_len \ - && FILESTRCASEEQ (try, name + name_len - try_len)) +#define TRY_SUFFIX(ftry) (\ + try_len = (ftry) ? strlen (ftry) : 0, \ + (ftry) && try_len <= name_len \ + && FILESTRCASEEQ (ftry, name + name_len - try_len)) for (f = 0; !found && f < kpse_last_format; f++) { unsigned try_len; const_string *ext; - const_string try; + const_string ftry; if (!kpse_format_info[f].type) - kpse_init_format (f); + kpse_init_format ((kpse_file_format_type)f); if (!is_filename) { /* Allow the long name, but only in the -format option. We don't want a filename confused with a format name. */ - try = kpse_format_info[f].type; - found = TRY_SUFFIX (try); + ftry = kpse_format_info[f].type; + found = TRY_SUFFIX (ftry); } for (ext = kpse_format_info[f].suffix; !found && ext && *ext; ext++){ found = TRY_SUFFIX (*ext); @@ -124,7 +128,7 @@ } } /* If there was a match, f will be one past the correct value. */ - ret = found ? f - 1 : kpse_last_format; + ret = found ? (kpse_file_format_type)(f - 1) : kpse_last_format; } return ret; @@ -260,8 +264,8 @@ user_format_string = optarg; } else if (ARGUMENT_IS ("help")) { - kpse_file_format_type f; - extern DllImport char *kpse_bug_address; /* from version.c */ + int f; /* kpse_file_format_type */ + extern KPSEDLL char *kpse_bug_address; /* from version.c */ printf ("Usage: %s [OPTION]... [FILENAME]...\n", argv[0]); fputs (USAGE, stdout); @@ -274,7 +278,7 @@ puts ("\nRecognized format names and their suffixes:"); for (f = 0; f < kpse_last_format; f++) { const_string *ext; - kpse_init_format (f); + kpse_init_format ((kpse_file_format_type)f); printf ("%s:", kpse_format_info[f].type); for (ext = kpse_format_info[f].suffix; ext && *ext; ext++) { putchar (' '); @@ -309,7 +313,7 @@ user_format_string = optarg; } else if (ARGUMENT_IS ("version")) { - extern DllImport char *kpathsea_version_string; /* from version.c */ + extern KPSEDLL char *kpathsea_version_string; /* from version.c */ puts (kpathsea_version_string); puts ("Copyright (C) 1997 K. Berry.\n\ There is NO warranty. You may redistribute this software\n\ diff -Naur xdvik-22.40n/texk/kpathsea/kpsewhich.man xdvik-22.40o/texk/kpathsea/kpsewhich.man --- xdvik-22.40n/texk/kpathsea/kpsewhich.man Wed Apr 18 14:24:32 2001 +++ xdvik-22.40o/texk/kpathsea/kpsewhich.man Wed Oct 16 22:26:22 2002 @@ -31,7 +31,12 @@ .PP .B kpsewhich is used as a standalone front-end of the kpathsea library that can be -used to examine variables and find files. +used to examine variables and find files. When the +.B --format +option is not given, the search path used when looking for a file is +inferred from the name given, by looking for a known extension. If +no known extension is found, the search path for \*(TX source files is +used. .\"===================================================================== .SH OPTIONS .B kpsewhich @@ -123,7 +128,7 @@ .\" separates components in .\" .B --path .\" output; default is -.\| .I : +.\" .I : .\" on UNIX systems. .TP .BI --show-path \ name diff -Naur xdvik-22.40n/texk/kpathsea/lib.h xdvik-22.40o/texk/kpathsea/lib.h --- xdvik-22.40n/texk/kpathsea/lib.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/lib.h Wed Oct 16 22:26:22 2002 @@ -1,6 +1,6 @@ /* lib.h: declarations for common, low-level routines in kpathsea. -Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +Copyright (C) 1992, 93, 94, 95, 96, 2000 Free Software Foundation, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -19,7 +19,7 @@ #ifndef KPATHSEA_LIB_H #define KPATHSEA_LIB_H -#include "kpathsea/types.h" +#include /* Define common sorts of messages. */ @@ -66,14 +66,14 @@ /* I find this easier to read. */ -#define STREQ(s1, s2) (strcmp (s1, s2) == 0) -#define STRNEQ(s1, s2, n) (strncmp (s1, s2, n) == 0) +#define STREQ(s1, s2) ((s1) && (s2) && (strcmp (s1, s2) == 0)) +#define STRNEQ(s1, s2, n) ((s1) && (s2) && (strncmp (s1, s2, n) == 0)) /* Support for FAT/ISO-9660 filesystems. Theoretically this should be done at runtime, per filesystem, but that's painful to program. */ #ifdef MONOCASE_FILENAMES -#define FILESTRCASEEQ(s1, s2) (strcasecmp (s1, s2) == 0) -#define FILESTRNCASEEQ(s1, s2, l) (strncasecmp (s1, s2, l) == 0) +#define FILESTRCASEEQ(s1, s2) ((s1) && (s2) && (strcasecmp (s1, s2) == 0)) +#define FILESTRNCASEEQ(s1, s2, l) ((s1) && (s2) && (strncasecmp (s1, s2, l) == 0)) #define FILECHARCASEEQ(c1, c2) (toupper (c1) == toupper (c2)) #else #define FILESTRCASEEQ STREQ @@ -91,29 +91,32 @@ #define ENVVAR(test, default) (getenv (test) ? (test) : (default)) /* Return a fresh copy of S1 followed by S2, et al. */ -extern DllImport string concat P2H(const_string s1, const_string s2); -extern DllImport string concat3 P3H(const_string, const_string, const_string); +extern KPSEDLL string concat P2H(const_string s1, const_string s2); +extern KPSEDLL string concat3 P3H(const_string, const_string, const_string); /* `concatn' is declared in its own include file, to avoid pulling in all the varargs stuff. */ /* A fresh copy of just S. */ -extern DllImport string xstrdup P1H(const_string s); +extern KPSEDLL string xstrdup P1H(const_string s); /* Convert all lowercase characters in S to uppercase. */ -extern DllImport string uppercasify P1H(const_string s); +extern KPSEDLL string uppercasify P1H(const_string s); /* Like `atoi', but disallow negative numbers. */ -extern DllImport unsigned atou P1H(const_string); +extern KPSEDLL unsigned atou P1H(const_string); /* True if FILENAME1 and FILENAME2 are the same file. If stat fails on either name, return false, no error message. Cf. `SAME_FILE_P' in xstat.h. */ -extern DllImport boolean same_file_p P2H(const_string filename1, +extern KPSEDLL boolean same_file_p P2H(const_string filename1, const_string filename2); /* Return NAME with any leading path stripped off. This returns a pointer into NAME. */ -extern DllImport const_string xbasename P1H(const_string name); +extern KPSEDLL const_string xbasename P1H(const_string name); + +/* Return directory part of NAME. This returns a new string. */ +extern KPSEDLL string xdirname P1H(const_string name); #ifndef HAVE_STRSTR extern string strstr P2H(const_string haystack, const_string needle); @@ -121,53 +124,53 @@ /* If NAME has a suffix, return a pointer to its first character (i.e., the one after the `.'); otherwise, return NULL. */ -extern DllImport string find_suffix P1H(const_string name); +extern KPSEDLL string find_suffix P1H(const_string name); /* Return NAME with any suffix removed. */ -extern DllImport string remove_suffix P1H(const_string name); +extern KPSEDLL string remove_suffix P1H(const_string name); /* Return S with the suffix SUFFIX, removing any suffix already present. For example, `make_suffix ("/foo/bar.baz", "quux")' returns `/foo/bar.quux'. Returns a string allocated with malloc. */ -extern DllImport string make_suffix P2H(const_string s, const_string suffix); +extern KPSEDLL string make_suffix P2H(const_string s, const_string suffix); /* Return NAME with STEM_PREFIX prepended to the stem. For example, `make_prefix ("/foo/bar.baz", "x")' returns `/foo/xbar.baz'. Returns a string allocated with malloc. */ -extern DllImport string make_prefix P2H(string stem_prefix, string name); +extern KPSEDLL string make_prefix P2H(string stem_prefix, string name); /* If NAME has a suffix, simply return it; otherwise, return `NAME.SUFFIX'. */ -extern DllImport string extend_filename P2H(const_string name, +extern KPSEDLL string extend_filename P2H(const_string name, const_string suffix); /* Call putenv with the string `VAR=VALUE' and abort on error. */ -extern DllImport void xputenv P2H(const_string var, const_string value); -extern DllImport void xputenv_int P2H(const_string var, int value); +extern KPSEDLL void xputenv P2H(const_string var, const_string value); +extern KPSEDLL void xputenv_int P2H(const_string var, int value); /* Return the current working directory. */ -extern DllImport string xgetcwd P1H(void); +extern KPSEDLL string xgetcwd P1H(void); /* Returns true if FN is a directory or a symlink to a directory. */ -extern DllImport boolean dir_p P1H(const_string fn); +extern KPSEDLL boolean dir_p P1H(const_string fn); /* If FN is a readable directory, return the number of links it has. - Otherwise, return -1. */ -extern DllImport int dir_links P1H(const_string fn); + Otherwise, return -1. The nlinks parameter is a dummy on UNIX. */ +extern KPSEDLL int dir_links P2H(const_string fn, long nlinks); /* Like their stdio counterparts, but abort on error, after calling perror(3) with FILENAME as its argument. */ -extern DllImport FILE *xfopen P2H(const_string filename, const_string mode); -extern DllImport void xfclose P2H(FILE *, const_string filename); -extern DllImport void xfseek P4H(FILE *, long, int, string filename); -extern DllImport unsigned long xftell P2H(FILE *, string filename); +extern KPSEDLL FILE *xfopen P2H(const_string filename, const_string mode); +extern KPSEDLL void xfclose P2H(FILE *, const_string filename); +extern KPSEDLL void xfseek P4H(FILE *, long, int, string filename); +extern KPSEDLL unsigned long xftell P2H(FILE *, string filename); /* These call the corresponding function in the standard library, and abort if those routines fail. Also, `xrealloc' calls `xmalloc' if OLD_ADDRESS is null. */ -extern DllImport address xmalloc P1H(unsigned size); -extern DllImport address xrealloc P2H(address old_address, unsigned new_size); -extern DllImport address xcalloc P2H(unsigned nelem, unsigned elsize); +extern KPSEDLL address xmalloc P1H(unsigned size); +extern KPSEDLL address xrealloc P2H(address old_address, unsigned new_size); +extern KPSEDLL address xcalloc P2H(unsigned nelem, unsigned elsize); /* (Re)Allocate N items of type T using xmalloc/xrealloc. */ #define XTALLOC(n, t) ((t *) xmalloc ((n) * sizeof (t))) diff -Naur xdvik-22.40n/texk/kpathsea/line.c xdvik-22.40o/texk/kpathsea/line.c --- xdvik-22.40n/texk/kpathsea/line.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/line.c Wed Oct 16 22:26:22 2002 @@ -16,20 +16,19 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" -#include "kpathsea/line.h" +#include +#include /* Allocate in increments of this size. */ #define BLOCK_SIZE 75 char * -read_line (f) - FILE *f; +read_line P1C(FILE*, f) { int c; unsigned limit = BLOCK_SIZE; unsigned loc = 0; - char *line = xmalloc (limit); + char *line = (char*)xmalloc (limit); while ((c = getc (f)) != EOF && c != '\n' && c != '\r') { @@ -42,7 +41,7 @@ if (loc == limit) { limit += BLOCK_SIZE; - line = xrealloc (line, limit); + line = (char*)xrealloc (line, limit); } } diff -Naur xdvik-22.40n/texk/kpathsea/line.h xdvik-22.40o/texk/kpathsea/line.h --- xdvik-22.40n/texk/kpathsea/line.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/line.h Wed Oct 16 22:26:22 2002 @@ -20,12 +20,12 @@ #define LINE_H #include -#include "kpathsea/types.h" +#include /* Return NULL if we are at EOF, else the next line of F. The newline character at the end of string is removed. The string is allocated with malloc. */ -extern string read_line P1H(FILE *f); +extern KPSEDLL string read_line P1H(FILE *f); #endif /* not LINE_H */ diff -Naur xdvik-22.40n/texk/kpathsea/magstep.c xdvik-22.40o/texk/kpathsea/magstep.c --- xdvik-22.40n/texk/kpathsea/magstep.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/magstep.c Wed Oct 16 22:26:22 2002 @@ -16,9 +16,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/magstep.h" +#include /* Return true magstep N, where the lsb of N means ``half'' (see @@ -57,7 +57,8 @@ t = t * 1.2; } - step = 0.5 + (neg ? bdpi / t : bdpi * t); + /* Unnecessary casts to shut up stupid compilers. */ + step = (int)(0.5 + (neg ? bdpi / t : bdpi * t)); return step; } @@ -92,8 +93,9 @@ } /* If requested, return the encoded magstep (the loop went one too far). */ + /* More unnecessary casts. */ if (m_ret) - *m_ret = real_dpi == mdpi ? (m - 1) * sign : 0; + *m_ret = real_dpi == (unsigned)(mdpi ? (m - 1) * sign : 0); /* Always return the true dpi found. */ return real_dpi ? real_dpi : dpi; diff -Naur xdvik-22.40n/texk/kpathsea/magstep.h xdvik-22.40o/texk/kpathsea/magstep.h --- xdvik-22.40n/texk/kpathsea/magstep.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/magstep.h Wed Oct 16 22:26:22 2002 @@ -19,8 +19,8 @@ #ifndef KPATHSEA_MAGSTEP_H #define KPATHSEA_MAGSTEP_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* If DPI is close enough to some magstep of BDPI, return the true dpi value, and the magstep found (or zero) in M_RET (if @@ -40,6 +40,6 @@ file, but before you look up any files -- do the usual floating-point computations, and then fix up the result. */ -extern unsigned kpse_magstep_fix P3H(unsigned dpi, unsigned bdpi, int *m_ret); +extern KPSEDLL unsigned kpse_magstep_fix P3H(unsigned dpi, unsigned bdpi, int *m_ret); #endif /* not KPATHSEA_MAGSTEP_H */ diff -Naur xdvik-22.40n/texk/kpathsea/make-suffix.c xdvik-22.40o/texk/kpathsea/make-suffix.c --- xdvik-22.40n/texk/kpathsea/make-suffix.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/make-suffix.c Wed Oct 16 22:26:22 2002 @@ -16,8 +16,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" -#include "kpathsea/c-pathch.h" +#include +#include /* Return a new string: S suffixed with SUFFIX, regardless of what it was before. This returns a newly allocated string. */ @@ -41,7 +41,7 @@ { unsigned past_dot_index = dot_pos + 1 - s; - new_s = xmalloc (past_dot_index + strlen (suffix) + 1); + new_s = (string)xmalloc (past_dot_index + strlen (suffix) + 1); strncpy (new_s, s, dot_pos + 1 - s); strcpy (new_s + past_dot_index, suffix); } diff -Naur xdvik-22.40n/texk/kpathsea/mktex.opt xdvik-22.40o/texk/kpathsea/mktex.opt --- xdvik-22.40n/texk/kpathsea/mktex.opt Wed Apr 18 14:24:33 2001 +++ xdvik-22.40o/texk/kpathsea/mktex.opt Wed Oct 16 22:26:22 2002 @@ -1,9 +1,8 @@ -#!/bin/sh # mktex.opt -- common mktex* options, etc. # Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set. # -# te@informatik.uni-hannover.de and kb@mail.tug.org. Public domain. -# $Id: mktex.opt,v 1.1.1.1 2001/04/18 14:24:33 stefanulrich Exp $ +# te@dbs.uni-hannover.de and kb@mail.tug.org. Public domain. +# $Id: mktex.opt,v 1.1.1.1.8.1 2002/10/16 22:26:22 stefanulrich Exp $ if test "x$1" = x--help || test "x$1" = x-help; then echo "$usage" @@ -31,7 +30,11 @@ # TEMPDIR needs to be unique to each process because of the possibility of two # people running dvips (or whatever) simultaneously. -TEMPDIR="${TMPDIR-/tmp}/mt$$.tmp" +if test -n "$TMPDIR"; then + TEMPDIR="${TMPDIR}/mt$$.tmp" +else + TEMPDIR="/tmp/mt$$.tmp" +fi # We want to output only filenames to standard output, but it's too # error-prone to write the scripts that way, so we direct stdout here. @@ -46,10 +49,10 @@ # current directory on each drive, and therefore "cd $KPSE_DOT" might # still leave $TMPDIR current directory on its drive, in which case it # cannot be removed. -trap 'cd /; cd "$KPSE_DOT"; test -f "$STDOUT" && cat "$STDOUT"; rm -rf "$TEMPDIR"; exit 0' \ +trap 'rc=$?; cd /; cd "$KPSE_DOT"; test -f "$STDOUT" && cat "$STDOUT"; rm -rf "$TEMPDIR"; exit $rc' \ 0 1 2 3 7 13 15 -mkdir "$TEMPDIR" || exit 1 +(umask 077 && mkdir "$TEMPDIR") || exit 1 cd "$TEMPDIR" || exit 1 # The alternative location for fonts. The directory need not exist, @@ -86,8 +89,8 @@ : ${MT_MKTEX_CNF=`kpsewhich --format='web2c files' mktex.cnf`} test -n "$MT_MKTEX_CNF" && test -r "$MT_MKTEX_CNF" && . "$MT_MKTEX_CNF" -# Possible features: appendonlydir dosnames fontmaps nomode stripsupplier -# striptypeface varfonts. +# Possible features: appendonlydir dosnames fontmaps nomfdrivers nomode +# stripsupplier striptypeface varfonts. if test -n "$COMSPEC"; then : ${MT_FEATURES=appendonlydir:dosnames} else diff -Naur xdvik-22.40n/texk/kpathsea/mktexdir xdvik-22.40o/texk/kpathsea/mktexdir --- xdvik-22.40n/texk/kpathsea/mktexdir Wed Apr 18 14:24:33 2001 +++ xdvik-22.40o/texk/kpathsea/mktexdir Wed Oct 16 22:26:22 2002 @@ -4,9 +4,9 @@ # Public domain. # # Modified for sticky directory creation, --help, --version. -# te@informatik.uni-hannover.de and kb@mail.tug.org. +# te@dbs.uni-hannover.de and kb@mail.tug.org. -version='$Id: mktexdir,v 1.1.1.1 2001/04/18 14:24:33 stefanulrich Exp $' +version='$Id: mktexdir,v 1.1.1.1.8.1 2002/10/16 22:26:22 stefanulrich Exp $' usage="Usage: $0 DIRS... Create each DIR, including any missing leading directories." mt_max_args=$# @@ -28,18 +28,17 @@ errstatus=0 -cd $KPSE_DOT +cd "$KPSE_DOT" for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + cd "$KPSE_DOT" + set fnord `echo ":$file" | \ + sed -ne 's/^:\//#/;s/^:-/.\/-/;s/^://;s/\// /g;s/^#/\//;p'` shift pathcomp= for d in ${1+"$@"} ; do pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp="./$pathcomp" ;; - esac if test ! -d "$pathcomp"; then mkdir "$pathcomp" || errstatus=$? diff -Naur xdvik-22.40n/texk/kpathsea/mktexdir.opt xdvik-22.40o/texk/kpathsea/mktexdir.opt --- xdvik-22.40n/texk/kpathsea/mktexdir.opt Wed Apr 18 14:24:33 2001 +++ xdvik-22.40o/texk/kpathsea/mktexdir.opt Wed Oct 16 22:26:22 2002 @@ -1,9 +1,8 @@ -#!/bin/sh # mktexdir.opt to determine various manipulations of the filenames. # Sourced from mktexdir. # -# te@informatik.uni-hannover.de and kb@mail.tug.org. Public domain. -# $Id: mktexdir.opt,v 1.1.1.1 2001/04/18 14:24:33 stefanulrich Exp $ +# te@dbs.uni-hannover.de and kb@mail.tug.org. Public domain. +# $Id: mktexdir.opt,v 1.1.1.1.8.1 2002/10/16 22:26:22 stefanulrich Exp $ # Set append-only bit on created directories. case "$MT_FEATURES" in diff -Naur xdvik-22.40n/texk/kpathsea/mktexlsr xdvik-22.40o/texk/kpathsea/mktexlsr --- xdvik-22.40n/texk/kpathsea/mktexlsr Wed Apr 18 14:24:33 2001 +++ xdvik-22.40o/texk/kpathsea/mktexlsr Wed Oct 16 22:26:22 2002 @@ -10,10 +10,10 @@ # 'kpsestat', 'readlink', and 'kpsewhich' binaries. # # Originally written as `texhash' by Thomas Esser -# , Okt., 1994. +# , Okt., 1994. # Public domain. -version='$Id: mktexlsr,v 1.1.1.1 2001/04/18 14:24:33 stefanulrich Exp $' +version='$Id: mktexlsr,v 1.1.1.1.8.1 2002/10/16 22:26:22 stefanulrich Exp $' progname=`echo $0 | sed 's%.*/%%'` usage="Usage: $progname [DIRS ...] @@ -57,7 +57,7 @@ # The old string, which should continue to work. old_ls_R_magic='% ls-R -- maintained by MakeTeXls-R; do not change this line.' -trap 'cd / ; rm -f "$db_file_tmp"; exit' 0 1 2 3 7 13 15 +trap 'cd / ; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; exit' 0 1 2 3 7 13 15 test $# = 0 && { OIFS=$IFS; IFS=$SEP; set x `kpsewhich --show-path=ls-R 2>/dev/null`; shift; IFS=$OIFS @@ -65,6 +65,7 @@ for TEXMFLS_R in "$@"; do # Prepend cwd if the directory was relative. case "$TEXMFLS_R" in + "") continue ;; # Strictly speaking, it is an error if this case is taken. /* | [A-z]:/*) ;; *) TEXMFLS_R="`pwd`/$TEXMFLS_R" esac @@ -77,7 +78,6 @@ *) db_file="$TEXMFLS_R/$db_file" esac db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname - db_file_tmp="$db_dir/lsR$$.tmp" test -d "$db_dir" || continue test -w "$db_dir" || { echo "$progname: $db_dir: directory not writable. Skipping..." >&2; continue; } @@ -86,8 +86,8 @@ cp /dev/null "$db_file" # Use same permissions as parent directory, minus x,s, or t bits. chmod `kpsestat -xst "$db_dir"` "$db_file" - elif test "x`sed 1q \"$db_file\"`" != "x$ls_R_magic" \ - && test "x`sed 1q \"$db_file\"`" != "x$old_ls_R_magic"; then + elif test "x`sed '1s/ $//;1q' \"$db_file\"`" != "x$ls_R_magic" \ + && test "x`sed '1s/ $//;1q' \"$db_file\"`" != "x$old_ls_R_magic"; then echo "$progname: $db_file lacks magic string. Skipping..." >&2 continue fi @@ -95,6 +95,10 @@ # Skip if we cannot write the file: access -w "$db_file" || { echo "$progname: $db_file: no write permission. Skipping..." >&2; continue; } + db_dir_tmp="$db_dir/lsR$$.tmp" + (umask 077 && mkdir "$db_dir_tmp" ) \ + || { echo "$progname: could not create directory '$db_dir_tmp'. Skipping..." >&2; continue; } + db_file_tmp="$db_dir_tmp/lsR$$.tmp" rm -f "$db_file_tmp" tty -s && echo "$progname: Updating $db_file... " @@ -114,6 +118,7 @@ chmod $PERMS "$db_file_tmp" rm -f "$db_file" mv "$db_file_tmp" "$db_file" + rm -rf "$db_dir_tmp" done tty -s && echo "$progname: Done." exit 0 diff -Naur xdvik-22.40n/texk/kpathsea/mktexmf xdvik-22.40o/texk/kpathsea/mktexmf --- xdvik-22.40n/texk/kpathsea/mktexmf Wed Apr 18 14:24:33 2001 +++ xdvik-22.40o/texk/kpathsea/mktexmf Wed Oct 16 22:26:22 2002 @@ -4,10 +4,10 @@ # (If you change or delete the word `original' on the previous line, # installation won't write this script over yours.) # -# te@informatik.uni-hannover.de, kb@mail.tug.org, and infovore@xs4all.nl. +# te@dbs.uni-hannover.de, kb@mail.tug.org, and infovore@xs4all.nl. # Public domain. -version='$Id: mktexmf,v 1.1.1.1 2001/04/18 14:24:33 stefanulrich Exp $' +version='$Id: mktexmf,v 1.1.1.1.8.1 2002/10/16 22:26:22 stefanulrich Exp $' progname=`echo $0 | sed 's%.*/%%'` usage="Usage: $progname FONT. @@ -34,13 +34,14 @@ sauterroot=`kpsewhich b-$rootname.mf 2>/dev/null` if test -n "$sauterroot"; then rootfile=$sauterroot + rootname=b-$rootname else case $rootname in - wn*|lh*|ll*|rx*|la*|lb*|lc*) + cs*|lcsss*|icscsc*|icstt*|ilcsss*) + rootfile=`kpsewhich cscode.mf`;; + wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*) lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'` rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;; - cs*|ics*|lcs*) - rootfile=`kpsewhich cscode.mf`;; *) rootfile=`kpsewhich $rootname.mf 2>/dev/null`;; esac @@ -65,6 +66,8 @@ 17) realsize=17.28;; # \magstep3 20) realsize=20.74;; # \magstep4 25) realsize=24.88;; # \magstep5 + 30) realsize=29.86;; # \magstep6 + 36) realsize=35.83;; # \magstep7 # The new convention is to have three or four letters for the # font name and four digits for the pointsize. The number is # pointsize * 100. We effectively divide by 100 by ignoring the @@ -96,21 +99,28 @@ generate $rootname; END ;; - wn*|lh*|ll*|rx*|la*|lb*|lc*) + cs*|lcsss*|icscsc*|icstt*|ilcsss*) + cat > "mf$$.tmp" < "mf$$.tmp" < "mf$$.tmp" < "mf$$.tmp" </dev/null`;; - cs*|ics*|lcs*) + # Czech/Slovak fonts get special treatment: + cs*|lcsss*|icscsc*|icstt*|ilcsss*) fullname=`kpsewhich cscode.mf` ;; + # LH fonts get special treatment: + wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*) + lhprefix=`echo $NAME | sed 's/^\(..\).*/\1/'` + fullname=`kpsewhich "${lhprefix}codes.mf" 2>/dev/null`;; *) fullname=`kpsewhich "$rootname.mf" 2>/dev/null` ;; esac @@ -63,10 +65,6 @@ # After all this, do we _have_ a font? if test -z "$fullname"; then - # We have found nothing, so force using the fontmaps as a last resort. - # This also means mktexnam can be queried for advice on where to - # place fonts. - MT_FEATURES="$MT_FEATURES:fontmaps" : ${MT_DESTROOT="$MT_VARTEXFONTS"} else # Normalize $fullname. @@ -100,7 +98,7 @@ relfmt='/source/$MT_NAMEPART/' namepart='' fi - # Determine supplier and typeface from namepart. If there is + # Determine supplier and typeface from namepart. If there is # only one part in the namepart, we take it to be the typeface. MT_SUPPLIER=`echo $namepart | sed 's%^/\([^/]*\)/\(.*\)$%\1%'` MT_TYPEFACE=`echo $namepart | sed 's%^/\([^/]*\)/\(.*\)$%\2%'` @@ -113,7 +111,6 @@ : ${MT_PKDESTREL=`echo "$relfmt" | sed 's%/source/%/pk/$MT_MODE/%'`} : ${MT_TFMDESTREL=`echo "$relfmt" | sed 's%/source/%/tfm/%'`} : ${MT_MFDESTREL=`echo "$relfmt"`} - # And we're done with the loop now. break esac done @@ -127,6 +124,14 @@ : ${MT_TFMDESTREL=$MT_DEFAULT_TFMDESTREL} : ${MT_MFDESTREL=$MT_DEFAULT_MFDESTREL} +# We have found nothing, so force using the fontmaps as a last resort. +# This also means mktexnam can be queried for advice on where to +# place fonts. +if test "x$MT_SUPPLIER" = xunknown \ + || test "x$MT_TYPEFACE" = xunknown; then + MT_FEATURES="$MT_FEATURES:fontmaps" +fi + # Handle the options. test -n "$MT_MKTEXNAM_OPT" && . "$MT_MKTEXNAM_OPT" @@ -147,6 +152,13 @@ esac fi +if test -z "$MT_DESTROOT"; then + MT_DESTROOT=$MT_DEFAULT_DESTROOT + MT_PKDESTDIR=$MT_DEFAULT_DESTROOT + MT_TFMDESTDIR=$MT_DEFAULT_DESTROOT + MT_MFDESTDIR=$MT_DEFAULT_DESTROOT +fi + case "$DEST" in "") ;; /* | [A-z]:/*) # Absolute, explicit destdir => use it. @@ -158,13 +170,6 @@ MT_NAMEPART=$DEST;; esac -if test -z "$MT_DESTROOT"; then - MT_DESTROOT=$MT_DEFAULT_DESTROOT - MT_PKDESTDIR=$MT_DEFAULT_DESTROOT - MT_TFMDESTDIR=$MT_DEFAULT_DESTROOT - MT_MFDESTDIR=$MT_DEFAULT_DESTROOT -fi - eval MT_MODE=\"$MODE\" eval MT_NAMEPART=\"$MT_NAMEPART\" eval MT_DESTROOT=\"$MT_DESTROOT\" @@ -179,3 +184,4 @@ eval MT_MFNAME=\"$MT_MFDESTDIR/$MT_MFBASE\" echo "$MT_PKNAME$SEP$MT_TFMNAME$SEP$MT_MFNAME" | sed 's%//*%/%g' + diff -Naur xdvik-22.40n/texk/kpathsea/mktexnam.opt xdvik-22.40o/texk/kpathsea/mktexnam.opt --- xdvik-22.40n/texk/kpathsea/mktexnam.opt Wed Apr 18 14:24:33 2001 +++ xdvik-22.40o/texk/kpathsea/mktexnam.opt Wed Oct 16 22:26:22 2002 @@ -1,9 +1,8 @@ -#!/bin/sh # mktexnam.opt to determine various manipulations of the filenames. # Sourced from mktexnam. # -# te@informatik.uni-hannover.de and kb@mail.tug.org. Public domain. -# $Id: mktexnam.opt,v 1.1.1.1 2001/04/18 14:24:33 stefanulrich Exp $ +# te@dbs.uni-hannover.de and kb@mail.tug.org. Public domain. +# $Id: mktexnam.opt,v 1.1.1.1.8.1 2002/10/16 22:26:22 stefanulrich Exp $ # Get 8.3 filenames like dpiNNN/NAME.pk. case "$MT_FEATURES" in @@ -38,12 +37,14 @@ if test -z "$SUPPLIER"; then # Try the normal case. Source first. - s_abbrev=`echo $NAME | sed 's/^\(.\).*$/\1/'` + # $NAME might be raw. + name=`echo $NAME | sed 's/^r//'` + s_abbrev=`echo $name | sed 's/^\(.\).*$/\1/'` SUPPLIER=`awk '{ if ($1 == s_abbrev) { print $2; exit; }}' \ s_abbrev=$s_abbrev "$SUPPLIERMAP"` if test -n "$SUPPLIER"; then # We found the source. Try for the typeface. - t_abbrev=`echo $NAME | sed 's/^.//;s/\(..\).*$/\1/'` + t_abbrev=`echo $name | sed 's/^.//;s/\(..\).*$/\1/'` TYPEFACE=`awk '{ if ($1 == t_abbrev) { print $2; exit; }}' \ t_abbrev=$t_abbrev "$TYPEFACEMAP"` fi @@ -53,14 +54,11 @@ if test -z "$SUPPLIER"; then echo "$0: Could not map source abbreviation $s_abbrev for $NAME." >&2 echo "$0: Need to update $SPECIALMAP?" >&2 - MT_SUPPLIER="$MT_DEFAULT_SUPPLIER" - MT_TYPEFACE="$MT_DEFAULT_TYPEFACE" else MT_SUPPLIER="$SUPPLIER" if test -z "$TYPEFACE"; then echo "$0: Could not map typeface abbreviation $t_abbrev for $NAME." >&2 echo "$0: Need to update $SPECIALMAP?" >&2 - MT_TYPEFACE="$MT_DEFAULT_TYPEFACE" else MT_TYPEFACE="$TYPEFACE" fi diff -Naur xdvik-22.40n/texk/kpathsea/mktexpk xdvik-22.40o/texk/kpathsea/mktexpk --- xdvik-22.40n/texk/kpathsea/mktexpk Wed Apr 18 14:24:33 2001 +++ xdvik-22.40o/texk/kpathsea/mktexpk Wed Oct 16 22:26:22 2002 @@ -4,10 +4,10 @@ # (If you change or delete the word `original' on the previous line, # installation won't write this script over yours.) # -# te@informatik.uni-hannover.de, kb@mail.tug.org, and infovore@xs4all.nl. +# te@dbs.uni-hannover.de, kb@mail.tug.org, and infovore@xs4all.nl. # Public domain. -version='$Id: mktexpk,v 1.1.1.1 2001/04/18 14:24:33 stefanulrich Exp $' +version='$Id: mktexpk,v 1.1.1.1.8.1 2002/10/16 22:26:22 stefanulrich Exp $' progname=`echo $0 | sed 's%.*/%%'` usage="Usage: $progname [OPTIONS] NAME [REDIRECT], Create a PK font. @@ -69,6 +69,13 @@ . "$MT_MKTEX_OPT" +# Where do potential driver files belong? +case "$MT_FEATURES" in + *nomfdrivers*) + : ${MT_MFDESTDIR=`pwd`} + export MT_MFDESTDIR;; +esac + # Since we want to pass the generated filename and only that filename # back to the caller on standard output, we do some redirections so # regular echo's will end up on stderr, and do an echo >$STDOUT at the end. @@ -79,69 +86,19 @@ NAME=$1 -# ps_to_pk is set in mktex.opt -case $ps_to_pk in - gsftopk) - if $ps_to_pk -t "$NAME"; then - cmd="$ps_to_pk $NAME $DPI" - fi;; - ps2pk) - # grep for the font in $PSMAPFILE. These are base font names, such as - # rpplr (the original) or pplr0 (an interim step) or pplr8r (current). - : ${PSMAPFILE=`kpsewhich psfonts.map`} - pattern="^$NAME"'([ ]|$)' - psline=`egrep "$pattern" $PSMAPFILE` - if test -n "$psline"; then - set x `echo "$psline" | sed 's%[<["]%%g'` - shift; shift; shift; - encoding=; psname=; slant=; extend= - while test ! -z "$1"; do - case "$1" in - *.enc) encoding="-e $1";; - *.pf[ab]) psname="$1";; - *SlantFont) slant="-S $lastopt";; - *ExtendFont) extend="-E $lastopt";; - esac - lastopt="$1" - shift - done - test -n "$psname" || - { pfa=`(kpsewhich $NAME.pfa 2>/dev/null)`; psname=$pfa; } - test -n "$psname" || - { pfb=`(kpsewhich $NAME.pfb 2>/dev/null)`; psname=$pfb; } - ANAME=`echo $NAME | sed 's/8r$/8a/'` - test -n "$psname" || - { pfa=`(kpsewhich $ANAME.pfa 2>/dev/null)`; psname=$pfa; } - test -n "$psname" || - { pfb=`(kpsewhich $ANAME.pfb 2>/dev/null)`; psname=$pfb; } - if [ -z "$psname" ]; then - echo "$progname: cannot find $NAME.pfa or $NAME.pfb. Trying gsftopk." >&2 - cmd="gsftopk $NAME $DPI" - # make sure that gsftopk uses the psline from our mapfile: - echo "$psline" > psfonts.map - TEXFONTMAPS=.:$TEXFONTMAPS - else - cmd="ps2pk -v -X$DPI -R$BDPI $slant $extend $encoding $psname $NAME.${DPI}pk" - fi - fi;; -esac - -if test -z "$cmd"; then - if (ttf2pk -t -q $NAME) >/dev/null 2>&1; then - cmd="ttf2pk -q $NAME $DPI" - elif (hbf2gf -t -q $NAME) >/dev/null 2>&1; then - cmd="hbf2gf -q -p $NAME $DPI" +if kpsewhich $NAME.mf >/dev/null 2>&1 || mktexmf $NAME >/dev/null 2>&1; then + # determine the progname of metafont to use; prefer mf-nowin. + if (mf-nowin --version) >/dev/null 2>&1; then + MF="mf-nowin -progname=mf" + else + MF=mf fi -fi -if test -n "$cmd"; then - MODE=modeless -else # Check that $BDPI and $MODE are consistent; if not, ignore the mode and # hope we can correctly guess it from bdpi. (People like to specify the # resolution on the command line, not the mode so much.) if test -n "$MODE"; then - mf_bdpi=`mf \ + mf_bdpi=`$MF \ '\mode:='$MODE';mode_setup;message"BDPI= "&decimal round pixels_per_inch;end.'\ /dev/null 2>&1; then + psname=$i + break + fi + done + + if [ -n "$psname" ]; then + cmd="ps2pk -v -X$DPI -R$BDPI $slant $extend $encoding $psname $NAME.${DPI}pk" + else + if gsftopk -t "$NAME"; then + echo "$progname: cannot find $NAME.pfa or $NAME.pfb. Trying gsftopk." >&2 + cmd="gsftopk $NAME $DPI" + fi + fi + fi;; + esac + + # unsupported by $ps_to_pk, try other conversions: + if test -z "$cmd"; then + if (ttf2pk -t -q $NAME) >/dev/null 2>&1; then + cmd="ttf2pk -q $NAME $DPI" + elif (hbf2gf -t -q $NAME) >/dev/null 2>&1; then + cmd="hbf2gf -q -p $NAME $DPI" + else + echo "$progname: don't know how to create bitmap font for $NAME." >&2 + exit 1 + fi + fi fi OIFS=$IFS; IFS=$SEP @@ -197,12 +213,16 @@ echo "$progname: Running $cmd" $cmd $$.errs 2>/dev/null + # Don't abort if only "Strange path" or "bad pos" errors occurr. + grep '^!' $NAME.log | sort >$$.errs 2>/dev/null grep '^! Strange path' $$.errs >$$.strange 2>/dev/null - if cmp $$.errs $$.strange >/dev/null 2>&1 \ - && test -s $$.strange >/dev/null 2>&1; then - echo "$progname: warning: \`$cmd' caused strange path errors." >&2 + grep '^! bad pos.' $$.errs >$$.badpos 2>/dev/null + cat $$.badpos $$.strange | sort > $$.errs_accept + if cmp $$.errs $$.errs_accept >/dev/null 2>&1; then + test -s $$.strange >/dev/null 2>&1 \ + && echo "$progname: warning: \`$cmd' caused strange path errors." >&2 + test -s $$.badpos >/dev/null 2>&1 \ + && echo "$progname: warning: \`$cmd' caused bad pos errors." >&2 else echo "$progname: \`$cmd' failed." >&2 test -s $NAME.log && mv -f $NAME.log "$KPSE_DOT" diff -Naur xdvik-22.40n/texk/kpathsea/mktextfm xdvik-22.40o/texk/kpathsea/mktextfm --- xdvik-22.40n/texk/kpathsea/mktextfm Wed Apr 18 14:24:33 2001 +++ xdvik-22.40o/texk/kpathsea/mktextfm Wed Oct 16 22:26:22 2002 @@ -4,10 +4,10 @@ # (If you change or delete the word `original' on the previous line, # installation won't write this script over yours.) # -# te@informatik.uni-hannover.de, kb@mail.tug.org, and infovore@xs4all.nl. +# te@dbs.uni-hannover.de, kb@mail.tug.org, and infovore@xs4all.nl. # Public domain. -version='$Id: mktextfm,v 1.1.1.1 2001/04/18 14:24:33 stefanulrich Exp $' +version='$Id: mktextfm,v 1.1.1.1.8.1 2002/10/16 22:26:22 stefanulrich Exp $' progname=`echo $0 | sed 's%.*/%%'` usage="Usage: $progname [--destdir DESTDIR] FONT. @@ -37,6 +37,13 @@ . "$MT_MKTEX_OPT" +# Where do potential mf driver files go? +case "$MT_FEATURES" in + *nomfdrivers*) + : ${MT_MFDESTDIR=`pwd`} + export MT_MFDESTDIR;; +esac + # start of redirection stdout -> stderr, stdin <- /dev/null ( @@ -71,9 +78,21 @@ exit 1 fi -cmd="mf \mode:=$MODE; mag:=$MAG; nonstopmode; input $NAME" -echo "$progname: Running $cmd" +# Check if this font is supported by hbf2gf else use metafont. +if (hbf2gf -q -t $NAME) >/dev/null 2>&1; then + cmd="hbf2gf -g $NAME $DPI" +else + # determine the progname of metafont to use; prefer mf-nowin. + if (mf-nowin --version) >/dev/null 2>&1; then + MF="mf-nowin -progname=mf" + else + MF=mf + fi + cmd="$MF \mode:=$MODE; mag:=$MAG; nonstopmode; input $NAME" +fi + +echo "$progname: Running $cmd" $cmd $$.errs 2>/dev/null grep '^! Strange path' $$.errs >$$.strange 2>/dev/null @@ -87,6 +106,8 @@ fi } +# hbf2gf just produces a .pl file: +test -r ./$NAME.pl && pltotf ./$NAME.pl $TFMNAME test -r $TFMNAME || { echo "$progname: \`$cmd' failed to make $TFMNAME."; exit 1; } # Install the TFM file carefully, since others may be working simultaneously. diff -Naur xdvik-22.40n/texk/kpathsea/mktextfm.man xdvik-22.40o/texk/kpathsea/mktextfm.man --- xdvik-22.40n/texk/kpathsea/mktextfm.man Wed Apr 18 14:24:33 2001 +++ xdvik-22.40o/texk/kpathsea/mktextfm.man Wed Oct 16 22:26:22 2002 @@ -20,7 +20,7 @@ mktextfm \- create a TFM file for a font .SH SYNOPSIS .B mktextfm -.RI [--destdir destdir ] +.RI [options] .I font .\"===================================================================== .SH DESCRIPTION diff -Naur xdvik-22.40n/texk/kpathsea/mktexupd xdvik-22.40o/texk/kpathsea/mktexupd --- xdvik-22.40n/texk/kpathsea/mktexupd Wed Apr 18 14:24:33 2001 +++ xdvik-22.40o/texk/kpathsea/mktexupd Wed Oct 16 22:26:22 2002 @@ -1,9 +1,9 @@ #!/bin/sh # mktexupd -- update ls-R with a new entry. # -# te@informatik.uni-hannover.de and kb@mail.tug.org. Public domain. +# te@dbs.uni-hannover.de and kb@mail.tug.org. Public domain. -version='$Id: mktexupd,v 1.1.1.1 2001/04/18 14:24:33 stefanulrich Exp $' +version='$Id: mktexupd,v 1.1.1.1.8.1 2002/10/16 22:26:22 stefanulrich Exp $' usage="Usage: $0 DIR FILE. Update the ls-R file with an entry for FILE in DIR." mt_min_args=2 @@ -30,7 +30,7 @@ for d in "$@"; do case $dir in "") continue;; - ${d}*) TEXMFLS_R="$d"; break;; + ${d}|${d}/*) TEXMFLS_R="$d"; break;; esac done test -n "$TEXMFLS_R" || exit 0 @@ -39,8 +39,8 @@ test -f "$db_file" || mktexlsr "$TEXMFLS_R" test -w "$db_file" || { echo "$0: $db_file unwritable." >&2; exit 1; } -test "x`sed 1q \"$db_file\"`" = "x$ls_R_magic" \ - || test "x`sed 1q \"$db_file\"`" = "x$old_ls_R_magic" \ +test "x`sed '1s/ $//;1q' \"$db_file\"`" = "x$ls_R_magic" \ + || test "x`sed '1s/ $//;1q' \"$db_file\"`" = "x$old_ls_R_magic" \ || { echo "$0: $db_file lacks magic string \`$ls_R_magic'." >&2; exit 1; } # Change `$TEXMFLS_R/' to `./'. diff -Naur xdvik-22.40n/texk/kpathsea/path-elt.c xdvik-22.40o/texk/kpathsea/path-elt.c --- xdvik-22.40n/texk/kpathsea/path-elt.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/path-elt.c Wed Oct 16 22:26:22 2002 @@ -16,10 +16,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-pathch.h" -#include "kpathsea/pathsearch.h" +#include +#include /* The static (but dynamically allocated) area we return the answer in, @@ -74,7 +74,7 @@ if (len + 1 > elt_alloc) { elt_alloc = len + 1; - elt = xrealloc (elt, elt_alloc); + elt = (string)xrealloc (elt, elt_alloc); } strncpy (elt, path, len); diff -Naur xdvik-22.40n/texk/kpathsea/pathsearch.c xdvik-22.40o/texk/kpathsea/pathsearch.c --- xdvik-22.40n/texk/kpathsea/pathsearch.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/pathsearch.c Wed Oct 16 22:26:22 2002 @@ -1,6 +1,7 @@ /* pathsearch.c: look up a filename in a path. Copyright (C) 1993, 94, 95, 97 Karl Berry. +Copyright (C) 1997, 98, 99, 2000 Olaf Weber. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -16,17 +17,17 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" -#include "kpathsea/c-pathch.h" -#include "kpathsea/c-fopen.h" -#include "kpathsea/absolute.h" -#include "kpathsea/expand.h" -#include "kpathsea/db.h" -#include "kpathsea/pathsearch.h" -#include "kpathsea/readable.h" -#include "kpathsea/str-list.h" -#include "kpathsea/str-llist.h" -#include "kpathsea/variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include /* for `time' */ @@ -82,8 +83,10 @@ /* And show them online, if debugging. We've already started the debugging line in `search', where this is called, so just print the filename here, don't use DEBUGF. */ - if (KPSE_DEBUG_P (KPSE_DEBUG_SEARCH)) + if (KPSE_DEBUG_P (KPSE_DEBUG_SEARCH)) { + putc (' ', stderr); fputs (filename, stderr); + } } } } @@ -108,7 +111,7 @@ str_list_type ret; unsigned name_len = strlen (name); unsigned allocated = INIT_ALLOC; - string potential = xmalloc (allocated); + string potential = (string)xmalloc (allocated); ret = str_list_init (); @@ -141,7 +144,7 @@ /* Start new filename. */ allocated = INIT_ALLOC; - potential = xmalloc (allocated); + potential = (string)xmalloc (allocated); } } @@ -199,18 +202,8 @@ elt += 2; } - /* Do not touch the device if present */ - if (NAME_BEGINS_WITH_DEVICE (elt)) { - while (IS_DIR_SEP (*(elt + 2)) && IS_DIR_SEP (*(elt + 3))) { - *(elt + 2) = *(elt + 1); - *(elt + 1) = *elt; - elt++; - } - } else { - /* We never want to search the whole disk. */ - while (IS_DIR_SEP (*elt) && IS_DIR_SEP (*(elt + 1))) - elt++; - } + /* See elt-dirs.c for side effects of this funtion */ + kpse_normalize_path(elt); /* Try ls-R, unless we're searching for texmf.cnf. Our caller (search), also tests first_search, and does the resetting. */ @@ -231,7 +224,7 @@ *found = dir_list_search (dirs, name, all); } } - + /* Did we find anything anywhere? */ if (found && STR_LIST (*found)) if (all) diff -Naur xdvik-22.40n/texk/kpathsea/pathsearch.h xdvik-22.40o/texk/kpathsea/pathsearch.h --- xdvik-22.40n/texk/kpathsea/pathsearch.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/pathsearch.h Wed Oct 16 22:26:22 2002 @@ -1,6 +1,7 @@ /* pathsearch.h: mostly-generic path searching. Copyright (C) 1993, 94, 96, 97 Karl Berry. +Copyright (C) 2000 Olaf Weber. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -19,9 +20,9 @@ #ifndef KPATHSEA_PATHSEARCH_H #define KPATHSEA_PATHSEARCH_H -#include "kpathsea/c-proto.h" -#include "kpathsea/str-llist.h" -#include "kpathsea/types.h" +#include +#include +#include /* If PATH is non-null, return its first element (as defined by IS_ENV_SEP). If it's NULL, return the next element in the previous @@ -29,12 +30,17 @@ the empty string. When at the end of PATH, return NULL. In any case, return a pointer to an area that may be overwritten on subsequent calls. */ -extern string kpse_path_element P1H(const_string path); +extern KPSEDLL string kpse_path_element P1H(const_string path); /* Like `kpse_path_element', but for filename components (using IS_DIR_SEP). Uses same area as `kpse_path_element'. */ extern string kpse_filename_component P1H(const_string path); +/* + This function may rewrite its argument to avoid bugs when calling + stat() or equivalent under Win32. Also, it returns the index after + which the program shoudl start to look for expandable constructs. */ +extern unsigned kpse_normalize_path P1H(string elt); /* Given a path element ELT, return a pointer to a NULL-terminated list of the corresponding (existing) directory or directories, with @@ -44,7 +50,7 @@ It's up to the caller to expand ELT. This is because this routine is most likely only useful to be called from `kpse_path_search', which has already assumed expansion has been done. */ -extern str_llist_type *kpse_element_dirs P1H(const_string elt); +extern KPSEDLL str_llist_type *kpse_element_dirs P1H(string elt); /* Call `kpse_expand' on NAME. If the result is an absolute or @@ -64,13 +70,15 @@ do this once, in advance, instead of for every search using it. In any case, return the complete filename if found, otherwise NULL. */ -extern string kpse_path_search P3H(const_string path, const_string name, - boolean must_exist); +extern KPSEDLL string kpse_path_search P3H(const_string path, + const_string name, + boolean must_exist); /* Like `kpse_path_search' with MUST_EXIST true, but return a list of all the filenames (or NULL if none), instead of taking the first. */ -extern string *kpse_all_path_search P2H(const_string path, const_string name); +extern KPSEDLL string *kpse_all_path_search P2H(const_string path, + const_string name); #endif /* not KPATHSEA_PATHSEARCH_H */ diff -Naur xdvik-22.40n/texk/kpathsea/proginit.c xdvik-22.40o/texk/kpathsea/proginit.c --- xdvik-22.40n/texk/kpathsea/proginit.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/proginit.c Wed Oct 16 22:26:22 2002 @@ -16,10 +16,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" -#include "kpathsea/c-pathch.h" -#include "kpathsea/proginit.h" -#include "kpathsea/tex-file.h" +#include +#include +#include +#include /* These initializations were common to all the drivers modified for diff -Naur xdvik-22.40n/texk/kpathsea/proginit.h xdvik-22.40o/texk/kpathsea/proginit.h --- xdvik-22.40n/texk/kpathsea/proginit.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/proginit.h Wed Oct 16 22:26:22 2002 @@ -19,15 +19,15 @@ #ifndef KPATHSEA_PROGINIT_H #define KPATHSEA_PROGINIT_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* Common initializations for DVI drivers -- check for `PREFIX'SIZES and `PREFIX'FONTS environment variables, setenv MAKETEX_MODE to MODE, etc., etc. See the source. */ -extern void +extern KPSEDLL void kpse_init_prog P4H(const_string prefix, unsigned dpi, const_string mode, const_string fallback); diff -Naur xdvik-22.40n/texk/kpathsea/progname.c xdvik-22.40o/texk/kpathsea/progname.c --- xdvik-22.40n/texk/kpathsea/progname.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/progname.c Wed Oct 16 22:26:22 2002 @@ -16,16 +16,37 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" -#include "kpathsea/absolute.h" -#include "kpathsea/c-pathch.h" -#include "kpathsea/c-stat.h" -#include "kpathsea/pathsearch.h" +#include +#include +#include +#include +#include /* For kpse_reset_progname */ -#include "kpathsea/tex-file.h" +#include -#ifdef WIN32 -#include "kpathsea/c-pathmx.h" +#if defined (WIN32) || defined (DJGPP) +#include +#endif + +#if defined(__i386_pc_gnu__) +#ifndef _S_ISUID +#define _S_ISUID 04000 /* Set user ID on execution. */ +#endif +#ifndef _S_ISGID +#define _S_ISGID 02000 /* Set group ID on execution. */ +#endif +#ifndef _S_ISVTX +#define _S_ISVTX 01000 /* Save swapped text after use (sticky). */ +#endif +#ifndef _S_IREAD +#define _S_IREAD 0400 /* Read by owner. */ +#endif +#ifndef _S_IWRITE +#define _S_IWRITE 0200 /* Write by owner. */ +#endif +#ifndef _S_IEXEC +#define _S_IEXEC 0100 /* Execute by owner. */ +#endif #endif /* NeXT does not define the standard macros, but has the equivalent. @@ -55,64 +76,6 @@ /* And the variable for the program we pretend to be. */ string kpse_program_name = NULL; -/* Return directory for NAME. This is "." if NAME contains no directory - separators (should never happen for selfdir), else whatever precedes - the final directory separator, but with multiple separators stripped. - For example, `my_dirname ("/foo//bar.baz")' returns "/foo". Always - return a new string. */ - -static string -my_dirname P1C(const_string, name) -{ - string ret; - unsigned loc = strlen (name); - unsigned limit = 0; - - if (NAME_BEGINS_WITH_DEVICE(name)) - limit = 2; -#ifdef WIN32 - else if (IS_UNC_NAME(name)) { - unsigned count; - /* skip \\server\export part */ - for (limit = 2, count = 0; name[limit]; limit++) - if (IS_DIR_SEP(name[limit])) - if (++count == 2) { - break; - } - } -#endif - - for (loc = strlen (name); loc > limit && !IS_DIR_SEP (name[loc-1]); loc--) - ; - - if (loc != limit) { - /* If have ///a, must return /, so don't strip off everything. */ - while (loc > limit && IS_DIR_SEP (name[loc-1]) - && !IS_DEVICE_SEP (name[loc-1])) { - loc--; - } - } - - if (loc == limit) { - if (IS_DIR_SEP(name[loc])) { - /* Absolute dir, have reached the drive or unc server part */ - ret = xmalloc(loc+3); - strncpy (ret, name, loc); - ret[loc]='\0'; - strcat(ret+loc, "/."); - } else { - /* No directory separators at all, so return the current directory. - The way this is used in kpathsea, this should never happen. */ - ret = xstrdup("."); - } - } else { - ret = xmalloc (loc + 1); - strncpy (ret, name, loc); - ret[loc] = 0; - } - return ret; -} - #ifndef WIN32 /* From a standalone program `ll' to expand symlinks written by Kimbo Mundy. Don't bother to compile if we don't have symlinks; thus we can assume @@ -131,8 +94,7 @@ /* Read link FN into SYM. */ static void -ReadSymLink (fn, sym) - char *fn, *sym; +ReadSymLink P2C(char *, fn, char *, sym) { register int n = readlink (fn, sym, BSIZE); if (n < 0) { @@ -146,8 +108,7 @@ /* Strip first component from S, and also return it in a static buffer. */ static char * -StripFirst (s) - register char *s; +StripFirst P1C(register char *, s) { static char buf[BSIZE]; register char *s1; @@ -175,8 +136,7 @@ /* Strip last component from S, and also return it in a static buffer. */ static char * -StripLast (s) - register char *s; +StripLast P1C(register char *, s) { static char buf[BSIZE]; register char *s1; @@ -193,9 +153,7 @@ /* Copy first path element from B to A, removing it from B. */ static void -CopyFirst (a, b) - register char *a; - char *b; +CopyFirst P2C(register char *, a, char *, b) { register int length = strlen (a); @@ -214,8 +172,7 @@ #define EXPRE EX(pre) static char * -expand_symlinks (s) - char *s; +expand_symlinks P1C(char *, s) { static char pre[BSIZE]; /* return value */ char post[BSIZE], sym[BSIZE], tmp[BSIZE], before[BSIZE]; @@ -333,11 +290,11 @@ } } else if (STREQ (c, "..")) { - /* If leading .., start with my_dirname (cwd). Else remove last + /* If leading .., start with xdirname (cwd). Else remove last component from ret, if any. */ if (*ret == 0) { string dot = xgetcwd (); - ret = my_dirname (dot); + ret = xdirname (dot); free (dot); } else { unsigned last; @@ -448,7 +405,7 @@ if (!self) self = concat3 (".", DIR_SEP_STRING, argv0); - ret = my_dirname (remove_dots (expand_symlinks (self))); + ret = xdirname (remove_dots (expand_symlinks (self))); free (self); @@ -474,6 +431,15 @@ #ifndef HAVE_PROGRAM_INVOCATION_NAME #if defined(WIN32) + /* Set various info about user. Among many things, + ensure that HOME is set. If debug_paths is on, + turn on some message if $HOME is not found. */ + if (KPSE_DEBUG_P(KPSE_DEBUG_PATHS)) { + extern int output_home_warning; + output_home_warning = 1; + } + init_user_info(); + /* redirect stderr to debug_output. Easier to send logfiles. */ if (debug_output) { if ((err = _open(debug_output, _O_CREAT | _O_TRUNC | _O_RDWR, @@ -495,21 +461,20 @@ There is only this way to catch it. It makes all the selfdir stuff useless for win32. */ { - char path[PATH_MAX], *fp; - HANDLE hnd; - WIN32_FIND_DATA ffd; - + char short_path[PATH_MAX], path[PATH_MAX], *fp; + /* SearchPath() always gives back an absolute directory */ - if (SearchPath(NULL, argv0, ".exe", PATH_MAX, path, &fp) == 0) + if (SearchPath(NULL, argv0, ".exe", PATH_MAX, short_path, &fp) == 0) FATAL1("Can't determine where the executable %s is.\n", argv0); - if ((hnd = FindFirstFile(path, &ffd)) == NULL) - FATAL1("The following path points to an invalid file : %s\n", path); + if (!win32_get_long_filename(short_path, path, sizeof(path))) { + FATAL1("This path points to an invalid file : %s\n", short_path); + } /* slashify the dirname */ for (fp = path; fp && *fp; fp++) if (IS_DIR_SEP(*fp)) *fp = DIR_SEP; - /* sdir will be the directory where the executable resides, ie: c:/TeX/bin */ - sdir = my_dirname(path); - program_invocation_name = xstrdup(ffd.cFileName); + /* sdir will be the directory of the executable, ie: c:/TeX/bin */ + sdir = xdirname(path); + program_invocation_name = xstrdup(xbasename(path)); } #elif defined(__DJGPP__) @@ -586,9 +551,9 @@ /* SELFAUTODIR is actually the parent of the invocation directory, and SELFAUTOPARENT the grandparent. This is how teTeX did it. */ xputenv ("SELFAUTOLOC", sdir); - sdir_parent = my_dirname (sdir); + sdir_parent = xdirname (sdir); xputenv ("SELFAUTODIR", sdir_parent); - sdir_grandparent = my_dirname (sdir_parent); + sdir_grandparent = xdirname (sdir_parent); xputenv ("SELFAUTOPARENT", sdir_grandparent); free (sdir); diff -Naur xdvik-22.40n/texk/kpathsea/progname.h xdvik-22.40o/texk/kpathsea/progname.h --- xdvik-22.40n/texk/kpathsea/progname.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/progname.h Wed Oct 16 22:26:22 2002 @@ -19,12 +19,12 @@ #ifndef KPATHSEA_PROGNAME_H #define KPATHSEA_PROGNAME_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include -extern DllImport string program_invocation_name; -extern DllImport string program_invocation_short_name; -extern DllImport string kpse_program_name; +extern KPSEDLL string program_invocation_name; +extern KPSEDLL string program_invocation_short_name; +extern KPSEDLL string kpse_program_name; /* Set the first two variables above (if they're not predefined) to a copy of ARGV0 and everything in ARGV0 after the last directory separator, @@ -32,7 +32,7 @@ or the value of program_invocation_short_name if PROGNAME is NULL. This function also determines the AUTO* variables. */ -extern void kpse_set_program_name P2H(const_string argv0, +extern KPSEDLL void kpse_set_program_name P2H(const_string argv0, const_string progname); /* See also `kpse_reset_program_name' which is defined in tex-file.c @@ -47,6 +47,6 @@ respectively. kpse_program_name is _always_ set to a copy of everything in ARGV0 after the last directory separator. */ -extern void kpse_set_progname P1H(const_string argv0); +extern KPSEDLL void kpse_set_progname P1H(const_string argv0); #endif /* not KPATHSEA_PROGNAME_H */ diff -Naur xdvik-22.40n/texk/kpathsea/readable.c xdvik-22.40o/texk/kpathsea/readable.c --- xdvik-22.40n/texk/kpathsea/readable.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/readable.c Wed Oct 16 22:26:22 2002 @@ -1,6 +1,7 @@ /* readable.c: check if a filename is a readable non-directory file. Copyright (C) 1993, 95, 96 Karl Berry. +Copyright (C) 2000 Olaf Weber. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -16,11 +17,12 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" -#include "kpathsea/c-stat.h" -#include "kpathsea/readable.h" -#include "kpathsea/tex-hush.h" -#include "kpathsea/truncate.h" +#include +#include +#include +#include +#include +#include /* If access can read FN, run stat (assigning to stat buffer ST) and @@ -33,9 +35,29 @@ #define READABLE(fn, st) \ (access (fn, R_OK) == 0 && access (fn, D_OK) == -1) #elif WIN32 -#define READABLE(fn, st) \ - (GetFileAttributes(fn) != 0xFFFFFFFF && \ - !(GetFileAttributes(fn) & FILE_ATTRIBUTE_DIRECTORY)) +/* Warning: st must be an unsigned int under Win32 */ +static boolean +READABLE(const_string fn, unsigned int st) +{ + if ((st = GetFileAttributes(fn)) != 0xFFFFFFFF) { + /* succeeded */ + errno = 0; + } else { + switch(GetLastError()) { + case ERROR_BUFFER_OVERFLOW: + errno = ENAMETOOLONG; + break; + case ERROR_ACCESS_DENIED: + errno = EACCES; + break; + default : + errno = EIO; /* meaningless, will make ret=NULL later */ + break; + } + } + return ((st != 0xFFFFFFFF) && + !(st & FILE_ATTRIBUTE_DIRECTORY)); +} #else #define READABLE(fn, st) \ (access (fn, R_OK) == 0 && stat (fn, &(st)) == 0 && !S_ISDIR (st.st_mode)) @@ -50,33 +72,35 @@ string kpse_readable_file P1C(const_string, name) { - struct stat st; string ret; - - if (READABLE (name, st)) { - ret = (string) name; +#ifdef WIN32 + unsigned int st = 0; +#else /* ! WIN32 */ + struct stat st; +#endif + + kpse_normalize_path((string)name); + if (READABLE (name, st)) { + ret = (string) name; #ifdef ENAMETOOLONG } else if (errno == ENAMETOOLONG) { - ret = kpse_truncate_filename (name); + ret = kpse_truncate_filename (name); - /* Perhaps some other error will occur with the truncated name, so - let's call access again. */ - if (!READABLE (ret, st)) - { /* Failed. */ - if (ret != name) free (ret); - ret = NULL; + /* Perhaps some other error will occur with the truncated name, so + let's call access again. */ + if (!READABLE (ret, st)) { /* Failed. */ + if (ret != name) free (ret); + ret = NULL; } #endif /* ENAMETOOLONG */ - } else { /* Some other error. */ - if (errno == EACCES) { /* Maybe warn them if permissions are bad. */ - if (!kpse_tex_hush ("readable")) { - perror (name); + if (errno == EACCES) { /* Maybe warn them if permissions are bad. */ + if (!kpse_tex_hush ("readable")) { + perror (name); + } } - } - ret = NULL; + ret = NULL; } - return ret; } diff -Naur xdvik-22.40n/texk/kpathsea/readable.h xdvik-22.40o/texk/kpathsea/readable.h --- xdvik-22.40n/texk/kpathsea/readable.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/readable.h Wed Oct 16 22:26:22 2002 @@ -19,13 +19,13 @@ #ifndef KPATHSEA_READABLE_H #define KPATHSEA_READABLE_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* If NAME is readable and is a regular file, return it. If the error is ENAMETOOLONG, truncate any too-long path components, and if the result is a readable file, return that. Otherwise return NULL. */ -extern string kpse_readable_file P1H(const_string name); +extern KPSEDLL string kpse_readable_file P1H(const_string name); #endif /* not KPATHSEA_READABLE_H */ diff -Naur xdvik-22.40n/texk/kpathsea/readlink.c xdvik-22.40o/texk/kpathsea/readlink.c --- xdvik-22.40n/texk/kpathsea/readlink.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/readlink.c Wed Oct 16 22:26:22 2002 @@ -16,10 +16,10 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include -#include "kpathsea/config.h" -#include "kpathsea/c-pathmx.h" -#include "kpathsea/c-unistd.h" -#include "kpathsea/c-stat.h" +#include +#include +#include +#include #ifdef WIN32 #include @@ -31,9 +31,8 @@ * of the link are printed on standard output. */ -int main (argc, argv) - int argc; - char *argv[]; +int +main P2C(int, argc, char **, argv) { #ifdef S_ISLNK int status; @@ -63,7 +62,7 @@ /* insist on exactly one arg */ if (argc != 2) { fprintf(stderr, "%s: Need exactly one argument.\n\ -Try `access --help' for more information.\n", argv[0]); +Try `%s --help' for more information.\n", argv[0], argv[0]); exit(1); } diff -Naur xdvik-22.40n/texk/kpathsea/rm-suffix.c xdvik-22.40o/texk/kpathsea/rm-suffix.c --- xdvik-22.40n/texk/kpathsea/rm-suffix.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/rm-suffix.c Wed Oct 16 22:26:22 2002 @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include /* Generic const warning -- see extend-fname.c. */ diff -Naur xdvik-22.40n/texk/kpathsea/stamp-auto.in xdvik-22.40o/texk/kpathsea/stamp-auto.in --- xdvik-22.40n/texk/kpathsea/stamp-auto.in Sun May 20 22:19:03 2001 +++ xdvik-22.40o/texk/kpathsea/stamp-auto.in Wed Oct 16 22:26:22 2002 @@ -1 +1 @@ -Sun May 20 23:54:23 MET DST 2001 +Wed Oct 16 23:17:14 BST 2002 diff -Naur xdvik-22.40n/texk/kpathsea/str-list.c xdvik-22.40o/texk/kpathsea/str-list.c --- xdvik-22.40n/texk/kpathsea/str-list.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/str-list.c Wed Oct 16 22:26:22 2002 @@ -16,9 +16,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/str-list.h" +#include /* See the .h file for comments. */ @@ -72,9 +72,10 @@ if (STR_LIST_LENGTH(more) == 0) { return; } else if (STR_LIST_LENGTH(*target) == 0) { - int i; + unsigned int i; STR_LIST_LENGTH(*target) = STR_LIST_LENGTH(more); - STR_LIST(*target) = xmalloc(STR_LIST_LENGTH(more)*sizeof(char*)); + STR_LIST(*target) = + (string*)xmalloc(STR_LIST_LENGTH(more)*sizeof(char*)); for (i=0;i!=STR_LIST_LENGTH(more);++i) { STR_LIST_ELT(*target,i)=xstrdup(STR_LIST_ELT(more,i)); } @@ -82,9 +83,9 @@ } else { unsigned new_len; char ** new_list; - int i,j; - new_list = xmalloc(STR_LIST_LENGTH (*target) - * STR_LIST_LENGTH (more) * sizeof(char*)); + unsigned int i,j; + new_list = (string*)xmalloc(STR_LIST_LENGTH (*target) + * STR_LIST_LENGTH (more) * sizeof(char*)); new_len = 0; for (j = 0; j != STR_LIST_LENGTH(more); ++j) { diff -Naur xdvik-22.40n/texk/kpathsea/str-list.h xdvik-22.40o/texk/kpathsea/str-list.h --- xdvik-22.40n/texk/kpathsea/str-list.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/str-list.h Wed Oct 16 22:26:22 2002 @@ -19,8 +19,8 @@ #ifndef KPATHSEA_STR_LIST_H #define KPATHSEA_STR_LIST_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* Lists of strings; used for, e.g., directory lists. */ diff -Naur xdvik-22.40n/texk/kpathsea/str-llist.c xdvik-22.40o/texk/kpathsea/str-llist.c --- xdvik-22.40n/texk/kpathsea/str-llist.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/str-llist.c Wed Oct 16 22:26:22 2002 @@ -16,9 +16,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/str-llist.h" +#include /* Add the new string STR to the end of the list L. */ diff -Naur xdvik-22.40n/texk/kpathsea/str-llist.h xdvik-22.40o/texk/kpathsea/str-llist.h --- xdvik-22.40n/texk/kpathsea/str-llist.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/str-llist.h Wed Oct 16 22:26:22 2002 @@ -23,8 +23,8 @@ #ifndef STR_LLIST_H #define STR_LLIST_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* It's a little bizarre to be using the same type for the list and the diff -Naur xdvik-22.40n/texk/kpathsea/tex-file.c xdvik-22.40o/texk/kpathsea/tex-file.c --- xdvik-22.40n/texk/kpathsea/tex-file.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/tex-file.c Wed Oct 16 22:26:22 2002 @@ -1,6 +1,7 @@ /* tex-file.c: high-level file searching by format. Copyright (C) 1993, 94, 95, 96, 97 Karl Berry. +Copyright 1998, 1998 Olaf Weber. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -16,21 +17,21 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-fopen.h" -#include "kpathsea/c-pathch.h" -#include "kpathsea/c-vararg.h" -#include "kpathsea/cnf.h" -#include "kpathsea/concatn.h" -#include "kpathsea/default.h" -#include "kpathsea/expand.h" -#include "kpathsea/fontmap.h" -#include "kpathsea/paths.h" -#include "kpathsea/pathsearch.h" -#include "kpathsea/tex-file.h" -#include "kpathsea/tex-make.h" -#include "kpathsea/variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* See tex-file.h. */ @@ -80,6 +81,9 @@ #define TRUETYPE_ENVS "TTFONTS" #define TYPE42_ENVS "T42FONTS" #define WEB2C_ENVS "WEB2C" +#define MISCFONTS_ENVS "MISCFONTS" +#define WEB_ENVS "WEBINPUTS" +#define CWEB_ENVS "CWEBINPUTS" /* The compiled-in default list, DEFAULT_FONT_SIZES, is intended to be set from the command line (presumably via the Makefile). */ @@ -214,19 +218,27 @@ to create a str_list and then use it twice. Yuck. */ while ((env_name = va_arg (ap, string)) != NULL) { /* Since sh doesn't like envvar names with `.', check PATH_prog - rather than PATH.prog. */ + as well as PATH.prog. */ if (!var) { - string evar = concat3 (env_name, "_", kpse_program_name); + /* Try PATH.prog. */ + string evar = concat3 (env_name, ".", kpse_program_name); string env_value = getenv (evar); if (env_value && *env_value) { var = evar; } else { free (evar); - - /* Try simply PATH. */ - env_value = getenv (env_name); + /* Try PATH_prog. */ + evar = concat3 (env_name, "_", kpse_program_name); + env_value = getenv (evar); if (env_value && *env_value) { - var = env_name; + var = evar; + } else { + free (evar); + /* Try simply PATH. */ + env_value = getenv (env_name); + if (env_value && *env_value) { + var = env_name; + } } } } @@ -277,6 +289,34 @@ (*list)[count] = NULL; }} +/* Some times it is convenient to modify the list of searched suffixes. + *** Don't complain if this function goes away. *** + FIXME: redundant code here should be replaced by a call to + add_suffixes() function. */ +void +kpse_set_suffixes PVAR2C(kpse_file_format_type, format, + boolean, alternate, ap) +{ + const_string **list; + const_string s; + unsigned count = 0; + + if (alternate) { + list = &kpse_format_info[format].alt_suffix; + } + else { + list = &kpse_format_info[format].suffix; + } + + while ((s = va_arg (ap, string)) != NULL) { + count++; + XRETALLOC (*list, count + 1, const_string); + (*list)[count - 1] = s; + } + va_end (ap); + (*list)[count] = NULL; + +}} /* The path spec we are defining, one element of the global array. */ #define FMT_INFO kpse_format_info[format] @@ -386,6 +426,7 @@ SUFFIXES (".afm"); break; case kpse_base_format: + init_maketex (format, "mktexfmt", NULL); INIT_FORMAT ("base", DEFAULT_MFBASES, BASE_ENVS); SUFFIXES (".base"); FMT_INFO.binmode = true; @@ -393,6 +434,7 @@ case kpse_bib_format: INIT_FORMAT ("bib", DEFAULT_BIBINPUTS, BIB_ENVS); SUFFIXES (".bib"); + FMT_INFO.suffix_search_only = true; break; case kpse_bst_format: INIT_FORMAT ("bst", DEFAULT_BSTINPUTS, BST_ENVS); @@ -408,6 +450,7 @@ FMT_INFO.path = remove_dbonly (FMT_INFO.path); break; case kpse_fmt_format: + init_maketex (format, "mktexfmt", NULL); INIT_FORMAT ("fmt", DEFAULT_TEXFORMATS, FMT_ENVS); SUFFIXES (".fmt"); #define FMT_SUFFIXES ".efmt", ".efm" @@ -419,6 +462,7 @@ SUFFIXES (".map"); break; case kpse_mem_format: + init_maketex (format, "mktexfmt", NULL); INIT_FORMAT ("mem", DEFAULT_MPMEMS, MEM_ENVS); SUFFIXES (".mem"); FMT_INFO.binmode = true; @@ -553,15 +597,31 @@ break; case kpse_program_text_format: INIT_FORMAT ("other text files", - concat3 (".:$TEXMF/", kpse_program_name, "//"), + concatn (".", ENV_SEP_STRING, "$TEXMF/", + kpse_program_name, "//", NULL), concat (uppercasify (kpse_program_name), "INPUTS")); break; case kpse_program_binary_format: INIT_FORMAT ("other binary files", - concat3 (".:$TEXMF/", kpse_program_name, "//"), + concatn (".", ENV_SEP_STRING, "$TEXMF/", + kpse_program_name, "//", NULL), concat (uppercasify (kpse_program_name), "INPUTS")); FMT_INFO.binmode = true; break; + case kpse_miscfonts_format: + INIT_FORMAT ("misc fonts", DEFAULT_MISCFONTS, MISCFONTS_ENVS); + FMT_INFO.binmode = true; + break; + case kpse_web_format: + INIT_FORMAT ("web", DEFAULT_WEBINPUTS, WEB_ENVS); + SUFFIXES (".web"); + ALT_SUFFIXES (".ch"); + break; + case kpse_cweb_format: + INIT_FORMAT ("cweb", DEFAULT_CWEBINPUTS, CWEB_ENVS); + SUFFIXES (".w"); + ALT_SUFFIXES (".ch"); + break; default: FATAL1 ("kpse_init_format: Unknown format %d", format); } @@ -644,14 +704,14 @@ if (FMT_INFO.suffix) { for (ext = FMT_INFO.suffix; !name_has_suffix_already && *ext; ext++) { unsigned suffix_len = strlen (*ext); - name_has_suffix_already = (name_len > suffix_len + name_has_suffix_already = (name_len >= suffix_len && FILESTRCASEEQ (*ext, name + name_len - suffix_len)); } } if (!name_has_suffix_already && FMT_INFO.alt_suffix) { for (ext = FMT_INFO.alt_suffix; !name_has_suffix_already && *ext; ext++) { unsigned suffix_len = strlen (*ext); - name_has_suffix_already = (name_len > suffix_len + name_has_suffix_already = (name_len >= suffix_len && FILESTRCASEEQ (*ext, name + name_len - suffix_len)); } } @@ -760,9 +820,19 @@ 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 + values may differ with the new program name. */ if (kpse_format_info[i].path != NULL) { free ((string)kpse_format_info[i].path); kpse_format_info[i].path = NULL; } + /* We cannot free the cnf_path: it points into the cnf hash, which + means all hell will break loose if we did. */ + if (kpse_format_info[i].cnf_path != NULL) { + kpse_format_info[i].cnf_path = NULL; + } + /* We do not wipe the override_path at this point, though arguably + we should provide new values. It is not likely to matter for + the programs that call this function. */ } } diff -Naur xdvik-22.40n/texk/kpathsea/tex-file.h xdvik-22.40o/texk/kpathsea/tex-file.h --- xdvik-22.40n/texk/kpathsea/tex-file.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/tex-file.h Wed Oct 16 22:26:22 2002 @@ -1,6 +1,7 @@ /* tex-file.h: find files in a particular format. Copyright (C) 1993, 94, 95, 96 Karl Berry. +Copyright 1998, 1999 Olaf Weber. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -19,8 +20,9 @@ #ifndef KPATHSEA_TEX_FILE_H #define KPATHSEA_TEX_FILE_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include +#include /* If non-NULL, try looking for this if can't find the real font. */ @@ -30,7 +32,7 @@ /* If non-NULL, default list of fallback resolutions comes from this instead of the compile-time value. Set by dvipsk for the R config cmd. *SIZES environment variables override/use as default. */ -extern DllImport const_string kpse_fallback_resolutions_string; +extern KPSEDLL const_string kpse_fallback_resolutions_string; /* If non-NULL, check these if can't find (within a few percent of) the given resolution. List must end with a zero element. */ @@ -87,6 +89,9 @@ kpse_web2c_format, kpse_program_text_format, kpse_program_binary_format, + kpse_miscfonts_format, + kpse_web_format, + kpse_cweb_format, kpse_last_format /* one past last index */ } kpse_file_format_type; @@ -134,26 +139,31 @@ /* The sole variable of that type, indexed by `kpse_file_format_type'. Initialized by calls to `kpse_find_file' for `kpse_init_format'. */ -extern DllImport kpse_format_info_type kpse_format_info[kpse_last_format]; +extern KPSEDLL kpse_format_info_type kpse_format_info[kpse_last_format]; /* If LEVEL is higher than `program_enabled_level' for FMT, set `program_enabled_p' to VALUE. */ -extern void kpse_set_program_enabled P3H(kpse_file_format_type fmt, +extern KPSEDLL void kpse_set_program_enabled P3H(kpse_file_format_type fmt, boolean value, kpse_src_type level); /* Call kpse_set_program_enabled with VALUE and the format corresponding to FMTNAME. */ -extern void kpse_maketex_option P2H(const_string fmtname, boolean value); +extern KPSEDLL void kpse_maketex_option P2H(const_string fmtname, boolean value); + +/* Change the list of searched suffixes (alternate suffixes if alternate is + true). */ +extern KPSEDLL void kpse_set_suffixes PVAR2H(kpse_file_format_type format, + boolean alternate); /* Initialize the info for the given format. This is called automatically by `kpse_find_file', but the glyph searching (for example) can't use that function, so make it available. */ -extern const_string kpse_init_format P1H(kpse_file_format_type); +extern KPSEDLL const_string kpse_init_format P1H(kpse_file_format_type); /* If FORMAT has a non-null `suffix' member, append it to NAME "." and call `kpse_path_search' with the result and the other arguments. If that fails, try just NAME. */ -extern string kpse_find_file P3H(const_string name, +extern KPSEDLL string kpse_find_file P3H(const_string name, kpse_file_format_type format, boolean must_exist); /* Here are some abbreviations. */ @@ -171,12 +181,12 @@ #define kpse_find_ovf(name) kpse_find_file (name, kpse_ovf_format, false) /* Don't just look up the name, actually open the file. */ -extern FILE *kpse_open_file P2H(const_string, kpse_file_format_type); +extern KPSEDLL FILE *kpse_open_file P2H(const_string, kpse_file_format_type); /* This function is used to set kpse_program_name (from progname.c) to a different value. It will clear the path searching information, to ensure that the search paths are appropriate to the new name. */ -extern void kpse_reset_program_name P1H(const_string progname); +extern KPSEDLL void kpse_reset_program_name P1H(const_string progname); #endif /* not KPATHSEA_TEX_FILE_H */ diff -Naur xdvik-22.40n/texk/kpathsea/tex-glyph.c xdvik-22.40o/texk/kpathsea/tex-glyph.c --- xdvik-22.40n/texk/kpathsea/tex-glyph.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/tex-glyph.c Wed Oct 16 22:26:22 2002 @@ -16,15 +16,15 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/absolute.h" -#include "kpathsea/expand.h" -#include "kpathsea/fontmap.h" -#include "kpathsea/pathsearch.h" -#include "kpathsea/tex-glyph.h" -#include "kpathsea/tex-make.h" -#include "kpathsea/variable.h" +#include +#include +#include +#include +#include +#include +#include /* Routines are in bottom-up order. */ @@ -129,8 +129,9 @@ { unsigned r; unsigned tolerance = KPSE_BITMAP_TOLERANCE (dpi); - unsigned lower_bound = (int) (dpi - tolerance) < 0 ? 0 : dpi - tolerance; - unsigned upper_bound = dpi + tolerance; + /* Cast to unsigned to shut up stupid compilers. */ + unsigned lower_bound = (int) (dpi - tolerance) < 0 ? 0 : (unsigned)(dpi - tolerance); + unsigned upper_bound = (unsigned)(dpi + tolerance); /* Prefer scaling up to scaling down, since scaling down can omit character features (Tom did this in dvips). */ @@ -282,7 +283,7 @@ /* If mktex... succeeded, set return struct. Doesn't make sense for `kpse_make_tex' to set it, since it can only succeed or fail, unlike the other routines. */ - if (ret) { + if (ret && glyph_file) { KPSE_GLYPH_FILE_DPI (*glyph_file) = dpi; KPSE_GLYPH_FILE_NAME (*glyph_file) = fontname; } @@ -310,7 +311,8 @@ /* If RET is null, then the caller is not supposed to look at GLYPH_FILE, so it doesn't matter if we assign something incorrect. */ - KPSE_GLYPH_FILE_SOURCE (*glyph_file) = source; + if (glyph_file) + KPSE_GLYPH_FILE_SOURCE (*glyph_file) = source; /* FIXME: fontname may have been allocated, but (worse) it may also have been assigned to struct that's passed out of this function. @@ -378,3 +380,10 @@ } #endif /* TEST */ + + +/* +Local variables: +test-compile-command: "gcc -g -I. -I.. -DTEST tex-glyph.c kpathsea.a" +End: +*/ diff -Naur xdvik-22.40n/texk/kpathsea/tex-glyph.h xdvik-22.40o/texk/kpathsea/tex-glyph.h --- xdvik-22.40n/texk/kpathsea/tex-glyph.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/tex-glyph.h Wed Oct 16 22:26:22 2002 @@ -19,7 +19,7 @@ #ifndef KPATHSEA_TEX_GLYPH_H #define KPATHSEA_TEX_GLYPH_H -#include "kpathsea/tex-file.h" +#include /* This type describes the origination of a glyph font. */ @@ -56,7 +56,7 @@ for kpse_fallback_name. Then fail. Return either the filename found, or NULL. Also return information about the file found in *GLYPH_FILE. */ -extern string kpse_find_glyph P4H(const_string font_name, unsigned dpi, +extern KPSEDLL string kpse_find_glyph P4H(const_string font_name, unsigned dpi, kpse_file_format_type format, kpse_glyph_file_type *glyph_file); @@ -73,6 +73,6 @@ #define KPSE_BITMAP_TOLERANCE(r) ((r) / 500.0 + 1) /* Check whether DPI1 is within KPSE_BITMAP_TOLERANCE of DPI2. */ -extern boolean kpse_bitmap_tolerance P2H(double dpi1, double dpi2); +extern KPSEDLL boolean kpse_bitmap_tolerance P2H(double dpi1, double dpi2); #endif /* not KPATHSEA_TEX_GLYPH_H */ diff -Naur xdvik-22.40n/texk/kpathsea/tex-hush.c xdvik-22.40o/texk/kpathsea/tex-hush.c --- xdvik-22.40n/texk/kpathsea/tex-hush.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/tex-hush.c Wed Oct 16 22:26:22 2002 @@ -16,11 +16,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/pathsearch.h" -#include "kpathsea/tex-hush.h" -#include "kpathsea/variable.h" +#include +#include +#include boolean kpse_tex_hush P1C(const_string, what) @@ -28,9 +28,13 @@ string h; string hush = kpse_var_value ("TEX_HUSH"); if (hush) { + if (STREQ (hush, "all")) + return true; + if (STREQ (hush, "none")) + return false; for (h = kpse_path_element (hush); h; h = kpse_path_element (NULL)) { /* Don't do anything special with empty elements. */ - if (STREQ (h, what) || STREQ (h, "all")) + if (STREQ (h, what)) return true; } } diff -Naur xdvik-22.40n/texk/kpathsea/tex-hush.h xdvik-22.40o/texk/kpathsea/tex-hush.h --- xdvik-22.40n/texk/kpathsea/tex-hush.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/tex-hush.h Wed Oct 16 22:26:22 2002 @@ -19,11 +19,11 @@ #ifndef KPATHSEA_TEX_HUSH_H #define KPATHSEA_TEX_HUSH_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* Return true if WHAT is included in the TEX_HUSH environment variable/config value. */ -extern boolean kpse_tex_hush P1H(const_string what); +extern KPSEDLL boolean kpse_tex_hush P1H(const_string what); #endif /* not KPATHSEA_TEX_HUSH_H */ diff -Naur xdvik-22.40n/texk/kpathsea/tex-make.c xdvik-22.40o/texk/kpathsea/tex-make.c --- xdvik-22.40n/texk/kpathsea/tex-make.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/tex-make.c Wed Oct 16 22:26:22 2002 @@ -16,17 +16,17 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-fopen.h" -#include "kpathsea/c-pathch.h" -#include "kpathsea/concatn.h" -#include "kpathsea/db.h" -#include "kpathsea/fn.h" -#include "kpathsea/magstep.h" -#include "kpathsea/readable.h" -#include "kpathsea/tex-make.h" -#include "kpathsea/variable.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include /* We never throw away stdout, since that is supposed to be the filename @@ -169,7 +169,9 @@ #ifdef AMIGA ret = system (cmd) == 0 ? getenv ("LAST_FONT_CREATED") : NULL; #else /* not AMIGA */ - f = popen (cmd, FOPEN_R_MODE); + /* Use a simple "r", as no variations like "rb" are expected or + understood. */ + f = popen (cmd, "r"); #if defined (MSDOS) || defined (WIN32) if (kpse_make_tex_discard_errors) { @@ -192,7 +194,7 @@ /* Read all the output and terminate with a null. */ while ((c = getc (f)) != EOF) - fn_1grow (&output, c); + fn_1grow (&output, (char)c); /* Yet another cast to shut up compilers. */ fn_1grow (&output, 0); /* Maybe should check for `EXIT_SUCCESS' status before even @@ -247,11 +249,21 @@ { kpse_format_info_type spec; /* some compilers lack struct initialization */ string ret = NULL; + size_t reject; spec = kpse_format_info[format]; if (!spec.type) { /* Not initialized yet? */ kpse_init_format (format); spec = kpse_format_info[format]; + } + + /* If any of the following characters are found, we fail unconditionally + under the asusmption of foul play. These are characters that either + cause problems in mf, or in (subsequent) mktex invocations. */ + if ((reject = strcspn(base, " \t\r\n\"$&';<>`")) != strlen(base)) { + fprintf(stderr, "kpathsea: Illegal character `%c' in font name `%s'\n", + base[reject], base); + return NULL; } if (spec.program && spec.program_enabled_p) { diff -Naur xdvik-22.40n/texk/kpathsea/tex-make.h xdvik-22.40o/texk/kpathsea/tex-make.h --- xdvik-22.40n/texk/kpathsea/tex-make.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/tex-make.h Wed Oct 16 22:26:22 2002 @@ -19,14 +19,14 @@ #ifndef KPATHSEA_TEX_MAKE_H #define KPATHSEA_TEX_MAKE_H -#include "kpathsea/c-proto.h" -#include "kpathsea/tex-file.h" -#include "kpathsea/types.h" +#include +#include +#include /* If true, throw away standard error from the mktex... scripts. (Standard output is the filename, so we never throw that away.) */ -extern DllImport boolean kpse_make_tex_discard_errors; +extern KPSEDLL boolean kpse_make_tex_discard_errors; /* Run a program to create a file named by BASE_FILE in format FORMAT. diff -Naur xdvik-22.40n/texk/kpathsea/texmf.in xdvik-22.40o/texk/kpathsea/texmf.in --- xdvik-22.40n/texk/kpathsea/texmf.in Wed Apr 18 14:24:36 2001 +++ xdvik-22.40o/texk/kpathsea/texmf.in Wed Oct 16 22:26:22 2002 @@ -33,7 +33,7 @@ % % // means to search subdirectories (recursively). % A leading !! means to look only in the ls-R db, never on the disk. -% A leading/trailing/doubled : in the paths will be expanded into the +% A leading/trailing/doubled ; in the paths will be expanded into the % compile-time default. Probably not what you want. % % You can use brace notation, for example: /usr/local/{mytex:othertex} @@ -58,20 +58,22 @@ TEXMFMAIN = @texmf@ % A place for local additions to a "standard" texmf tree. For example: -% TEXMFLOCAL = @texmf@-local +TEXMFLOCAL = @texmf@-local -% A place where texconfig stores modifications (instead of the TEXMFMAIN -% tree). teTeX's texconfig relies on the name, so don't change it. -% TEXMF_CNF = @texmf@-cnf +% If defined, teTeX's texconfig stores modifications here (instead of the +% TEXMFMAIN tree). +% VARTEXMF = @texmf@-var % User texmf trees can be catered for like this... -% HOMETEXMF = $HOME/texmf +HOMETEXMF = $HOME/texmf % Now, list all the texmf trees. If you have multiple trees you can % use shell brace notation, like this: -% TEXMF = {$HOMETEXMF:!!$TEXMFLOCAL:!!$TEXMFMAIN} -% The braces are necessary. -TEXMF = $TEXMFMAIN +TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN} +% The braces are necessary. If you set VARTEXMF, you also have to +% - list $VARTEXMF in the TEXMF definition; +% - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition. +% TEXMF = $TEXMFMAIN % The system trees. These are the trees that are shared by all the users. SYSTEXMF = $TEXMF @@ -83,6 +85,9 @@ % Where to look for ls-R files. There need not be an ls-R in the % directories in this path, but if there is one, Kpathsea will use it. +% +% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below +% one of the TEXMF directories (avoids overlapping ls-R files). TEXMFDBS = $TEXMF;$VARTEXFONTS % It may be convenient to define TEXMF like this: @@ -116,53 +121,73 @@ % TEXINPUTS is for TeX input files -- i.e., anything to be found by \input % or \openin, including .sty, .eps, etc. +% Plain TeX. Have the command tex check all directories as a last +% resort, we may have plain-compatible stuff anywhere. +TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}// + +% Other plain-based formats. +TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}// +TEXINPUTS.csplain = .;$TEXMF/tex/{csplain,plain,generic,}// +TEXINPUTS.eplain = .;$TEXMF/tex/{eplain,plain,generic,}// +TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}// +TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,plain,generic,}// +TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// + % LaTeX 2e specific macros are stored in latex/, macros that can only be % used with 2.09 in latex209/. In addition, we look in the directory % latex209, useful for macros that were written for 2.09 and do not % mention 2e at all, but can be used with 2e. +TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// +TEXINPUTS.platex = .;$TEXMF/tex/{platex,latex,generic,}// +TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}// TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}// -TEXINPUTS.latex2e = .;$TEXMF/tex/{latex,generic,latex209,}// -TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,latex209,}// % Fontinst needs to read afm files. TEXINPUTS.fontinst = .;$TEXMF/tex//;$TEXMF/fonts/afm// -% Plain TeX. Have the command tex check all directories as a last -% resort, we may have plain-compatible stuff anywhere. -TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}// -% other plain-based formats -TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}// -TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}// -TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// -TEXINPUTS.eplain = .;$TEXMF/tex/{eplain,plain,generic,}// -TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,plain,generic,}// - % MLTeX. +TEXINPUTS.frlatex = .;$TEXMF/{mltex,tex}/{french,latex,generic,}// TEXINPUTS.frtex = .;$TEXMF/{mltex,tex}/{french,plain,generic,}// -TEXINPUTS.frlatex = .;$TEXMF/{mltex,tex}/{french,latex,generic,latex209,}// +TEXINPUTS.mllatex = .;$TEXMF/{mltex,tex}/{latex,generic,}// TEXINPUTS.mltex = .;$TEXMF/{mltex,tex}/{plain,generic,}// -TEXINPUTS.mllatex = .;$TEXMF/{mltex,tex}/{latex,generic,latex209,}// % e-TeX. This form of the input paths is borrowed from teTeX. A certain % variant of TDS is assumed here, unaffected by the build variables. -TEXINPUTS.elatex = .;$TEXMF/{etex,tex}/{latex,generic,latex209,plain,}// +TEXINPUTS.elatex = .;$TEXMF/{etex,tex}/{latex,generic,}// TEXINPUTS.etex = .;$TEXMF/{etex,tex}/{plain,generic,}// -% PDFTeX. This form of the input paths is borrowed from teTeX. A certain +% pdfTeX. This form of the input paths is borrowed from teTeX. A certain % variant of TDS is assumed here, unaffected by the build variables. -TEXINPUTS.pdftexinfo = .;$TEXMF/{pdftex,tex}/{texinfo,generic,plain,}// -TEXINPUTS.pdflatex = .;$TEXMF/{pdftex,tex}/{latex,generic,latex209,plain,}// +TEXINPUTS.pdfcslatex = .;$TEXMF/{pdftex,tex}/{cslatex,csplain,latex,generic,}// +TEXINPUTS.pdfcsplain = .;$TEXMF/{pdftex,tex}/{csplain,plain,generic,}// +TEXINPUTS.pdfjadetex = .;$TEXMF/{pdftex,tex}/{jadetex,plain,generic,}// +TEXINPUTS.pdflatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}// +TEXINPUTS.pdfmex = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}// TEXINPUTS.pdftex = .;$TEXMF/{pdftex,tex}/{plain,generic,}// +TEXINPUTS.pdftexinfo = .;$TEXMF/{pdftex,tex}/{texinfo,plain,generic,}// +TEXINPUTS.pdfamstex = .;$TEXMF/{pdftex,tex}/{amstex,plain,generic,}// + +% pdfeTeX. +TEXINPUTS.pdfelatex = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{latex,generic,}// +TEXINPUTS.pdfetex = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{plain,generic,}// % Omega. -TEXINPUTS.lambda = .;$TEXMF/{omega,tex}/{lambda,latex,generic,latex209,plain,}// +TEXINPUTS.lambda = .;$TEXMF/{omega,tex}/{lambda,latex,generic,}// TEXINPUTS.omega = .;$TEXMF/{omega,tex}/{plain,generic,}// % Context macros by Hans Hagen: -TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// -TEXINPUTS.cont-en = .;$TEXMF/tex/{context,plain,generic,}// -TEXINPUTS.cont-de = .;$TEXMF/tex/{context,plain,generic,}// -TEXINPUTS.cont-nl = .;$TEXMF/tex/{context,plain,generic,}// +TEXINPUTS.context = .;$TEXMF/{pdftex,etex,tex}/{context,plain,generic,}// + +% odd formats needing their own paths +TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}// +TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}// +TEXINPUTS.mex-pl = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.platex-pl = .;$TEXMF/tex/{platex,latex,generic,}// +TEXINPUTS.pdfplatex = .;$TEXMF/{pdftex,tex}/{platex,latex,generic,}// +TEXINPUTS.pdfmex-pl = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}// +TEXINPUTS.pdfemex = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{mex,plain,generic,}// +TEXINPUTS.pdfemex-pl = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{mex,plain,generic, % Earlier entries override later ones, so put this last. TEXINPUTS = .;$TEXMF/tex/{generic,}// @@ -199,6 +224,9 @@ % A backup for PKFONTS and GFFONTS. Not used for anything. GLYPHFONTS = .;$TEXMF/fonts +% A place to puth everything that doesn't fit the other font categories. +MISCFONTS = .;$TEXMF/fonts/misc// + % For texfonts.map and included map files used by mktexpk. % See ftp://ftp.tug.org/tex/fontname.tar.gz. TEXFONTMAPS = .;$TEXMF/fontname @@ -211,7 +239,7 @@ MFTINPUTS = .;$TEXMF/mft// % PostScript headers, prologues (.pro), encodings (.enc) and fonts. -TEXPSHEADERS = .;$TEXMF/{dvips,pdftex,fonts/type1}// +TEXPSHEADERS = .;$TEXMF/{dvips,pdftex,tex,fonts/type1}// % PostScript Type 1 outline fonts. T1FONTS = .;$TEXMF/fonts/type1// @@ -245,6 +273,10 @@ TEXDOCS = .;$TEXMF/doc// TEXSOURCES = .;$TEXMF/source// +% Web and CWeb input paths. +WEBINPUTS = .;$TEXMF/web// +CWEBINPUTS = .;$TEXMF/cweb// + % Omega-related fonts and other files. The odd construction for OFMFONTS % makes it behave in the face of a definition of TFMFONTS. Unfortunately % no default substitution would take place for TFMFONTS, so an explicit @@ -259,10 +291,10 @@ % Some additional input variables for several programs. If you add % a program that uses the 'other text files' or 'other binary files' % search formats, you'll want to add their variables here as well. -XDVIINPUTS = .;$TEXMF/xdvi T4HTINPUTS = .;$TEXMF/tex4ht// -TEX4HTINPUTS = .;$TEXMF/tex4ht// +% xdvik with type1 support can share some files with dvips +XDVIINPUTS = .;$TEXMF/{xdvi,dvips//} %% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment. KPSE_DOT = . @@ -277,7 +309,7 @@ % % For security reasons, it is better not to have . part of the path. % -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{.local,}/web2c}:$TETEXDIR:$TEXMF/web2c:@web2c@ +TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};$TETEXDIR;$TEXMF/web2c;@web2c@ @@ -292,8 +324,9 @@ MISSFONT_LOG = missfont.log % Set to a colon-separated list of words specifying warnings to suppress. -% To suppress everything, use TEX_HUSH = all; this is equivalent to +% To suppress everything, use TEX_HUSH = all; this is currently equivalent to % TEX_HUSH = checksum:lostchar:readable:special +% To suppress nothing, use TEX_HUSH = none or do not set the variable at all. TEX_HUSH = none % Enable system commands via \write18{...}? @@ -310,7 +343,7 @@ % Allow TeX, MF, and MP to parse the first line of an input file for % the %&format construct. -parse_first_line = t +parse_first_line = f % Enable the mktex... scripts by default? These must be set to 0 or 1. % Particular programs can and do override these settings, for example @@ -322,9 +355,10 @@ % variable/config value `FOO', not the `MKTEXPK' value. % % MKTEXTEX = 0 -% MKTEXPK = 0 % Note: xdvi(k) does not handle this variable correctly. +% MKTEXPK = 0 % MKTEXMF = 0 % MKTEXTFM = 0 +% MKTEXFMT = 0 % MKOCP = 0 % MKOFM = 0 @@ -355,54 +389,37 @@ % For some xy-pic samples, you may need as much as 700000 words of memory. % For the vast majority of documents, 60000 or less will do. % -main_memory.context = 1100000 -main_memory.cont-en = 1100000 -main_memory.cont-nl = 1100000 -main_memory.cont-de = 1100000 -main_memory = 263000 % words of inimemory available; also applies to inimf&mp -extra_mem_top = 0 % extra high memory for chars, tokens, etc. -extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. +main_memory = 2500000 % words of inimemory available; also applies to inimf&mp +extra_mem_top = 0 % extra high memory for chars, tokens, etc. +extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. + +% ConTeXt is a memory hog... +extra_mem_top.context = 2000000 +extra_mem_bot.context = 4000000 % Words of font info for TeX (total size of all TFM files, approximately). -font_mem_size = 200000 +font_mem_size = 500000 % Total number of fonts. Must be >= 50 and <= 2000 (without tex.ch changes). font_max = 1000 % Extra space for the hash table of control sequences (which allows 10K % names as distributed). -hash_extra.context = 15000 -hash_extra.cont-en = 15000 -hash_extra.cont-nl = 15000 -hash_extra.cont-de = 15000 -hash_extra = 0 +hash_extra = 50000 % Max number of characters in all strings, including all error messages, % help texts, font names, control sequences. These values apply to TeX and MP. -pool_size.context = 500000 -pool_size.cont-en = 500000 -pool_size.cont-nl = 500000 -pool_size.cont-de = 500000 -pool_size = 125000 +pool_size = 1250000 + % Minimum pool space after TeX/MP's own strings; must be at least % 25000 less than pool_size, but doesn't need to be nearly that large. -string_vacancies.context = 45000 -string_vacancies.cont-en = 45000 -string_vacancies.cont-nl = 45000 -string_vacancies.cont-de = 45000 -string_vacancies = 25000 +string_vacancies = 90000 + % Maximum number of strings. -max_strings.context = 55000 -max_strings.cont-en = 55000 -max_strings.cont-nl = 55000 -max_strings.cont-de = 55000 -max_strings = 15000 +max_strings = 100000 + % min pool space left after loading .fmt -pool_free.context = 47500 -pool_free.cont-en = 47500 -pool_free.cont-nl = 47500 -pool_free.cont-de = 47500 -pool_free = 5000 +pool_free = 47500 % Hyphenation trie. As distributed, the maximum is 65535; this should % work unless `unsigned short' is not supported or is smaller than 16 @@ -415,42 +432,35 @@ % German: 14000. % US English: 10000. % -trie_size = 64000 +trie_size = 262000 % Buffer size. TeX uses the buffer to contain input lines, but macro % expansion works by writing material into the buffer and reparsing the % line. As a consequence, certain constructs require the buffer to be % very large. As distributed, the size is 50000; most documents can be % handled within a tenth of this size. -buf_size = 50000 +buf_size = 200000 hyph_size = 1000 % number of hyphenation exceptions, >610 and <32767. -nest_size.context = 500 -nest_size.cont-en = 500 -nest_size.cont-nl = 500 -nest_size.cont-de = 500 -nest_size = 100 % simultaneous semantic levels (e.g., groups) +nest_size = 500 % simultaneous semantic levels (e.g., groups) max_in_open = 15 % simultaneous input files and error insertions -param_size.context = 1500 -param_size.cont-en = 1500 -param_size.cont-nl = 1500 -param_size.cont-de = 1500 -param_size = 500 % simultaneous macro parameters -save_size.context = 5000 -save_size.cont-en = 5000 -save_size.cont-nl = 5000 -save_size.cont-de = 5000 -save_size = 4000 % for saving values outside current group -stack_size.context = 1500 -stack_size.cont-en = 1500 -stack_size.cont-nl = 1500 -stack_size.cont-de = 1500 -stack_size = 300 % simultaneous input sources +param_size = 5000 % simultaneous macro parameters +save_size = 5000 % for saving values outside current group +stack_size = 1500 % simultaneous input sources % These are Omega-specific. ocp_buf_size = 20000 % character buffers for ocp filters. ocp_stack_size = 10000 % stacks for ocp computations. ocp_list_size = 1000 % control for multiple ocps. + +% Parameter specific to MetaPost. +% Maximum number of knots between breakpoints of a path. +% Set to 2000 by default. +% path_size.mpost = 10000 + +% These are pdftex-specific. +obj_tab_size = 300000 % PDF objects +dest_names_size = 300000 % destinations % These work best if they are the same as the I/O buffer size, but it % doesn't matter much. Must be a multiple of 8. diff -Naur xdvik-22.40n/texk/kpathsea/tilde.c xdvik-22.40o/texk/kpathsea/tilde.c --- xdvik-22.40n/texk/kpathsea/tilde.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/tilde.c Wed Oct 16 22:26:22 2002 @@ -16,10 +16,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-pathch.h" -#include "kpathsea/tilde.h" +#include +#include #ifdef HAVE_PWD_H #include diff -Naur xdvik-22.40n/texk/kpathsea/tilde.h xdvik-22.40o/texk/kpathsea/tilde.h --- xdvik-22.40n/texk/kpathsea/tilde.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/tilde.h Wed Oct 16 22:26:22 2002 @@ -19,8 +19,8 @@ #ifndef KPATHSEA_TILDE_H #define KPATHSEA_TILDE_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* Replace a leading ~ or ~name in FILENAME with getenv ("HOME") or diff -Naur xdvik-22.40n/texk/kpathsea/truncate.c xdvik-22.40o/texk/kpathsea/truncate.c --- xdvik-22.40n/texk/kpathsea/truncate.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/truncate.c Wed Oct 16 22:26:22 2002 @@ -16,12 +16,12 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-namemx.h" -#include "kpathsea/c-pathch.h" -#include "kpathsea/c-pathmx.h" -#include "kpathsea/truncate.h" +#include +#include +#include +#include /* Truncate any too-long components in NAME, returning the result. It's diff -Naur xdvik-22.40n/texk/kpathsea/truncate.h xdvik-22.40o/texk/kpathsea/truncate.h --- xdvik-22.40n/texk/kpathsea/truncate.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/truncate.h Wed Oct 16 22:26:22 2002 @@ -19,8 +19,8 @@ #ifndef KPATHSEA_TRUNCATE_H #define KPATHSEA_TRUNCATE_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* Truncate any component in NAME longer than the system NAME_MAX, and return the result as a malloced string. If none, return a copy of diff -Naur xdvik-22.40n/texk/kpathsea/types.h xdvik-22.40o/texk/kpathsea/types.h --- xdvik-22.40n/texk/kpathsea/types.h Wed Apr 18 14:24:36 2001 +++ xdvik-22.40o/texk/kpathsea/types.h Wed Oct 16 22:26:22 2002 @@ -20,18 +20,16 @@ #define KPATHSEA_TYPES_H /* Booleans. */ -#ifdef __cplusplus -/* `true' and `false' are reserved words in C++. Sigh. Although sizeof - (bool) may not equal sizeof (boolean), so this isn't completely - correct, we never rely on the size of the type. */ -#define boolean bool -#else /* NeXT wants to define their own boolean type. */ #ifndef HAVE_BOOLEAN #define HAVE_BOOLEAN -typedef enum { false = 0, true = 1 } boolean; +typedef int boolean; +/* `true' and `false' are reserved words in C++. */ +#ifndef __cplusplus +#define true 1 +#define false 0 +#endif /* __cplusplus */ #endif /* not HAVE_BOOLEAN */ -#endif /* not C++ */ /* The X library (among other things) defines `FALSE' and `TRUE', and so we only want to define them if necessary, for use by application code. */ diff -Naur xdvik-22.40n/texk/kpathsea/unixtex.ftp xdvik-22.40o/texk/kpathsea/unixtex.ftp --- xdvik-22.40n/texk/kpathsea/unixtex.ftp Thu Jan 1 00:00:00 1970 +++ xdvik-22.40o/texk/kpathsea/unixtex.ftp Wed Oct 16 22:29:09 2002 @@ -0,0 +1,205 @@ +`unixtex.ftp': Obtaining TeX +============================ + + This is , last updated 26 April +2000. Also available as . The IP +address is currently `[158.121.106.10]', and the canonical host name is +currently `tug.org'. It is also in Kpathsea source distributions as +`etc/unixtex.ftp' (although the network version is usually newer). +Mail with comments or questions. + + Following are general instructions for Unix or other sites who wish to +acquire the Web2c distribution, (plain) TeX, LaTeX (2e), BibTeX, +Metafont, MetaPost, DVI processors for the X window system, PostScript, +the PCL language in the HP LaserJet, and related programs. They are +oriented towards building from the original sources, though some +information on alternative packages is included in the last section. +See also , the Web2c and Kpathsea home page. + + Please note that the Web2c distribution is a bare-bones distribution +in source form, and building a complete installation from it is a +non-trivial matter. For most uses, it is a better idea to install a +distribution with pre-packaged binaries for your platform. An example +of such a distribution is teTeX, which is based on the Web2c sources. + + Please consider joining the TeX Users Group (TUG) to help support the +maintenance and development of the programs you retrieve. Email + or see for information and a +membership form. + + For actual installation instructions after obtaining the necessary +sources, see *Note Installation::. A copy is in the distribution file +`kpathsea/INSTALL'. + +Electronic distribution +----------------------- + + In many places we refer to CTAN:. This is _both_ a host name and a +directory name. Here are some primary locations: + + (California, USA) + (Germany) + (England) + +CTAN has many mirrors worldwide; see the top-level file +`README.mirrors' from one of the sites above, or finger +, or see . A list +current as of the time of distribution is in the top-level file +`./MIRROR'. + + You can also access CTAN via the World Wide Web, Gopher, electronic +mail, or NFS. The same `README.mirrors' file explains how. + + You will need to retrieve some or all of the following archives, +depending on your needs (don't forget to set binary mode for file +transfers): + +`CTAN:/systems/web2c/texmflib.tar.gz' + A basic collection of fonts (TFM files only) and macro packages + (including Texinfo and LaTeX 2e). It unpacks into `texmf/'; if + you change the structure of this hierarchy, you will also have to + change the default search paths (*note Changing search paths::). + It is required unless you already have these files, in which case + you should change the default paths as necessary to find them. + +`CTAN:/systems/web2c/web.tar.gz' + The original WEB source files, written mostly by Don Knuth. + Required unless you already have this `web' version. (The WEB + sources change irregularly with respect to Web2c itself.) Unpacks + into `web2c-VERSION'. + +`CTAN:/systems/web2c/web2c.tar.gz' + The Web2c system. Required. Also unpacks into `web2c-VERSION'. + +`CTAN:/systems/web2c/web2c-etex.tar.gz' + Additions to the Web2c system for building e-TeX. Optional. + Unpacks into `web2c-VERSION'. + +`CTAN:/systems/web2c/etexlib.tar.gz' + Additions to the texmf tree needed to build e-TeX. Optional. + Unpacks into `texmf/'. + +`CTAN:/systems/web2c/etexdoc.tar.gz' + Documentation for e-TeX as an addition to the texmf tree. + Optional. Unpacks into `texmf/'. + +`CTAN:/systems/web2c/web2c-omega.tar.gz' + Additions to the Web2c system for building Omega. Optional. + Unpacks into `web2c-VERSION'. + +`CTAN:/systems/web2c/omegalib.tar.gz' + Additions to the texmf tree needed to build Omega. Optional. + Unpacks into `texmf/'. + +`CTAN:/systems/web2c/omegadoc.tar.gz' + Documentation for Omega as an addition to the texmf tree. + Optional. Unpacks into `texmf/'. + +`CTAN:/systems/web2c/web2c-pdftex.tar.gz' + Additions to the Web2c system for building pdfTeX. Optional. + Unpacks into `web2c-VERSION'. + +`CTAN:/systems/web2c/pdftexlib.tar.gz' + Additions to the texmf tree needed to build pdfTeX. Optional. + Unpacks into `texmf/'. + +`CTAN:/systems/web2c/pdftexdoc.tar.gz' + Unpacks into `texmf/'. Documentation for pdfTeX as an addition to + the texmf tree. Optional. Unpacks into `texmf/'. + +`CTAN:/systems/web2c/texk.tar.gz' + The web and web2c sources, plus the additions for web2c, plus the + dvi drivers mentioned below, plus extra dvi drivers and tools not + packaged separately. Recommended if you want to build a complete + system, but may contain an older version of the separate packages. + Unpacks into `texk-VERSION'. + +`CTAN:/systems/web2c/texklib.tar.gz' + The basic texmf tree, plus the additions for e-TeX, Omega, and + pdfTeX. The match for texk.tar.gz, and therefore may also be older + than the separate packages. Unpacks into `texmf/'. + +`CTAN:/dviware/dvipsk/dvipsk.tar.gz' + DVI-to-PostScript translator. Unpacks into `dvipsk-VERSION'. + Optional. + +`CTAN:/dviware/xdvik/xdvik.tar.gz' + X window system DVI previewer. Unpacks into `xdvik-VERSION'. + Optional. + +`CTAN:/dviware/dviljk/dviljk.tar.gz' + DVI-to-PCL (HP LaserJet) translator. Unpacks into + `dviljk-VERSION'. Optional. + + All that said, the originating host for the software above is +`ftp.tug.org'. You can retrieve these distributions (but not much +else) from the `tex/' directory on that host. + +CD-ROM distribution +------------------- + + Numerous organizations distribute various TeX CD-ROM's: + + * TUG, UK TUG, and GUTenberg (French-speaking TeX user group) + collaborated to produce the `TeX Live' CD-ROM, based on teTeX, + which in turn is based on Web2c; email or + see . + + * Dante (the German-speaking TeX user group) has produced a CD-ROM. + See , and + for + information about TeX CD's in general. Both are in German. + + * The Free Software Foundation's `Source Code CD-ROM' contains the + minimal TeX source distribution described in the previous section + (i.e., enough to print GNU documentation); email + . + + * The Gateway! CD-ROM set contains a runnable NetBSD/Amiga + distribution and sources; see + . + + * The InfoMagic CD-ROM is a copy of CTAN (see previous section); see + . + + * NTG (Dutch-speaking TeX user group) produced the 4allTeX CD-ROM; + email , or see . + This is a runnable system. + + * The Prime Time TeXcetera CD-ROM is also a copy of CTAN; email + or see . + + * Walnut Creek's TeX CD-ROM is also a copy of CTAN; email + or see . + + * Most Linux distributions include some TeX package based on Web2c; + see the Linux documentation file `Distribution-HOWTO' for a + comparison of Linux distributions, available (for example) via + . + + If you know of additional TeX CD-ROM distributions to add to this +list, please inform . + +Other TeX packages +------------------ + + Many other TeX implementations are available in `CTAN:/systems', +including ready-to-run distributions for Unix, Amiga, Acorn, VMS, +Macintosh, DOS, and Windows (in various forms). Although Web2c has +support in the source code for many operating systems, and in fact some +of the other distributions are based on it, it's unlikely to work as +distributed on anything but Unix. (Please contribute improvements!) + + The Unix distribution alluded to above is the teTeX distribution. +This includes both complete sources and precompiled binaries for many +popular Unix variants, including Linux. It is based on Web2c, and +contains many other TeX-related programs as well. + + The host labrea.stanford.edu is the original source for the files for +which Donald Knuth is directly responsible: `tex.web', `plain.tex', +etc. However, unless you want to build your TeX library tree ab initio, +it is more reliable and less work to retrieve these files as part of +the above packages. In any case, labrea is not the canonical source for +anything except what was created by Stanford TeX project, so do not +rely on all the files available at that ftp site being up-to-date. + diff -Naur xdvik-22.40n/texk/kpathsea/unixtex.texi xdvik-22.40o/texk/kpathsea/unixtex.texi --- xdvik-22.40n/texk/kpathsea/unixtex.texi Wed Apr 18 14:24:37 2001 +++ xdvik-22.40o/texk/kpathsea/unixtex.texi Wed Oct 16 22:26:22 2002 @@ -17,12 +17,12 @@ @iftex chapter @end iftex -is @url{ftp://ftp.tug.org/tex/unixtex.ftp}, last updated 18 March 1998. +is @url{ftp://ftp.tug.org/tex/unixtex.ftp}, last updated 26 April 2000. Also available as @url{http://www.tug.org/unixtex.ftp}. The IP address is currently @code{[158.121.106.10]}, and the canonical host name is currently @samp{tug.org}. It is also in Kpathsea source distributions as @file{etc/unixtex.ftp} (although the network version is usually -newer). Mail @email{kb@@mail.tug.org} with comments or questions. +newer). Mail @email{tex-k@@mail.tug.org} with comments or questions. Following are general instructions for Unix or other sites who wish to acquire the Web2c distribution, (plain) @TeX{}, La@TeX{} (2e), @@ -33,6 +33,12 @@ section. See also @url{http://www.tug.org/web2c}, the Web2c and Kpathsea home page. +Please note that the Web2c distribution is a bare-bones distribution in +source form, and building a complete installation from it is a +non-trivial matter. For most uses, it is a better idea to install a +distribution with pre-packaged binaries for your platform. An example +of such a distribution is te@TeX{}, which is based on the Web2c sources. + Please consider joining the @TeX{} Users Group (TUG) to help support the maintenance and development of the programs you retrieve. Email @email{office@@tug.org} or see @url{http://www.tug.org} for information and @@ -45,10 +51,12 @@ @menu * Electronic distribution:: CTAN and so forth. * CD-ROM distribution:: -* Tape distribution:: * Other TeX packages:: @end menu +@c Note that +@c * Tape distribution:: +@c used to be in this menu. @node Electronic distribution @subsection Electronic distribution @@ -149,12 +157,14 @@ @item @file{@var{CTAN:}/systems/web2c/texk.tar.gz} The web and web2c sources, plus the additions for web2c, plus the dvi drivers mentioned below, plus extra dvi drivers and tools not packaged -separately. Recommended if you want to build a complete system. -Unpacks into @file{texk-@var{version}}. +separately. Recommended if you want to build a complete system, but may +contain an older version of the separate packages. Unpacks into +@file{texk-@var{version}}. @item @file{@var{CTAN:}/systems/web2c/texklib.tar.gz} The basic texmf tree, plus the additions for e-@TeX{}, Omega, and -pdf@TeX{}. The match for texk.tar.gz. Unpacks into @file{texmf/}. +pdf@TeX{}. The match for texk.tar.gz, and therefore may also be older +than the separate packages. Unpacks into @file{texmf/}. @c @item @file{@var{CTAN:}/systems/web2c/psfonts.tar.gz} @c Metrics, outlines, and bitmaps (for previewing) for the 35 de facto @@ -254,8 +264,9 @@ @end itemize If you know of additional @TeX{} CD-ROM distributions to add to this -list, please inform @email{kb@@mail.tug.org}. +list, please inform @email{tex-k@@mail.tug.org}. +@ignore @node Tape distribution @subsection Tape distribution @@ -276,13 +287,14 @@ @end display At this writing, the distribution is available in @code{tar} format on -1/4 inch 4-track QIC-24 cartridges and 4@dmn{mm} DAT cartridges, and the +4@dmn{mm} DAT cartridges, and the cost is US$210. Make checks payable to the University of Washington, drawn on a U.S. bank. Purchase orders are acceptable, but they carry an extra charge of $10 to pay for invoice processing. Overseas sites, please add $20 for shipment via air parcel post, or $30 for shipment via courier. +@end ignore @node Other TeX packages @subsection Other @TeX{} packages diff -Naur xdvik-22.40n/texk/kpathsea/uppercasify.c xdvik-22.40o/texk/kpathsea/uppercasify.c --- xdvik-22.40n/texk/kpathsea/uppercasify.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/uppercasify.c Wed Oct 16 22:26:22 2002 @@ -16,9 +16,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-ctype.h" +#include string diff -Naur xdvik-22.40n/texk/kpathsea/variable.c xdvik-22.40o/texk/kpathsea/variable.c --- xdvik-22.40n/texk/kpathsea/variable.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/variable.c Wed Oct 16 22:26:22 2002 @@ -16,12 +16,12 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-ctype.h" -#include "kpathsea/cnf.h" -#include "kpathsea/fn.h" -#include "kpathsea/variable.h" +#include +#include +#include +#include /* Here's the simple one, when a program just wants a value. */ @@ -29,11 +29,28 @@ string kpse_var_value P1C(const_string, var) { - string ret = getenv (var); + string vtry, ret; - if (!ret) + assert(kpse_program_name); + + /* First look for VAR.progname. */ + vtry = concat3(var, ".", kpse_program_name); + ret = getenv (vtry); + free (vtry); + + if (!ret || !*ret) { + /* Now look for VAR_progname. */ + vtry = concat3(var, "_", kpse_program_name); + ret = getenv (vtry); + free (vtry); + } + + if (!ret || !*ret) + ret = getenv (var); + + if (!ret || !*ret) ret = kpse_cnf_get (var); - + if (ret) ret = kpse_var_expand (ret); @@ -100,18 +117,23 @@ { string value; unsigned len = end - start + 1; - string var = xmalloc (len + 1); + string var = (string)xmalloc (len + 1); strncpy (var, start, len); var[len] = 0; if (expanding_p (var)) { WARNING1 ("kpathsea: variable `%s' references itself (eventually)", var); } else { + string vtry = concat3 (var, "_", kpse_program_name); /* Check for an environment variable. */ - value = getenv (var); + value = getenv (vtry); + free (vtry); + + if (!value || !*value) + value = getenv (var); /* If no envvar, check the config files. */ - if (!value) + if (!value || !*value) value = kpse_cnf_get (var); if (value) { diff -Naur xdvik-22.40n/texk/kpathsea/variable.h xdvik-22.40o/texk/kpathsea/variable.h --- xdvik-22.40n/texk/kpathsea/variable.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/variable.h Wed Oct 16 22:26:22 2002 @@ -19,13 +19,13 @@ #ifndef KPATHSEA_VARIABLE_H #define KPATHSEA_VARIABLE_H -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include /* Return the (variable-expanded) environment variable value or config file value, or NULL. */ -extern string kpse_var_value P1H(const_string var); +extern KPSEDLL string kpse_var_value P1H(const_string var); /* Expand $VAR and ${VAR} references in SRC, returning the (always newly dynamically-allocated) result. An unterminated ${ or any other @@ -37,6 +37,6 @@ In any case, ``expansion'' means calling `getenv'; if the variable is not set, look in texmf.cnf files for a definition. If not set there, either, the expansion is the empty string (no error). */ -extern string kpse_var_expand P1H(const_string src); +extern KPSEDLL string kpse_var_expand P1H(const_string src); #endif /* not KPATHSEA_VARIABLE_H */ diff -Naur xdvik-22.40n/texk/kpathsea/version.c xdvik-22.40o/texk/kpathsea/version.c --- xdvik-22.40n/texk/kpathsea/version.c Wed Apr 18 14:24:37 2001 +++ xdvik-22.40o/texk/kpathsea/version.c Wed Oct 16 22:26:22 2002 @@ -1,6 +1,7 @@ #include "c-auto.h" +#include -char *kpathsea_version_string = (char *) KPSEVERSION; +KPSEDLL char *kpathsea_version_string = (char *) KPSEVERSION; /* If you are redistributing a modified version of my original distribution, please change this address. @@ -10,5 +11,5 @@ Thanks. --kb@cs.umb.edu */ -char *kpse_bug_address = (char *) +KPSEDLL char *kpse_bug_address = (char *) "Email bug reports to tex-k@mail.tug.org.\n"; diff -Naur xdvik-22.40n/texk/kpathsea/withenable.ac xdvik-22.40o/texk/kpathsea/withenable.ac --- xdvik-22.40n/texk/kpathsea/withenable.ac Wed Apr 18 14:24:37 2001 +++ xdvik-22.40o/texk/kpathsea/withenable.ac Wed Oct 16 22:26:22 2002 @@ -15,38 +15,28 @@ ])dnl CF_SUBST(loader,LD,ld) CF_SUBST(archiver,AR,ar) -CF_SUBST(archiver options,AR_OPTS,rc) +CF_SUBST(archiver options,ARFLAGS,rc) AC_ARG_WITH(mktexmf-default, [ --without-mktexmf-default do not run mktexmf if MF source missing], - , withval=yes) -if test "x$withval" = xyes; then - AC_DEFINE(MAKE_TEX_MF_BY_DEFAULT) -fi + , with_mktexmf_default=yes) AC_ARG_WITH(mktexpk-default, [ --without-mktexpk-default do not run mktexpk if PK font missing], - , withval=yes) -if test "x$withval" = xyes; then - AC_DEFINE(MAKE_TEX_PK_BY_DEFAULT) -fi + , with_mktexpk_default=yes) AC_ARG_WITH(mktextfm-default, [ --without-mktextfm-default do not run mktextfm if TFM file missing], - , withval=yes) -if test "x$withval" = xyes; then - AC_DEFINE(MAKE_TEX_TFM_BY_DEFAULT) -fi + , with_mktextfm_default=yes) AC_ARG_WITH(mkocp-default, [ --without-mkocp-default do not run mkocp if OCP file missing], - , withval=yes) -if test "x$withval" = xyes; then - AC_DEFINE(MAKE_OMEGA_OCP_BY_DEFAULT) -fi + , with_mkocp_default=yes) AC_ARG_WITH(mkofm-default, [ --without-mkofm-default do not run mkofm if OFM file missing], - , withval=yes) -if test "x$withval" = xyes; then - AC_DEFINE(MAKE_OMEGA_OFM_BY_DEFAULT) -fi + , with_mkofm_default=yes) +AC_ARG_WITH(mktexfmt-default, +[ --with-mktexfmt-default run mktexfmt if format file missing]) +AC_ARG_WITH(mktextex-default, +[ --with-mktextex-default run mktextex if TeX source missing], + with_mktextex_default=yes, with_mktextex_default=no) dnl The --enable-multiplatform option. AC_CANONICAL_HOST @@ -95,6 +85,13 @@ if test -n "$texmfmain"; then AC_MSG_RESULT("$texmfmain") else + ### SU: added using `kpsewhich' as last fallback before giving up; since + ### xdvik is most likely to be installed with an *existing* kpathsearch + ### system, this seemed reasonable to me. + texmfmain=`kpsewhich --expand-path='$TEXMFMAIN' 2>/dev/null | sed 's,//*,/,g'` + if test -d "$texmfmain"; then + AC_MSG_RESULT("$texmfmain") + else eval texmfmain="$datadir/texmf" AC_MSG_RESULT([not found]) AC_MSG_WARN([The main texmf tree was not found. @@ -104,5 +101,6 @@ in systems/web2c. Winging it by using the default location $texmfmain.]) fi + fi fi AC_SUBST(texmfmain) diff -Naur xdvik-22.40n/texk/kpathsea/xbasename.c xdvik-22.40o/texk/kpathsea/xbasename.c --- xdvik-22.40n/texk/kpathsea/xbasename.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xbasename.c Wed Oct 16 22:26:22 2002 @@ -17,9 +17,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Have to include this first to get c-auto.h. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/c-pathch.h" +#include /* Return NAME with any leading path stripped off. This returns a pointer into NAME. For example, `basename ("/foo/bar.baz")' diff -Naur xdvik-22.40n/texk/kpathsea/xcalloc.c xdvik-22.40o/texk/kpathsea/xcalloc.c --- xdvik-22.40n/texk/kpathsea/xcalloc.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xcalloc.c Wed Oct 16 22:26:22 2002 @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include address diff -Naur xdvik-22.40n/texk/kpathsea/xdirname.c xdvik-22.40o/texk/kpathsea/xdirname.c --- xdvik-22.40n/texk/kpathsea/xdirname.c Thu Jan 1 00:00:00 1970 +++ xdvik-22.40o/texk/kpathsea/xdirname.c Wed Oct 16 22:29:09 2002 @@ -0,0 +1,119 @@ +/* xdirname.c: return the directory part of a path. + +Copyright (C) 1999 Free Software Foundation, Inc. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Return directory for NAME. This is "." if NAME contains no directory + separators (should never happen for selfdir), else whatever precedes + the final directory separator, but with multiple separators stripped. + For example, `xdirname ("/foo//bar.baz")' returns "/foo". Always + return a new string. */ + +#include +#include + +string +xdirname P1C(const_string, name) +{ + string ret; + unsigned limit = 0, loc; + + /* Ignore a NULL name. */ + if (!name) + return NULL; + + if (NAME_BEGINS_WITH_DEVICE(name)) { + limit = 2; +#ifdef WIN32 + } else if (IS_UNC_NAME(name)) { + for (limit = 2; name[limit] && !IS_DIR_SEP(name[limit]); limit++) + ; + if (name[limit]) { + for (limit++ ; name[limit] && !IS_DIR_SEP(name[limit]); limit++) + ; + limit--; + } else { + /* malformed UNC name, backup */ + limit = 2; + } +#endif + } + + for (loc = strlen (name); loc > limit && !IS_DIR_SEP (name[loc-1]); loc--) + ; + + if (loc == limit && limit > 0) { + if (limit == 2) { + ret = (string)xmalloc(limit + 2); + ret[0] = name[0]; + ret[1] = name[1]; + ret[2] = '.'; + ret[3] = '\0'; + } else { + ret = (string)xmalloc(limit + 2); + strcpy(ret, name); + } + } else { + /* If have ///a, must return /, so don't strip off everything. */ + while (loc > limit+1 && IS_DIR_SEP (name[loc-1])) { + loc--; + } + ret = (string)xmalloc(loc+1); + strncpy(ret, name, loc); + ret[loc] = '\0'; + } + + return ret; +} + +#ifdef TEST + +char *tab[] = { + "\\\\neuromancer\\fptex\\bin\\win32\\kpsewhich.exe", + "\\\\neuromancer\\fptex\\win32\\kpsewhich.exe", + "\\\\neuromancer\\fptex\\kpsewhich.exe", + "\\\\neuromancer\\kpsewhich.exe", + "p:\\bin\\win32\\kpsewhich.exe", + "p:\\win32\\kpsewhich.exe", + "p:\\kpsewhich.exe", + "p:bin\\win32\\kpsewhich.exe", + "p:win32\\kpsewhich.exe", + "p:kpsewhich.exe", + "p:///kpsewhich.exe", + "/usr/bin/win32/kpsewhich.exe", + "/usr/bin/kpsewhich.exe", + "/usr/kpsewhich.exe", + "///usr/kpsewhich.exe", + "///kpsewhich.exe", + NULL +}; + +int main() +{ + char **p; + for (p = tab; *p; p++) + printf("name %s, dirname %s\n", *p, xdirname(*p)); + return 0; +} +#endif /* TEST */ + + +/* +Local variables: +standalone-compile-command: "gcc -g -I. -I.. -DTEST variable.c kpathsea.a" +End: +*/ + diff -Naur xdvik-22.40n/texk/kpathsea/xfopen.c xdvik-22.40o/texk/kpathsea/xfopen.c --- xdvik-22.40n/texk/kpathsea/xfopen.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xfopen.c Wed Oct 16 22:26:22 2002 @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include /* These routines just check the return status from standard library diff -Naur xdvik-22.40n/texk/kpathsea/xfseek.c xdvik-22.40o/texk/kpathsea/xfseek.c --- xdvik-22.40n/texk/kpathsea/xfseek.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xfseek.c Wed Oct 16 22:26:22 2002 @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include void diff -Naur xdvik-22.40n/texk/kpathsea/xftell.c xdvik-22.40o/texk/kpathsea/xftell.c --- xdvik-22.40n/texk/kpathsea/xftell.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xftell.c Wed Oct 16 22:26:22 2002 @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include unsigned long diff -Naur xdvik-22.40n/texk/kpathsea/xgetcwd.c xdvik-22.40o/texk/kpathsea/xgetcwd.c --- xdvik-22.40n/texk/kpathsea/xgetcwd.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xgetcwd.c Wed Oct 16 22:26:22 2002 @@ -17,14 +17,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include #if defined (HAVE_GETCWD) || defined (HAVE_GETWD) -#include "kpathsea/c-pathmx.h" +#include #else /* not HAVE_GETCWD && not HAVE_GETWD*/ -#include "kpathsea/c-dir.h" -#include "kpathsea/xopendir.h" -#include "kpathsea/xstat.h" +#include +#include +#include static void @@ -49,7 +49,7 @@ is not detected by configure, let me know. -- Olaf Weber -#include "kpathsea/config.h" +#include void * xmalloc P1C(unsigned, size) { - void *new_mem = (void *) malloc (size); + void *new_mem = (void *) malloc (size ? size : 1); if (new_mem == NULL) { diff -Naur xdvik-22.40n/texk/kpathsea/xopendir.c xdvik-22.40o/texk/kpathsea/xopendir.c --- xdvik-22.40n/texk/kpathsea/xopendir.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xopendir.c Wed Oct 16 22:26:22 2002 @@ -16,9 +16,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/xopendir.h" +#include #ifndef WIN32 @@ -46,3 +46,4 @@ FATAL ("closedir failed"); #endif } + diff -Naur xdvik-22.40n/texk/kpathsea/xopendir.h xdvik-22.40o/texk/kpathsea/xopendir.h --- xdvik-22.40n/texk/kpathsea/xopendir.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xopendir.h Wed Oct 16 22:26:22 2002 @@ -19,9 +19,9 @@ #if !defined (KPATHSEA_XOPENDIR_H) && !defined (WIN32) #define KPATHSEA_XOPENDIR_H -#include "kpathsea/c-dir.h" -#include "kpathsea/c-proto.h" -#include "kpathsea/types.h" +#include +#include +#include /* Like opendir and closedir, but abort on error. */ extern DIR *xopendir P1H(string dirname); diff -Naur xdvik-22.40n/texk/kpathsea/xputenv.c xdvik-22.40o/texk/kpathsea/xputenv.c --- xdvik-22.40n/texk/kpathsea/xputenv.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xputenv.c Wed Oct 16 22:26:22 2002 @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include #ifdef WIN32 #include @@ -68,7 +68,7 @@ { found = true; old_item = getenv (var_name); -#ifdef WIN32 +#if defined (WIN32) || defined (DJGPP) /* win32 putenv() removes the variable if called with "VAR=". So we have to cope with this case. Distinction is not made between the value being "" or the variable @@ -114,14 +114,13 @@ #ifndef SMART_PUTENV /* Can't free `new_item' because its contained value is now in `environ', but we can free `old_item', since it's been replaced. */ -#ifdef WIN32 - /* ... except on Win32, where old_item points to garbage if we set the - variable to "". So we recognize this special case. */ - if (old_item && value && *value) -#else +#ifndef WIN32 + /* ... except on Win32, where old_item points to garbage. + Or at least non free-able memory. Or at least, that's what + BoundsChecker says... FP, 06/10/98) */ if (old_item) -#endif free (old_item); +#endif #endif /* not SMART_PUTENV */ } } diff -Naur xdvik-22.40n/texk/kpathsea/xrealloc.c xdvik-22.40o/texk/kpathsea/xrealloc.c --- xdvik-22.40n/texk/kpathsea/xrealloc.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xrealloc.c Wed Oct 16 22:26:22 2002 @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include -#include "kpathsea/config.h" +#include extern void *xmalloc P1H(unsigned); diff -Naur xdvik-22.40n/texk/kpathsea/xstat.c xdvik-22.40o/texk/kpathsea/xstat.c --- xdvik-22.40n/texk/kpathsea/xstat.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xstat.c Wed Oct 16 22:26:22 2002 @@ -16,9 +16,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include -#include "kpathsea/xstat.h" +#include struct stat @@ -34,11 +34,14 @@ /* If we don't have symbolic links, lstat is the same as stat, and - a #define is made in the include file. We declare lstat to avoid an - implicit declaration warning for development; sigh. */ + a #define is made in the include file. */ #ifdef S_ISLNK -extern int lstat (); +/* +// We declared lstat to prevent a warning during development. This +// turns out to be more trouble than it is worth. +// extern int lstat (); +*/ struct stat xlstat P1C(const_string, path) { diff -Naur xdvik-22.40n/texk/kpathsea/xstat.h xdvik-22.40o/texk/kpathsea/xstat.h --- xdvik-22.40n/texk/kpathsea/xstat.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xstat.h Wed Oct 16 22:26:22 2002 @@ -19,9 +19,9 @@ #ifndef KPATHSEA_XSTAT_H #define KPATHSEA_XSTAT_H -#include "kpathsea/c-proto.h" -#include "kpathsea/c-stat.h" -#include "kpathsea/types.h" +#include +#include +#include /* Two files are indistinguishable if they are on the same device and have the same inode. This checks two stat buffers for that. Cf. diff -Naur xdvik-22.40n/texk/kpathsea/xstrdup.c xdvik-22.40o/texk/kpathsea/xstrdup.c --- xdvik-22.40n/texk/kpathsea/xstrdup.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/kpathsea/xstrdup.c Wed Oct 16 22:26:22 2002 @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "kpathsea/config.h" +#include /* Return a copy of S in new storage. */ diff -Naur xdvik-22.40n/texk/make/CVS/Entries xdvik-22.40o/texk/make/CVS/Entries --- xdvik-22.40n/texk/make/CVS/Entries Mon Sep 16 17:45:03 2002 +++ xdvik-22.40o/texk/make/CVS/Entries Wed Oct 16 23:44:49 2002 @@ -4,7 +4,7 @@ /common.mk/1.1.1.1.8.1/Mon Sep 16 10:10:50 2002//Txdvik_22_40_STABLE /config.mk/1.2.8.1/Mon Sep 16 10:10:50 2002//Txdvik_22_40_STABLE /dist.mk/1.1.1.1.8.1/Mon Sep 16 10:10:50 2002//Txdvik_22_40_STABLE -/library.mk/1.2.6.2/Mon Sep 16 17:45:29 2002//Txdvik_22_40_STABLE +/library.mk/1.2.6.3/Wed Oct 16 22:26:22 2002//Txdvik_22_40_STABLE /makevars.mk/1.1.1.1/Wed Apr 18 14:24:38 2001//Txdvik_22_40_STABLE /man.mk/1.1.1.1/Wed Apr 18 14:24:38 2001//Txdvik_22_40_STABLE /paths.mk/1.1.1.1/Wed Apr 18 14:24:38 2001//Txdvik_22_40_STABLE diff -Naur xdvik-22.40n/texk/make/library.mk xdvik-22.40o/texk/make/library.mk --- xdvik-22.40n/texk/make/library.mk Mon Sep 16 17:45:29 2002 +++ xdvik-22.40o/texk/make/library.mk Wed Oct 16 22:26:22 2002 @@ -1,5 +1,5 @@ # library.mk -- stuff only useful for libraries. AR = @AR@ -ARFLAGS = @AR_OPTS@ +ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ # End of library.mk. diff -Naur xdvik-22.40n/texk/testfont.log xdvik-22.40o/texk/testfont.log --- xdvik-22.40n/texk/testfont.log Wed Apr 18 14:24:17 2001 +++ xdvik-22.40o/texk/testfont.log Thu Jan 1 00:00:00 1970 @@ -1,17 +0,0 @@ -This is TeX, Version 3.14159 (Web2C 7.2) (format=plain 1998.4.19) 23 FEB 1999 12:57 -**testfont -(/local/TEX/lib/inputs/plain/base/testfont.tex -Hyphenation patterns for english, ukenglish, norsk, german, loaded. -\m=\count26 -\n=\count27 -\p=\count28 -\dim=\dimen16 -\skewtrial=\count29 - -Name of the font to test = ptmr8r -Now type a test command (\help for help):) -*\table - -*\bye -[1] -Output written on testfont.dvi (1 page, 10636 bytes). diff -Naur xdvik-22.40n/texk/testfont.ps xdvik-22.40o/texk/testfont.ps --- xdvik-22.40n/texk/testfont.ps Wed Apr 18 14:24:18 2001 +++ xdvik-22.40o/texk/testfont.ps Thu Jan 1 00:00:00 1970 @@ -1,1164 +0,0 @@ -%!PS-Adobe-2.0 -%%Creator: dvips(k) 5.78 Copyright 1998 Radical Eye Software (www.radicaleye.com) -%%Title: xdvik/testfont.dvi -%%Pages: 1 -%%PageOrder: Ascend -%%BoundingBox: 0 0 596 842 -%%DocumentFonts: CMR7 CMR10 CMTI10 Times-Roman CMTT10 -%%EndComments -%DVIPSCommandLine: /local/TEX/bin.linux/dvips -Pbsr xdvik/testfont.dvi -%+ -o -%DVIPSParameters: dpi=300 -%DVIPSSource: TeX output 1999.02.23:1254 -%%BeginProcSet: tex.pro -%! -/TeXDict 300 dict def TeXDict begin /N{def}def /B{bind def}N /S{exch}N -/X{S N}B /TR{translate}N /isls false N /vsize 11 72 mul N /hsize 8.5 72 -mul N /landplus90{false}def /@rigin{isls{[0 landplus90{1 -1}{-1 1} -ifelse 0 0 0]concat}if 72 Resolution div 72 VResolution div neg scale -isls{landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div -hsize mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul -TR[matrix currentmatrix{dup dup round sub abs 0.00001 lt{round}if} -forall round exch round exch]setmatrix}N /@landscape{/isls true N}B -/@manualfeed{statusdict /manualfeed true put}B /@copies{/#copies X}B -/FMat[1 0 0 -1 0 0]N /FBB[0 0 0 0]N /nn 0 N /IE 0 N /ctr 0 N /df-tail{ -/nn 8 dict N nn begin /FontType 3 N /FontMatrix fntrx N /FontBBox FBB N -string /base X array /BitMaps X /BuildChar{CharBuilder}N /Encoding IE N -end dup{/foo setfont}2 array copy cvx N load 0 nn put /ctr 0 N[}B /df{ -/sf 1 N /fntrx FMat N df-tail}B /dfs{div /sf X /fntrx[sf 0 0 sf neg 0 0] -N df-tail}B /E{pop nn dup definefont setfont}B /ch-width{ch-data dup -length 5 sub get}B /ch-height{ch-data dup length 4 sub get}B /ch-xoff{ -128 ch-data dup length 3 sub get sub}B /ch-yoff{ch-data dup length 2 sub -get 127 sub}B /ch-dx{ch-data dup length 1 sub get}B /ch-image{ch-data -dup type /stringtype ne{ctr get /ctr ctr 1 add N}if}B /id 0 N /rw 0 N -/rc 0 N /gp 0 N /cp 0 N /G 0 N /sf 0 N /CharBuilder{save 3 1 roll S dup -/base get 2 index get S /BitMaps get S get /ch-data X pop /ctr 0 N ch-dx -0 ch-xoff ch-yoff ch-height sub ch-xoff ch-width add ch-yoff -setcachedevice ch-width ch-height true[1 0 0 -1 -.1 ch-xoff sub ch-yoff -.1 sub]{ch-image}imagemask restore}B /D{/cc X dup type /stringtype ne{]} -if nn /base get cc ctr put nn /BitMaps get S ctr S sf 1 ne{dup dup -length 1 sub dup 2 index S get sf div put}if put /ctr ctr 1 add N}B /I{ -cc 1 add D}B /bop{userdict /bop-hook known{bop-hook}if /SI save N @rigin -0 0 moveto /V matrix currentmatrix dup 1 get dup mul exch 0 get dup mul -add .99 lt{/QV}{/RV}ifelse load def pop pop}N /eop{SI restore userdict -/eop-hook known{eop-hook}if showpage}N /@start{userdict /start-hook -known{start-hook}if pop /VResolution X /Resolution X 1000 div /DVImag X -/IE 256 array N 2 string 0 1 255{IE S dup 360 add 36 4 index cvrs cvn -put}for pop 65781.76 div /vsize X 65781.76 div /hsize X}N /p{show}N -/RMat[1 0 0 -1 0 0]N /BDot 260 string N /rulex 0 N /ruley 0 N /v{/ruley -X /rulex X V}B /V{}B /RV statusdict begin /product where{pop false[ -(Display)(NeXT)(LaserWriter 16/600)]{dup length product length le{dup -length product exch 0 exch getinterval eq{pop true exit}if}{pop}ifelse} -forall}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale rulex ruley false -RMat{BDot}imagemask grestore}}{{gsave TR -.1 .1 TR rulex ruley scale 1 1 -false RMat{BDot}imagemask grestore}}ifelse B /QV{gsave newpath transform -round exch round exch itransform moveto rulex 0 rlineto 0 ruley neg -rlineto rulex neg 0 rlineto fill grestore}B /a{moveto}B /delta 0 N /tail -{dup /delta X 0 rmoveto}B /M{S p delta add tail}B /b{S p tail}B /c{-4 M} -B /d{-3 M}B /e{-2 M}B /f{-1 M}B /g{0 M}B /h{1 M}B /i{2 M}B /j{3 M}B /k{ -4 M}B /w{0 rmoveto}B /l{p -4 w}B /m{p -3 w}B /n{p -2 w}B /o{p -1 w}B /q{ -p 1 w}B /r{p 2 w}B /s{p 3 w}B /t{p 4 w}B /x{0 S rmoveto}B /y{3 2 roll p -a}B /bos{/SS save N}B /eos{SS restore}B end - -%%EndProcSet -%%BeginProcSet: 8r.enc -% @@psencodingfile@{ -% author = "S. Rahtz, P. MacKay, Alan Jeffrey, B. Horn, K. Berry", -% version = "0.6", -% date = "22 June 1996", -% filename = "8r.enc", -% email = "kb@@mail.tug.org", -% address = "135 Center Hill Rd. // Plymouth, MA 02360", -% codetable = "ISO/ASCII", -% checksum = "119 662 4424", -% docstring = "Encoding for TrueType or Type 1 fonts to be used with TeX." -% @} -% -% Idea is to have all the characters normally included in Type 1 fonts -% available for typesetting. This is effectively the characters in Adobe -% Standard Encoding + ISO Latin 1 + extra characters from Lucida. -% -% Character code assignments were made as follows: -% -% (1) the Windows ANSI characters are almost all in their Windows ANSI -% positions, because some Windows users cannot easily reencode the -% fonts, and it makes no difference on other systems. The only Windows -% ANSI characters not available are those that make no sense for -% typesetting -- rubout (127 decimal), nobreakspace (160), softhyphen -% (173). quotesingle and grave are moved just because it's such an -% irritation not having them in TeX positions. -% -% (2) Remaining characters are assigned arbitrarily to the lower part -% of the range, avoiding 0, 10 and 13 in case we meet dumb software. -% -% (3) Y&Y Lucida Bright includes some extra text characters; in the -% hopes that other PostScript fonts, perhaps created for public -% consumption, will include them, they are included starting at 0x12. -% -% (4) Remaining positions left undefined are for use in (hopefully) -% upward-compatible revisions, if someday more characters are generally -% available. -% -% (5) hyphen appears twice for compatibility with both ASCII and Windows. -% -Encoding=TeXBase1Encoding -.notdef % 0x00 -dotaccent -fi -fl -fraction -hungarumlaut -Lslash -lslash -ogonek -ring -.notdef -breve -minus -.notdef -Zcaron % These are the only two remaining unencoded characters, so -zcaron % may as well include them. -/caron % 0x10 -/dotlessi -dotlessj % (unusual TeX characters available in, e.g., Lucida Bright) -ff -ffi -ffl -.notdef -.notdef -.notdef -.notdef -.notdef -.notdef -.notdef -.notdef -grave % very contentious; it's painful not having quoteleft and quoteright -quotesingle % at 96 and 145 that we move the things normally found there down to here. -space % 0x20 (ASCII begins) -exclam -quotedbl -numbersign -dollar -percent -ampersand -quoteright -parenleft -parenright -asterisk -plus -comma -hyphen -period -slash -zero % 0x30 = 0 -one -two -three -four -five -six -seven -eight -nine -colon -semicolon -less -equal -greater -question -at % 0x40 -A -B -C -D -E -F -G -H -I -J -K -L -M -N -O -P % 0x50 -Q -R -S -T -U -V -W -X -Y -Z -bracketleft -backslash -bracketright -asciicircum -underscore -quoteleft % 0x60 -a -b -c -d -e -f -g -h -i -j -k -l -m -n -o -p % 0x70 -q -r -s -t -u -v -w -x -y -z -braceleft -bar -braceright -asciitilde -.notdef % rubout; ASCII ends -.notdef % 0x80 -.notdef -quotesinglbase -florin -quotedblbase -ellipsis -dagger -daggerdbl -circumflex -perthousand -Scaron -guilsinglleft -OE -.notdef -.notdef -.notdef -.notdef % 0x90 -.notdef -.notdef -quotedblleft -quotedblright -bullet -endash -emdash -tilde -trademark -scaron -guilsinglright -oe -.notdef -.notdef -Ydieresis -.notdef % 0xA0 - nobreakspace -exclamdown -cent -sterling -currency -yen -brokenbar -section -dieresis -copyright -ordfeminine -guillemotleft -logicalnot -hyphen % Y&Y (also at 45); Windows' softhyphen -registered -macron -degree % 0xD0 -plusminus -twosuperior -threesuperior -acute -mu -paragraph -periodcentered -cedilla -onesuperior -ordmasculine -guillemotright -onequarter -onehalf -threequarters -questiondown -Agrave % 0xC0 -Aacute -Acircumflex -Atilde -Adieresis -Aring -AE -Ccedilla -Egrave -Eacute -Ecircumflex -Edieresis -Igrave -Iacute -Icircumflex -Idieresis -Eth % 0xD0 -Ntilde -Ograve -Oacute -Ocircumflex -Otilde -Odieresis -multiply -Oslash -Ugrave -Uacute -Ucircumflex -Udieresis -Yacute -Thorn -germandbls -agrave % 0xE0 -aacute -acircumflex -atilde -adieresis -aring -ae -ccedilla -egrave -eacute -ecircumflex -edieresis -igrave -iacute -icircumflex -idieresis -eth % 0xF0 -ntilde -ograve -oacute -ocircumflex -otilde -odieresis -divide -oslash -ugrave -uacute -ucircumflex -udieresis -yacute -thorn -ydieresis - - -%%EndProcSet -%%BeginProcSet: texps.pro -%! -TeXDict begin /rf{findfont dup length 1 add dict begin{1 index /FID ne 2 -index /UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll -exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]/Metrics -exch def dict begin Encoding{exch dup type /integertype ne{pop pop 1 sub -dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get div def} -ifelse}forall Metrics /Metrics currentdict end def[2 index currentdict -end definefont 3 -1 roll makefont /setfont cvx]cvx def}def /ObliqueSlant -{dup sin S cos div neg}B /SlantFont{4 index mul add}def /ExtendFont{3 -1 -roll mul exch}def /ReEncodeFont{/Encoding exch def}def end - -%%EndProcSet -%%BeginFont: CMTT10 -%!PS-AdobeFont-1.1: CMTT10 1.00B -%%CreationDate: 1992 Apr 26 10:42:42 - -% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. - -11 dict begin -/FontInfo 7 dict dup begin -/version (1.00B) readonly def -/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def -/FullName (CMTT10) readonly def -/FamilyName (Computer Modern) readonly def -/Weight (Medium) readonly def -/ItalicAngle 0 def -/isFixedPitch true def -end readonly def -/FontName /CMTT10 def -/PaintType 0 def -/FontType 1 def -/FontMatrix [0.001 0 0 0.001 0 0] readonly def -/Encoding 256 array -0 1 255 {1 index exch /.notdef put} for -dup 48 /zero put -dup 49 /one put -dup 50 /two put -dup 51 /three put -dup 52 /four put -dup 53 /five put -dup 54 /six put -dup 55 /seven put -dup 56 /eight put -dup 57 /nine put -dup 65 /A put -dup 66 /B put -dup 67 /C put -dup 68 /D put -dup 69 /E put -dup 70 /F put -dup 120 /x put -readonly def -/FontBBox{-4 -235 731 800}readonly def -/UniqueID 5000832 def -currentdict end -currentfile eexec -8053514d28ec28da1630165fab262882d3fca78881823c5537fe6c3dda8ee5b8 -97e17cb027f5c73fdbb56b0a7c25fc3512b55fe8f3acfbffcc7f4a382d8299cc -8fd37d3cea49dabdca92847af0560b404ef71134b0f3d99934fc9d0b4e602011 -b9cfb856c23f958f3c5a2fbe0ef8587d1f5774879c324e51fcb22888b74f2415 -50d7401eb990d4f3a7af635198422283cac1b6cd446ddbcbd915db9bff88844e -784c6bf7389803d9450b0c21756a017306462c563d51ecefaacd079732f12c29 -315e4b9623a5752c6f1d8145869e120d910b2644887cea7e30b15676a92537c2 -9d3aa80dc30082aba94b40990b82fb1a877e805e0c8c48f61e9f2edac05b944e -e4d8084ec1d5cc517aaeec5b3ea379dd011eeb454cecab3ad2443c887c582789 -72355673e503affe0394fc7db31de364e4f56c24033c7df2265c56445ec63a1d -5695a6041ea1b94407e1cdb7c5635603a4fd047e6edcaeb2d0da6c9e0e9396d5 -1a4a58e8fdc1578730f992435560a6e2d3e3687703ee2f78f5896389ac8470bc -806169eb01762e89b6dc9adf857ead656620e2589aae722c37a2ed7a2941c360 -b067ee34d8d5ca3bf68db725614d936bcb207781f4d4ec2ac67b13a5ad161f3f -059add7b5e3d904831e31c20c04546fae83ca93a35989e65c201756888f727b9 -7e5313c9870ec96e4cec3901ea03a5c744754485e7d169bbc98bf872d0796e18 -9d43b712950c3786257d8be06ab6080b9d9392313298327549a8a41c00a2cea3 -690b4a333e45aa815a64facae1c2b44640860b8b8687afbefdbd5b4a541a7251 -4ee7d3e0752af3e96a88c95d31fa16d34ba2f02fdb0088b165844f02611c734a -dbcc2037bf741fdea7e8bcdc130c70c33772f777d8bcddf4611db99001ccff14 -d7af2bb05defc3480bdab312a0eff2f375afb4e0df2f803c594b7c93f71ca4af -861ae1711932fef19bfe2f9b7adb69d68e5a70ea4d1a3d5bd85231b16993f65e -fb37a2027d1d9e35806536824b07416071bfb1d133185d44bbd07ad73f224355 -a9dbde77c4448edad90700807ecc4dad98e2f7dd7dcfef27ccc42a9e61d29bcd -629c16837262fa3d6c487761a17d2763c15e3abdfeb85e7ac9a5a1169e5046f1 -566f5b24aeace067107be342341d1306e185ccb91fb008f58d444265813a4439 -9ab2722696525c2c0a7540e1e39d1e5bb29402328a80f8d1b1f6342dc65b5ae4 -479c5dd90b38f563290ccbbdb69e6a52321f7c9813dcf5454e2578a3a6e210fa -2b992038527fd6fbd20b09a19c182b999ea5f299fac11b94455dd7bdfd7d86f9 -dedd098fa3d5d3b80ad3518af35ea31f2cfc8c2fd50245aa9b3f56e9d72c9a2a -ce2559bae76aa3497137f29d0457ff6b04493ba09a3ac8b7dd3aa0978f8b340f -86b3ebb0f26628203d256d9c07b624305689df8c7471db49707b3d8b5a81cf6c -bf96ca4b9d261b7f18efc00d01c68fe85e60d094223acfb2bc5cf9d4d8e41702 -64a2af5938a5f341439ee2388d305db72dc335c8ea3670bbe18a059d924d7b35 -54fe58c74ba977cbf9d490f96ee46fe7b2274dbbb37bf83e2ba3763646f62861 -1007b650087366959d673f4734bc94915d6eed6aed703471a85a340f2a57418f -5fc4c9c242cd2c2624e407b038d6adb30057172f3c332b2fb40fc237da457659 -de341cfc76d6d5f8dac339fc7fd5195ff4b545b1c8df0bce4cf36b353c52d91c -c68cd64f5a2775395a2f8bb24fa36ff29d8b95b2021e87f5b03d3780abde0517 -916aadf3273a34fbd9748a5f6a16c5a47819ea9d010382a1fc1f7d64a594d5f9 -2cdcf562d1091719b626846fbd24390021f818c2a729639eac2f302bdabe4525 -814d9899364a35a77ba30be1fbf1080b083c17ddfdeb57f392cff9c29d344fbb -2ca80f883d7a7ebe2670483d228560474c0963cb0e70d90b1a870609edd34f8e -ff765019b6296cc51627973867562e50ad3228838f5211a08b9fd937c728da7c -baed376e8eccf67b79290baa07fa7f6148bcf775aa2e8cbff6cee55c7eb5887c -00a8cd1d6ec51d8ac8464b80d41517c23dfc9f44a368537086d24340c3d2ede3 -f6ec6bb1c3a8cf6b30583b772de2c7c77c7249178caadbbbb90b491dd8a13be2 -437253d218284d95869ed6c10bdd82512ef87fa8fc4f7fb5a3c17132a65e7144 -dc850d519c30d6caaa47712dd203d531025d5a7b25ace0254e6a4d3b18f2156b -b57259e317e2242daa5c3ad8efb52018f188333733caa7afda212a6d2ea0eb58 -ec0456f52bd57c2eea3b46747d715ee8f5cf4f6468264565cde2ca4145ba3ced -6023823674b0760d6fa13f0b015a313d2c9fffe2ffb131725f980c8a498e5577 -4bf55ac1d6bfb064916b0a612bfb67de21f87ba27f32c4885ff3073d31535c8f -ba0a7b97e14755e05b6fd988e0a0711a41b5508e0b3e39581f7ae74f09eea25c -135726e8cafe5042f74d7b12e657581d434f1b495401fab844b2ef53503577a9 -10ae5626cbf09e873c94055425d1fdd897ba724851e073cdfc47b268111ba884 -93bc13ff3ff9b6dbf51821d603928e61667cbc2dff21fe3d6f0c993b6d024367 -c45e24f9c8067312c442a04c6a0fcc8a3951f169d4f1a470ec2cdf4938871962 -3fe6a5171b89910fb4c55bd80e91993291486030dc287dcfefc7d36466ae0cab -281a7d2f97d462447342ae7c58707d816b36c28b168b282270ca2e5ec8462181 -afafa1795c63f1d94a3dc19d8fc77a1224bf9f1b17f540975043f4fb4ea53c70 -fd6a06d22e1f897b6874e789b36637f29e17be66786607554082833e0ddfd9ef -b81666ba274c1bb48e6d8cbbb14d7d470bd0678da2cec23c0aae40de2df12864 -532e28fa20a9fb9b9617be7112104ac45b2f52441a0626ecc29dc7c839a925fb -85617b499893da7fef0436c62f013740805e163a417a29f2f0f6fd6ba54b0b74 -9fb8cb1d4cf154f46a82bf8a0629ef54ce71e87d7bda6a3a5b5494bada9f64e2 -fb1a9ee15c88566a324b314cde22e7aeb5ef8790c35bcd9b965656a9dc9a0f85 -fda19bba57a1f3274ed0bd186d39123096dca81b62253fcbf623cf5b64e12c63 -7bac7b37e6ba58f7a29badd3b12ac3318a7120850d87b32c7531956d9673c159 -97825a157e9e796e59316e16c316c64f988bfba8248270816314cb038f2aca6a -74918e23d7fb45c20333e83dbed2859e25dce40e32c3d25b9b6e1fdfc4ec5f76 -cb196344ed1087eabe54ae390f7638cc9ed60684b0ffa0a0c85220016b5164cf -5552a3df239624aeb319ad9df91010c4e7993b7157dd1c73a9e654625b722a39 -ae8c78bc7c4388d16fc12cbfdf98e686b6c0909ee912f69f260e1ab017140817 -d7acc0aead359b8cee0bafc979bbedfbada7f74d7199d82f6dd8d7c023c0369e -4826f4ce3b1f1d31ea6e633df086fe4e69d9e6f0ac0dd70fa55b0a3b12cba571 -d0400cfcd448dd4656e785f0dfc0f3bf8240b1ac81b8651542a11e3fca8aa457 -51c8321f12a4d7f0006f44b02278ae27006d9c603ff35791f7296f0dc437b462 -e7f7ad957022f83364d4db38b359c261027ddb65a605536d17feda34f103abf7 -8c8caba79a5a0b59440d54188a5672e221a3e81712c95dc3c36e8c1150dc4613 -50a22af4df24ce4c6663aead8199aa72711226fc35779f6db844476096ae5e9e -99db9d1757c255b1de109fb973aa02d587ce9a1edee4ea198c333eb0b23fab38 -cc246b71143a1adbfab628de5856530074eccf9ad2a8cc0d90a0459a0382f0a3 -e683adc6f1aecdb78deb2ba9d8c6378235214f5712a38ef8bbba32c89ef4d118 -0c45c2cbbd7d761de2f7082e4d82855b35c62edb6c2d589ad7fe8ad1ef26db42 -7d04ad77ad0aa7b16424ac52ebd5d4443eb15668660767fec2f9e4c4076e4013 -48c2d0247c58124b60b08039637c2f455fae6c4acd5602d37cfa7b9ab053937e -924a71d4fbe628fe5690ca70e524b6ccf598aa1b4454ea535933153700329b22 -f2dd616150fe122b76e44eda7371cbb2566585ea4cdfae3b24b5eb838708020d -8a4986068c75bfe3f4f7d213349307021e93e88fad1999ed55b85c4c788681ce -ac4c2c5c0cc51d2d1d3871424168ebbd0c30d6a91a294cefa9bb6c1ef5d876a1 -feae93d9d64e0ca1e132be886fdce9184611e7ee2fbc1e3839f672cfe4e3c986 -e457ebd86c42c8d4474c04a9907d7e15fb5763ea4e736aaa59c5a3facc1e003d -ec5d7433bacece6f0bfa26766d9498ed7226aa5aea5c879795cc6681af310f81 -6c05d685030ddc0c42bb7c78e51e924c2531585f089e732e1ffbd02365d41282 -a49ff9424f810a52057ce22136e485de6c129056c3360dbb2e1f51c4b7d7628d -c158ca43a1295b991a876b72d1ef6d400ad91800ff24ab15956ce843fc102c9b -8ee8a581707f29380eec323ada86ffde49e4cdf322fa4a44fe893bb09b2f34b5 -d9f1fca9c4e3d56cd1727b0c6a2a9a2b896ad91ea382ef45a779c8169ec3e1f9 -a3f33fc26f699fd7717b9a78822bf4964be16711dc143985b43b6b8bcadf8c48 -7adc39d1f9b8b86ab9b9018161359fce988cffb82ecac9298c601a4a2d5ab81b -89c2daeb1050617748ce26da711083308a50b4b1eeac3926efedaaf46c08d2b4 -8816b40477fb16d329cfe3ee8d383e1749fb1570e71aac1eaa17767edaeb6f3b -3631e8486dc1eef011cc9ccf0029464c42bec801db0c78ec7bc5649950ec5e41 -b475fd9354114cc70bb7d253882d5693b94f6fb11ebb14bebe641d0a31c38d03 -7aa93414f991800c18149b282c37d3edba7019347be33aedb44daa6c1226a275 -259cdf5802a227ea17acce18365c449216b233aad1ca9c410659668d920a0b9d -9475f2498125be4fc088f41b416d590b5520a46277266b1eba405ac282247ee1 -5c70f65ef93be5cbfc6c8fb3749cb1966902289b1e4999a39e6c293736139c42 -542c83dbbeb104fed1c96777e0e950a812036292aeca82ffa6e7353c7844d7e2 -7c035017725ddffc7712f6fceb87134e507224389b09faa20666ffc3a7d76a3f -162015c45884a8d89d1ba620c36de7be6b4ebfae158e8f7500ce841ba3d1a2de -a8e879b41cf19cf5b95d22f51594306c6131b9f41aac7de121b1cb3bb22837cf -1a960b59152149aec11dbc6afaf02c7e724fe3c167dd7894f8b848ef0822e430 -40fdd88dc24b1a030fa8ff3875a5d41fea50776901f12456204c720d2c5493bf -18e06fc17ba1935265c39642db527747ba1164c73340b126226bacbf6d7e0c8c -871f77912ea894ae4d40027e837599153065b7fcd246ab1819f52223738de627 -49bfe3755140a6e5ee52362fd9578aeaf79d6e08440f2c74e832f016a8dc14a2 -05681bc48161f552b31a869b3f745ee0862f912c1e0156e9856b9c235de0bc63 -aef40dd77c73bd829e5eafe9eadf27296e4a19fa99c2393e188b -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -cleartomark - -%%EndFont -%%BeginFont: CMTI10 -%!PS-AdobeFont-1.1: CMTI10 1.00B -%%CreationDate: 1992 Feb 19 19:56:16 - -% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. - -11 dict begin -/FontInfo 7 dict dup begin -/version (1.00B) readonly def -/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def -/FullName (CMTI10) readonly def -/FamilyName (Computer Modern) readonly def -/Weight (Medium) readonly def -/ItalicAngle -14.04 def -/isFixedPitch false def -end readonly def -/FontName /CMTI10 def -/PaintType 0 def -/FontType 1 def -/FontMatrix [0.001 0 0 0.001 0 0] readonly def -/Encoding 256 array -0 1 255 {1 index exch /.notdef put} for -dup 48 /zero put -dup 49 /one put -dup 50 /two put -dup 51 /three put -dup 52 /four put -dup 53 /five put -dup 54 /six put -dup 55 /seven put -dup 120 /x put -readonly def -/FontBBox{-163 -250 1146 969}readonly def -/UniqueID 5000828 def -currentdict end -currentfile eexec -8053514d28ec28da1630165fab262882d3ffd20326947b1065649b533eb5e9e3 -a88a87fe987918a687950b26f647d6e08bf14d983ed1d4a8ca1e2da8d985f944 -2eb916f5b6ed0697ac7c33e1e36a3bf460d34ce45f1631871097cb04f18e3889 -4cf4ac1538eb19481311d24fe3be7beaa4a3730e8b4831fe59d6d9ce2e46116b -629c7ba2f9ce3ecba2f43bc162a5a077ca1b2882a42afdcec3f4b75b5d63e0bc -8e5dc95257766d8ea467ad9cbaf47be60f797580cced6884b3a68f70c91f4fdf -80fd00ed9139e7f480dc3a76af72ad9b434187730bdfaefe4cbfe5c7edcaaf24 -9204fd703011932e5a3c27be468b7dab69daa18dbbb6335ab8ddfdc607961c7c -02582763fa069d43563ba17704029945cf42fcb19cf78c51df0ec4d851086d43 -c1ab38e865ef36865fff3a08b01cbcb070ba4893f7482dc7819ad03d337e520e -7d8cd83bb8ac7aff4df36751f4f12aaaea2b6d7260c09a26e987c904003e0723 -7dbcc4a8e4e85cd3259f40d3caf55c742cbb40ad0db1044c20a4f122a63f7b81 -1d945bfa69662189ce4d089464d2ead9f6ed60b581b04114d5d45e97be27a576 -35154e9b8464f2a0df18da855eb51b8f64d3054b0b2e84621f025a0776d16fed -b988a43d2d64c32768dd106b9f541ae8e68ac0bb7399e16f4d4ba074b2152d0a -4e9b5bfc21bfa0d531e28165e518ffc054dd4ed0d74eca079d20e79670419f92 -e03bcbfeecf3554d661596f6f29e12170804d15a250d917ffe7a8b6e8fa53047 -1ed97ba56481589a65ca13619129f1e26affe6c22f0c38540f8ce37efb6e9e9b -60b51a5a9cb4454fd7c7f92f2f9437159687ab590f35b946a54491a7739c9269 -e0f1fb48b129811c82edb3171cbd5105fe65906974db8a7da92f4f43dc7f6b36 -6981146d86d23613a0b38d9d6191db9fea0172e982cb1cc50e382f69da1b377c -1be9407f88a2a761b56f398467a057f35d18c01cc377e0061d3d42ce273b1118 -f0bf5d37b697e36eb768262623d6e413c1999cd2bcf7179ed3a8b2f1d9679ca6 -ddba2b6c5c5400f5aed8193f43df06064fb2bf5b366cdb4ddfdad7922e56cd84 -c6e56e61050bb8de08e5eadd8c384dd2856b3c21f9264921a825f30b42d24f08 -0a4d01d45d3f84eb63f8dbe04ef3a35e45719ecdc5b9579a9fa303bc1bf40678 -e646e4ba5dde02c1b75f0174cc51a689827fa3d56ae5215704e13b10a51aa593 -8a0220eb33f66616838830082ab372db64c6026c07503462f9507fcf5f75c905 -851c22064fc2da6b1c54a94c7795ea0bd88fdb5e91d176c416faefe36e1524b5 -9b8c99d8e3459884396f547fbef037f93ca8e6a9ab6d926bea8e1449fd54fa2c -547313b95a138be0da13770392af4f04135a0d64c8f5216b3e0087d84fb9cc8b -d6ffb895f90becb7863f025aefc8bba0e044064d77bf40a77f65d3749646d581 -75d54eb46d0ec455c7f5aec8e2cdcd5b643e09431ef1424f31aee7d082d3398c -1772c3ccde9221736b7d094abc032d520b71c4feaaa63dfa13c6599f2899acf8 -43c8670e5d9cae8933d3b9b713418646093d88cc5c090eacc26f6b9bb171129c -f1bce75206001dd677592b6d1dc5fd954ffa95904e1f6bfe565677eb4abad647 -ac7ea72109ec7bf632530795c3d642e73e9aaed4fece16a0d4b249ceb583e88e -6750b31516f6b0ec2e907059d836bbcba203f0b5725fab971296ec0a83526972 -657b1a3cf500a08f307a862cb6ede873f79f3f06abeabf40bdd8354a14eb6075 -f968620fd64aa5324e7ab40d53e29b87ae37387be52a64bdc69f56bcaebb7119 -cb87ce08d54aa98d7f65ed14a23e23939fdf3a7a31da836e7f751002ea4f29c7 -f7058c5690b996d2beb258248596abc823899f61cdfddb99be5c48363aa7b4f8 -31b18244d60003d74b9b45fa9e53bb5fb1a08674998aba119b4e6cc0384ddf49 -65eacdc651b76e18eccd02a4a8a8c1f5ad2be56c3d5d4f1a1999d3018d3f519d -545613272cd6d71b57fc77d4fdfa4c0d84634abe27f6f86d9e0329ac84b1b535 -c05807317cb0f1050cec239c00d62a53adc386783edcd0ea551d2837f8799c6b -0849c848ba15a9f6cd3e8853bfca64aa16ea45ac60be44ac27b6e3ba3fee2bd4 -55946203474e35d3fb86cf266d29b51f3453a32f302df06b416fe3fc3a6bd96e -b93e96d6bd57d822bfa34228d045318500a40eda4e18440d9a6a73dc7d59f353 -0d7795b60aadb22da15646e58c80da0831ec53c27926321e72662afbf7259200 -91c677dfb3e1967fe34ca55263586cbed46d1a5ccfac2f1be1e98f3c1a9eedc5 -d5e8ad62e3f5368ba809d9b6645ec86d1d903049634c9fb3164badb10dcbbe54 -efacb5661ff5ff175bcedb409b1a51496d95f3077e82c2fc572679a09779cae8 -8d0fb645e59c6d3e2086e6a43056d63151b0b9aae3d3b64b46a4cd9e39a82177 -d9beea14a58c4b65c3c660de33040f581a2da84be322607c87ae17195477e524 -65d27fee986a0786e9c67cf6cf3bee66da097a83bfc7de54bed019199aa2b27b -241cb8d2fd3cf03818d697278ee07eeb755b000fc3a7a8dadbcbd0db86c710a9 -f883775ca49994ce2a7e42706487d44f6d25620ba1a324f9b059b8f0449bd229 -ed98b9ad6fe67189919fa2abc4be46e47d90da1030830dfe9dadf18d1667ae06 -60043854f1e3053170d63886749142f94be451afee45b1f806f548951f006e13 -b3d81531474bb7a2e2f38f5dccc81914a89bbfb3ae7be07b10ae9f0dbdcc13ee -67af6b104ff71671069210477a9c6fa1d2dc28eb63f6fc0f6ad77f8191ecae58 -15dc15abca932a0b2dc119c80b2e2f8acfd2c12c45edf708df33bc0b947ebbf6 -2297e108d69abc8aecf5b518848f0197e6e638c9c31b17fca14160ab2a13709f -e92ac52ced277ed777f3fc95f6eefc6a833995f3aada8623b9e1113c1bc7915c -51033381e4f6ad8e3304b5ba8bad51be85380b2048779b27269633a8ca4f9822 -a7f5a654c141622dab04f7652819240918d9d977697c7f522ae63e4f673d5c9f -27ee1187b1ac2999f9b296a1733eb07bcffe59ef9ff83ca3e967b55f8baccf5b -fa09a6a05c1ac6fc0b0488cdaed8bf2ae72191ce8dda5442a7c9afe7f268b0fd -5056345729114940ab04be7b1832ac7cba56cd0fcef6fd0a51e565b407f939fd -e5df2ab90dbb401446ef0630ac7cf166c57bfff371366d1c2c2fdc528d90525c -ea87f126b58ba4272d440a6cd6f74961551a99a3f6ed74f045ba61c8bf940bd6 -6313cde736655ef44afb3b082008ff7fbfaa714f141960b46831527fd22e60dd -4f41036ec6eb7b89ea67a63aea0297bea19eea48ca6235cbf1cd9a592e40b072 -bfae1cc392ebbcab1fa09893092bd02e89f9f42edadac796a4ce1299795c6f5c -bd8923162f0493c417696ec4c6b0e48e6043ff242e9c101a851cdea3539c60c6 -677d62bcd1b7e96162a345b3f0b105e906fcf3d3836252a11f4574b262b155b3 -61a8e5157108196f99beaf31a765e4dec5b463d347bd2af1f156a3488024813b -dcf16db4a6e5eb801be3320d2605b38dfb447a1426b46480dbe634caf26a3550 -e9bacff68fb0e9373df558c94cf8879a45213648280c47ef2015b9480e477b71 -d7b302fab85edc169da1aa8fe2059085f51239dd249d3b172d18b48f7ecaa4aa -76268c5cc4a26614b6217a14c86899af03f57df68cceff2a6cdcf7ddb6eb8d6b -7fe41daaf18b5a0b11c2da4a09b571c0fcc6680f47a5aa6104d87c633ae5edf6 -3520a90059aa8d82b5d5e261adcfdc03cb9ed3465c4a1d0f8376a08978736b9b -c3d4bd28062170cb452d7b508e542fd453802c71f67661805351e3624e41c90e -51e9190e675a31ec3b96bf05d3e6c424da8a7f919b14dad89004516fa7adac81 -f9450216a6b665038da2fcc11f80fc9c8d9d70acd83fd581708d045b3106737a -1e6e6c740b341af31e0da4bfc57b3f40752f0776dea82f524526e6c2bd5e05cf -b04b8f13690b99aaf8fb4d8249b9e318b67af6d0c6a6de4717e9718cbeb3476d -301831e9798e7ca630477dfb970a5a59b24f80917bea0af5ebeaa5f35b1c54e4 -39d747154d59230507de938e167062379c4ae35f2741da10bca4a0fe6f8008a8 -1c7fa864355fb7 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -cleartomark - -%%EndFont -%%BeginFont: CMR10 -%!PS-AdobeFont-1.1: CMR10 1.00B -%%CreationDate: 1992 Feb 19 19:54:52 - -% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. - -11 dict begin -/FontInfo 7 dict dup begin -/version (1.00B) readonly def -/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def -/FullName (CMR10) readonly def -/FamilyName (Computer Modern) readonly def -/Weight (Medium) readonly def -/ItalicAngle 0 def -/isFixedPitch false def -end readonly def -/FontName /CMR10 def -/PaintType 0 def -/FontType 1 def -/FontMatrix [0.001 0 0 0.001 0 0] readonly def -/Encoding 256 array -0 1 255 {1 index exch /.notdef put} for -dup 19 /acute put -dup 125 /hungarumlaut put -readonly def -/FontBBox{-251 -250 1009 969}readonly def -/UniqueID 5000793 def -currentdict end -currentfile eexec -8053514d28ec28da1630165fab262882d3fca78881823c5537fe6c3dda8ee5b8 -97e17cb027f5c73fdbb56b0a7c25fc3512b55fe8f3acfbffcc7f4a382d8299cc -8fd37d3cea49dabdca92847af0560b404ef71134b0f3d99934fc9d0b4e602011 -b9cfb856c23f958f3c5a2fbe0ef8587d1f5774879c324e51fcb22888b74f2415 -50d7401eb990d4f3a7af635198422283cac1b6cd446ddbcbd915db9bff88844e -784c6bf7389803d9450b0c21756a017306457c7e62c1d269f306bd3402e266de -fc3b5e7d8a8d2f5bf0fe6ddd40d07391df4fad4a6018dce29a2b8f692b29f202 -3a7c0e66de8ed85c14f1f8492167357f51a7e84cc5d92e0fee4d81cf7fbc8de5 -2d2e7bb57142033993f9c08c315abade8dbc4a732e84e142d3bee51557910e12 -cd8aa37c459a5e6b7f5269f59078aba3be4641a11ac48d0b625c8325b38ec08e -4c9e5e7fed976a5650d99d82114f449b9ca14c4ec957702295a39a93ef93f618 -99b8ea06b092c3c1e503e6e436e0a9fa22576c8930ab3dc8c20f5d82b69cddf8 -ff4dacfa9c54bed5a3aa3ea5b129fe96be632843b9b6bc91b615581a985db56b -1e01ca60ee69ca92cf5c0882ece62edad3e106d835348822400f0b66af658f2a -e56ed08f8b0010571807009b73ab12a8cf14ca6c71f03c2a48c500f9d62266af -154a6375ff600d9bac3f05ce34142d6867a79581c533176bb2f3117336671e2e -44638a97167e2ea9644e31ea16c2ad2990ea33c54001e0c8156e6de8ab6a4d40 -a7137ba275f39589fea2e2db8256adc103d6f9cc038037a47e8fd469c5f98a5e -3c15bd4ace40d340018b1cff7d1ed8abb0ac57b5b5a2c20a51957b96c453edb7 -dae5affd91a46d938fe0a13363001d844ded4323f1ee6d30012aea19b024a552 -315505535c85dc26bad31e09c50e6512802976d298c4e90d0044c362e6bf3ab3 -62a454ee93de25ce54411090c29e9d75c80ce26a84404bd9de3aee0e3f921ac5 -87f907572b8354a5c3165eea7e8b2ba4e4f834663063e9a307d8ff6f8b61acd8 -799bc105cddcf8f95f2160494fc01f7ec3effb95de571b8d7f27a2f9ad203c09 -cd4cffd98a119a507460e7fef5c910405e877aa1f8da68d1272e59e3adccef8d -82e692b3229926fbe621080b7831a2ee248948dd3ae55082a939f02875a7a0eb -7ae7d50270a576fbdfde7109c670f51be75b80b6fe3045ea50e2121025dfefb3 -ab99e4f56a608203a590a3fa689226e987e56268df7a72388036d8f84ac8f6fe -decd51a24e81d2502e8c500affbb4c06e7d06be60944376582eb7ca189d5e83a -6e9a9456ecd31763da6cdbd5769bbc2fe5bff251db7eedd627b924f1e68d3447 -e66304458fae468a8aeaf63f0497effdfe82a510a3c7ff16c172b8093a9f00c7 -51f2cfcb80c05a2e71ab8156d952cd889dea996d52be3d07f90e52d416312909 -daf6da59dd6e089abafe36c89e7b31bb61e6f24aed891a71688ed728bec12125 -a8a800d605492b0abfd616b3761fec4690e9a4f49915e2ced8a3511edbda042a -cc6cad9d0e1cea3956b19d5452f5689dc6c71e7c97b87b27f0d0735f04bb558c -d66431bf76688f172badc32ecfa25a23f404a3cc4ffd6c228d05e8b7798b080e -0a4ae46472b8035d490b572d527a56b8b83ae89a1f18ed31f3b20c64d7bc701f -e1d163248ef477de01345639390afbeb07be7757a912198c604a8c29fb9c -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -cleartomark - -%%EndFont -%%BeginFont: CMR7 -%!PS-AdobeFont-1.1: CMR7 1.0 -%%CreationDate: 1991 Aug 20 16:39:21 - -% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. - -11 dict begin -/FontInfo 7 dict dup begin -/version (1.0) readonly def -/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def -/FullName (CMR7) readonly def -/FamilyName (Computer Modern) readonly def -/Weight (Medium) readonly def -/ItalicAngle 0 def -/isFixedPitch false def -end readonly def -/FontName /CMR7 def -/PaintType 0 def -/FontType 1 def -/FontMatrix [0.001 0 0 0.001 0 0] readonly def -/Encoding 256 array -0 1 255 {1 index exch /.notdef put} for -dup 44 /comma put -dup 49 /one put -dup 50 /two put -dup 51 /three put -dup 52 /four put -dup 53 /five put -dup 56 /eight put -dup 57 /nine put -dup 70 /F put -dup 84 /T put -dup 97 /a put -dup 98 /b put -dup 101 /e put -dup 102 /f put -dup 109 /m put -dup 110 /n put -dup 111 /o put -dup 112 /p put -dup 114 /r put -dup 115 /s put -dup 116 /t put -dup 117 /u put -dup 121 /y put -readonly def -/FontBBox{-27 -250 1122 750}readonly def -/UniqueID 5000790 def -currentdict end -currentfile eexec -9b9c1569015f2c1d2bf560f4c0d52257bacdd6500abda5ed9835f6a016cfc8f0 -0b6c052ed76a87856b50f4d80dfaeb508c97f8281f3f88b17e4d3b90c0f65ec3 -79791aacdc162a66cbbc5be2f53aad8de72dd113b55a022fbfee658cb95f5bb3 -2ba0357b5e050fddf264a07470bef1c52119b6fbd5c77ebed964ac5a2bbec9d8 -b3e48ae5bb003a63d545774b922b9d5ff6b0066ece43645a131879b032137d6d -823385fe55f3402d557fd3b448685940729e6e22f4be0e08c6505cba868f7950 -93f556b64b808dd710eb936d3ac83e5783b5f7e56d363a59a026a5619a357d21 -c4e77bea121eb24b09027d1aad93158edf912940e91cd2f17922b35885894644 -7773730bb19af9e70453e1b78d5edc123b273a979891d6d5e624f4a388f3897e -13b045e34b4ee2f5e4fc5e996d3549640010c671de14d18b0b3cd300e57dac03 -22e59bfbf7b29422230870f5897fcfaad4b50c7c1c58edcd119218163d6f6e56 -25ccb882db7b6d09a1586508e8cb642a11c29a46915e4a96e282079cb21922c1 -c2e360b487a45302fd22ec8c5fab63e54b5e844d4b17ca2fff37c69c366dd72a -d02922c14c0932f65ed03e4219c117962edbad2dcdeaa9c10ce8af38a4ae52e2 -b377245b0be19a77d6c936e7530cc4d0b78d0cc4a92698fa2870fa54f2d8503e -2d17b3d52fb2febb09f2b2af0c2a1892039ebe19a690098799a858e3d39631bd -6925a154d161df3918074ada6bd52baddd0adc3f07e2d9f15e27cbf7fe8b98c4 -07205c811121fa91e059f2f99322fed63f359ac9da97aec383f067f23e5de331 -51e80f0a88ab50fe8fdae4a5de93c1ae2fdca06150b37246140c0e87cb2325a6 -0d2349162ae3ac93144eee1e665a1289105318fdfe86b6e76251cb25adc967d3 -d0b97fe5e279e1161736ab22b4ca510b964342383a840defd38f96a7280e6ac1 -34e48d740607ff2e7804164a16d47735864db847c97335e6d4215cb99911a1ec -015a3edaac1f28fedd56d2467130d07bae9416c15f0827d27c6c79f59054282a -418c12c157c91223a829947f47592f7cafd93ca182b25a73a9419127e3b12a9e -5167ac3963f2b019b338ac46d63880f94dda4b538835884d2a5538c85528d6bd -977f844d32b43b0e48caed5a4bdabcefe71695d69ca784dc701fb68aa189fc5a -f35d9809ec0f7657c000376637b1b0e173af0cf475f585d664c3ad2760fe6aba -62d0e20674f6da16ca874aeccfe76b6b5202fc8e19a7c261683d822225ad4af7 -d3e5001f718db22c1e03ed052f98fb741896b65b66edc6e476ae08d5c34ac4ac -6017495382ff6961747d4c2572fa874cdd4ed944719306d3979d5a1269cc2b0f -440dc738c1742cef5b28b7cdcbbcb1f5e24299d6a13975370b8cd1488a2d2965 -dc7672c8ed9023473e208682586d9ff743e61bd5e1449b36d4188a963995d392 -2a8c15b188dc3102b4fe67d955c2b920f4d7b29c499b66fffce4c316417c6573 -3295b7d25a3d755e9966a7497d2274b032feed6eb87561cd0ac1bcfd31b17607 -2469f905c37d6b5fd90af4080f097124e10f9d45312e89f6acd5d75d2808111b -67d078d97fd73b493584b27a89a8299292515660a597b98c0363f77e9f894fc3 -34c5f6ec2499224e0424cacf82dd6aea1cda7119d3e03acaf80d421f316390fe -e9234a050652cd579c6e087df0e22d7d86ab4b1d83657809fb8b2530ea7ffcf9 -2fe7c1d661101421ea144880468ecc331b9fb345ede26f616bebdb97c2e4794b -166871d920c53c48daef8c9517eceee6385ef5de2dda61609ac5d1d5c22fd446 -2a32b59284dfbe3f77b0e2e30341b3e67a058aeb3760c5cf3b38192f5b623a77 -5d1b2ebe4827879036b33a2cb8114bd04f0445d7ce5a0dc59475ead0c60021bf -14cc6b07685b84506508834957fd8a9f82a2ccb91a1123c0371237ee8ed78c93 -7a2614c1d0890e1df040192dcb5dbd0c8b22ab83076b9574109017bbedb0b7d8 -c0bfc54b1a48059c51f4c0d77abb7cd9f655c041d08272b146d52143a2e275d5 -cafcc26273312f4a74b8c1fdb30658c9fd0d71ad846c69ed8f93628cbc3358f4 -040c13995ddbb6e7b496da836b70dcea9756bb90a1a953acec3b0d5e3b56f102 -9adb35311e98b1bedbbfd18396fee4cf82def36f0c307cf2ce001e4c50b3fd81 -e9deed73c0d0e8eccc114a867d1ce270d533bb08a1c89bd40ffe4d5241c455fe -f9f90a57f318171083d4f561189cdd044aef041373df4f0f492a826e5d4ec0be -20fd512c0abd51118ed2856d39dd0b089a8e71a1d11c909d5a9954c74cd71a16 -4f831d85d4f4b7f2ac4b4a9c48337a05e9d8339f02ed1d5bf3ddaa0ab30b74bd -7398bc090227ff5730ff4808f3de839d0360207ebd0bf05ea5a127a91d82c5fc -7551a3b7f1e77ce5d2617146bb9756b85d5b39450bf5f436559effb50a4ccec6 -c27e1b40d7cb870672c10f5d69a6b1c609ca9f95c6238ce709205be99778caf7 -087ee06aaa2c494d64b572ebca7a0bc4f318272e0de3add77aecc800e1aa3340 -9a04e2a9c5874827e1bbe5615a86f7575ee5cd3084654f27ff44b7fae494e7c7 -29f36f0fff15aba9fc2163564e8156c3c7678a7980884e4d0adb30bad6f3cf2d -56e9a1657c81833280e3485b906c70f871469b8d609a89224fe9fab9c69e240f -66cf3c6598e4f8b7efeeb167949e12707f1108f9595c777c186617163a219ea5 -9d889ebbf110c191de95a1d5358e9cc244d16d315c1a4df0b8ec7e24508c7561 -f9a299b0abc2e54d7f634e2b51d2f40b14dcc027ce0c486333b88f8879c66fcb -2823914c58686fda727c62a0a09ac126feef0d3a0f083b6f49659b59932fb9da -9b8429cdd80b12be7e77b435b6e3063bf7f99be9c2c9b67a93ae0f67e311a8c5 -c5c1a783e56951f29ae4fec46fa7311618f678c19dc7d6cd4b6bb44ce737cd6d -8c43f3327bb02d2ae929e3e5130a232a524da48ab2d929381cbad8d8bf9007d9 -9bf4358fd44a87245f063c600d5b415fc06b7c8e5594e36d8dd54d5754c49fbd -66ab4b60259ecaa7988e191ac5fd3e9c16a66f55d48920e870d22816f7499383 -e954265d4e04a550be2c2ca7c77189d52b0172826b1adb5fc83002a352f44b0d -f5b2b09130c14f5e568293b2e2e7d0124ddc03ed055e3e1828608e4a4bd0b98f -543a57e5ea64983c1088d031847b003f51d52c0a3fa644f19929acbd55f4b5c5 -4b8774961f6b5d284e0a7caf0a2f094fdd4e1efac461657c823e32ffb0d56896 -34d189f783d9f2bd2921e3c42e400a52b8f273255b33acb8683b4f69897287e0 -9023964e30a724208c747e59ab970baaeec72cc21740b89f3ba2ce964a494d63 -354281634c8f5b71d205680408e3c167c04067ae4e7bcc74547c67b0a09cea52 -914fcf9d61169cf9328829271c0af02b8fabb4d3d3a57751c840d1698aa75143 -294876b47c8783c346b26f703d71f50d22ffced2176965c87806915d0a80e054 -a5813d8d3ad02d8002cd5219ae54a24a7576f68e86ef8ee02ab84820da3d84c0 -58f804ea989b7ce3a239d4255804920a494d17e1b45b47d7d1294711ac337cd7 -6999e3d0b81cd8ae1a2aea5483dc5d2aa2ac4c86a766e176ee03c364db4203da -5109283cc793e50f3b570e09b6dd9592f8e7bf2a3ca927267450d7457932983f -8328ef244f0f9ea13b2f80434dc018c93c513e6eb988706b27704514b626b9c9 -d6136f2068dba6a389e1618914129065985be75a75950c9f569752c0e6659315 -2b85e47c36f2a48b92cc9443fa54a0d860aa91432819f7035580567fce462400 -98a71bf308be588fa088c2155ba232020baf3d3b5bba37ef78222be4e1dd895e -cfccab59ff8ab3ea0f277ebb11509a3c1ab72f2a4253c58ec8c0f0f3119aed62 -f2666394d342f14dc973bfdf0b5725d1ac4347c412b56517003511aeb75812db -a8e513447ecbe4e2092753f615d31527d6d61d65ae38e4b88d5b5d58863c4967 -55af8d8b89ffdb082f6b1967db59aed857cc24f1be088cd1fad6c5447e3c4e98 -77c78a6ecceaa44fbe76dec69494dd08bfa1e2c70221176e13b694a1885e09e5 -f0993234ec8814404031b7dd991b3221c1fff0cca7bf6b013e93211ef1e7ef73 -d4968779b210dfd6958e5110ebd8e1512d280ebdc71fca5f9ef4b6e7a8f29981 -7b2d8228dd54442a113410cad988b003d9dfba0d8fccb934404fbdc848a3f726 -4aed60d47507701b360f2e9bfedec87091ffeb51b87bc895e16aaf36adaabe2e -d16a5f1987ae02375dcb6b131ab5cf9f27e2eb5e7df5ad336aa4471805056b28 -d61dd8e3fbe028b3d0dd8e98f726d1ca1e1a63b5239d5a1773f9b43d30ba7d5f -ba43a7daecb87251541ce94b609f664b9acadc30e8984d66bb62b810fc272c0b -70a5df96ba5d7cf256c3b09c407f63ed99f630c846b5813c649aa940808ac910 -391b3e09ca704bc8d9f34287d6359e68b3cc72f1b8daf706a1fcdf8eacdff57f -86b95c290728a183d8470019ac9aacf9bb4b88e9e14ffa574366ee43f3294d5d -95493977e21993816a47190475bc023f8a846c13199e87e941aefe07cd14e51f -93cac419007ea1ce930d7a92d520e02eccf7f46fd50f607e1ff9388214c51341 -c8b8b5e6e19c2acf81962ce89d26ee4015a7b09b0e4d7c8c678b7d91dd650c52 -e074c6bbf4af671c38535e011b37ccca4e8868ffa9bb6d8c31079ed371715362 -04a33d068961a3b9d708f2e3c31cb05c4a8583d112229f6f527c4c1c6e8958c6 -6ee00b2e3b8e4b2638a5170138be51191e90fd5b4024260786f31348a9a73192 -e97f5f37c19a656a29e08387d9c758df2e31e585970f9e551704dec08f619995 -cf329419a0be0b8afecfb694622638492a96b83fdeee7bae12d74e49c2a5d75f -7fbd86e14d4c20dea4bbcc848b3b54ff4df29a19cd802be2097b757f87b36d58 -c327aac12eecaa5e7dd1f9f5139d487731e543094b68ed29c5b13a71817596b0 -5a12eca439fdaf7d65ffd6a089f017a9d9837b124286cabb4467aa89a206785c -b1c8673c58055cafa1bb81f7c5f375e8484d97fe803bf2a9e7d82b1e83fb7754 -f8f8127861264c4e48ea7ec1377ff7dd28c5818d9984031f8ef27bd98c2d5ff3 -332626ebc1f89d08f09a0fc5b20128943dd49fa81191c98e773f6e1cd8674803 -72913b2c425babdd4e23c745f11962bd86ee67836ba91bf3ca8aab423a5fd066 -9adf60c42098fa6d13cae19236d2929fcda558157036d8b7a8c47a22346cfb3f -be7e4a583df45dfc57e0233ea5e5b8114cee3576b3847761ed6ef166d28b3272 -3c35e23d822d476f9d701c25703b8c9025d63d56eb94bb594a057d6b5a8367ff -7500104070a4e3615f4413f1d10f2a5e94cd0867a6f4fbc1f01e4c361759ce0a -f285489a9c4131bc844573aa2aa200682a72fd72624db759748ec830cb4a719d -e7f7004b02776918d8753c014353c5441cb479313f22049cfd01183d299f3cd7 -b9cfa83bc226d9d03511fb2816f5630db0a43f92f33e7b3260995463c09c6bc4 -b85bd9cf0147c714f5495f4acd9183337d567c0fb36976eac93f8ba9203dc89b -da719ca71af689153f95d29fdcd05c967520ba1c20a45d84e0ca60e076efe6a5 -e1de300f0ba2cf8be8778eddb5282eccfa48c283f8b75430a7139db24b204332 -1c68e3fd28fe281831f4fd9b95bfadfd496915cc6b540c6f0f0fb1ce4da1da18 -ca08fa63c774e5242c2378ec9217f454fc1f28112ccd96cd875d1dc30ec9f892 -6fd432e198eb45f5b71fbb2ccb86e54b1fe20e1826f1ea2528570ab290665297 -778e0ea09d31e0ec7a5877994122cc4e645b97bf31506f9c29da0461c72c3fac -6bdf8254fe1b0a53b7fdd229ee4a151a55b77e71131a778e53a8947911158526 -7411fb09fa63c4c9a663ea38bf4d5be3842f60aa73217697dc064aa300e746fb -e09f48b66bbed881d684df35d4621d0c40bb78933d89ef0922ac5ea59b1ede2a -abfc0a204fe9bff4fc8f3e75edc75efb72b17e510d9be758aa18061cf4e638fb -833d00141196b0c9c012a7ffdf7f0af10e8159751977fd164f3f0d74605ed78d -6e028a0273f4fd3ad4032ead6669a1297143691902c792fab012ceb2826edc49 -c79df05dd5f65c16fc69888c7a11f3742e767de9785eb1339e7097af266bcd91 -b118338c6da68319a7475ba9b9eeca3d49351d35fc596be89f1abd04eaf81592 -0405fb3fba80aa25c5fd56bc0f07c8884c04edaee6efa76acc4a15ca781cd4b8 -b824de14da28264b296eb8fd0b347ff6cb1d5f18e8bfa08adb019c890d9d0168 -ba2f859dfd0864080fac9556a831733c776a87c033fdb45358a0724e8ba39306 -dcaa32099dfeaf098a55e4d38dbcf04fbbb1ecb2403838348d2f41a371f157e3 -2595b2f62e2fa5a69237fcff3356db5a6b3f2bb4a2696651f6a8089fb97b984a -0bf97a8eeef0944f8c191da61288c1bf728cc60579c4140f3e4fa58f0d1232b8 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -cleartomark - -%%EndFont -TeXDict begin 39158280 55380996 1000 300 300 (xdvik/testfont.dvi) -@start /Fa 135[22 49[22 22 22 22 22 22 7[22 22 22 22 -22 22 22 22 22 22 48[{}17 41.511 /CMTT10 rf /Fb 21 21 -21 21 21 21 21 21 23 21 21 21 21 21 21 21 12 12 12 12 -18 18 18 18 18 28 18 18 18 18 18 18 21 23 30 30 30 30 -30 30 23 30 30 30 30 30 30 30 14 14 14 14 25 25 25 25 -28 37 30 30 30 30 30 30 18 31 31 31 21 13 12 14 10 19 -21 14 12 12 23 17 14 32 14 23 21 11 32 14 21 8 21 21 -21 21 14 1[30 2[30 14 16 41 14 42 21 15 18 18 6[37 14 -23 42 14 21 21 42 18 21 14 3[22 20 8 20 18 21 21 30 21 -21 12 16 14 21 21 21 21 32 12 21 12 12 21 21 14 18 21 -18 21 18 14 21 19 14 12 14 25 30 30 39 30 30 25 23 28 -30 23 30 30 37 25 30 16 14 30 30 23 25 30 28 28 30 38 -18 23 23 23 12 12 21 21 21 21 21 21 21 21 21 21 12 10 -14 10 23 21 14 14 14 32 35 21 21 17 14 10 7 14 12[12 -14 18 25 1[23 14 1[14 14 12 25 14 7 23 23 14 1[{ -TeXBase1Encoding ReEncodeFont}229 41.511 /Times-Roman -rf /Fc 135[19 64[21 21 21 21 21 21 21 21 48[{}9 41.511 -/CMTI10 rf /Fd 130[21 105[21 19[{}2 41.511 /CMR10 rf -/Fe 134[17 3[18 13 13 13 1[18 17 18 27 6[10 15 2[18 17 -12[24 13[21 12[17 17 2[17 17 17 17 17 4[9 44[{}23 29.0577 -/CMR7 rf end -%%EndProlog -%%BeginSetup -%%Feature: *Resolution 300dpi -TeXDict begin -%%PaperSize: a4 - -%%EndSetup -%%Page: 1 1 -1 0 bop 0 42 a Fe(T)m(est)11 b(of)g(ptmr8r)g(on)g(F)m(ebruary)i(23,)d -(1999)g(at)g(1254)p 236 285 2 67 v 310 258 a Fd(\023)-8 -b Fc(0)p 424 285 V 154 w Fd(\023)g Fc(1)p 612 285 V 154 -w Fd(\023)g Fc(2)p 800 285 V 154 w Fd(\023)g Fc(3)p 988 -285 V 154 w Fd(\023)g Fc(4)p 1176 285 V 154 w Fd(\023)g -Fc(5)p 1364 285 V 154 w Fd(\023)g Fc(6)p 1552 285 V 154 -w Fd(\023)g Fc(7)p 1740 285 V 0 287 1950 2 v 82 326 a -Fd(\023)g Fc(00x)p 236 345 2 59 v 424 345 V 356 w Fb(\001)p -612 345 V 169 w(\002)p 800 345 V 165 w(\003)p 988 345 -V 173 w(\004)p 1176 345 V 178 w(\005)p 1364 345 V 168 -w(\006)p 1552 345 V 170 w(\007)p 1740 345 V 0 346 1742 -2 v 1814 356 a Fd(})p Fa(0x)82 392 y Fd(\023)g Fc(01x)p -236 411 2 65 v 167 w Fb(\010)p 424 411 V 175 w(\011)p -612 411 V 800 411 V 362 w(\013)p 988 411 V 169 w(\014)p -1176 411 V 1364 411 V 352 w(\016)p 1552 411 V 167 w(\017)p -1740 411 V 0 412 1950 2 v 82 452 a Fd(\023)g Fc(02x)p -236 470 2 59 v 167 w Fb(\020)p 424 470 V 176 w(\021)p -612 470 V 800 470 V 988 470 V 1176 470 V 1364 470 V 1552 -470 V 1740 470 V 0 472 1742 2 v 1814 481 a Fd(})p Fa(1x)82 -511 y Fd(\023)g Fc(03x)p 236 530 2 59 v 424 530 V 612 -530 V 800 530 V 988 530 V 1176 530 V 1364 530 V 1296 -w Fb(\036)p 1552 530 V 177 w(\037)p 1740 530 V 0 532 -1950 2 v 82 571 a Fd(\023)g Fc(04x)p 236 590 2 59 v 169 -w Fb( )p 424 590 V 177 w(!)p 612 590 V 172 w(")p 800 -590 V 169 w(#)p 988 590 V 167 w($)p 1176 590 V 160 w(\045)p -1364 590 V 155 w(&)p 1552 590 V 165 w(')p 1740 590 V -0 591 1742 2 v 1814 601 a Fd(})p Fa(2x)82 631 y Fd(\023)g -Fc(05x)p 236 650 2 59 v 167 w Fb(\()p 424 650 V 175 w(\))p -612 650 V 170 w(*)p 800 650 V 166 w(+)p 988 650 V 171 -w(,)p 1176 650 V 177 w(-)p 1364 650 V 176 w(.)p 1552 -650 V 177 w(/)p 1740 650 V 0 651 1950 2 v 82 691 a Fd(\023)g -Fc(06x)p 236 709 2 59 v 164 w Fb(0)p 424 709 V 167 w(1)p -612 709 V 167 w(2)p 800 709 V 167 w(3)p 988 709 V 167 -w(4)p 1176 709 V 167 w(5)p 1364 709 V 167 w(6)p 1552 -709 V 168 w(7)p 1740 709 V 0 711 1742 2 v 1814 721 a -Fd(})p Fa(3x)82 750 y Fd(\023)g Fc(07x)p 236 769 2 59 -v 164 w Fb(8)p 424 769 V 167 w(9)p 612 769 V 172 w(:)p -800 769 V 176 w(;)p 988 769 V 170 w(<)p 1176 769 V 165 -w(=)p 1364 769 V 165 w(>)p 1552 769 V 168 w(?)p 1740 -769 V 0 771 1950 2 v 82 810 a Fd(\023)g Fc(10x)p 236 -829 2 59 v 155 w Fb(@)p 424 829 V 154 w(A)p 612 829 V -160 w(B)p 800 829 V 160 w(C)p 988 829 V 159 w(D)p 1176 -829 V 160 w(E)p 1364 829 V 164 w(F)p 1552 829 V 162 w(G)p -1740 829 V 0 831 1742 2 v 1814 840 a Fd(})p Fa(4x)82 -870 y Fd(\023)g Fc(11x)p 236 889 2 59 v 159 w Fb(H)p -424 889 V 167 w(I)p 612 889 V 172 w(J)p 800 889 V 166 -w(K)p 988 889 V 160 w(L)p 1176 889 V 157 w(M)p 1364 889 -V 155 w(N)p 1552 889 V 158 w(O)p 1740 889 V 0 890 1950 -2 v 82 930 a Fd(\023)g Fc(12x)p 236 948 2 59 v 163 w -Fb(P)p 424 948 V 161 w(Q)p 612 948 V 160 w(R)p 800 948 -V 162 w(S)p 988 948 V 164 w(T)p 1176 948 V 161 w(U)p -1364 948 V 158 w(V)p 1552 948 V 153 w(W)p 1740 948 V -0 950 1742 2 v 1814 960 a Fd(})p Fa(5x)82 990 y Fd(\023)g -Fc(13x)p 236 1008 2 59 v 159 w Fb(X)p 424 1008 V 158 -w(Y)p 612 1008 V 161 w(Z)p 800 1008 V 169 w([)p 988 1008 -V 175 w(\\)p 1176 1008 V 175 w(])p 1364 1008 V 171 w(^)p -1552 1008 V 169 w(_)p 1740 1008 V 0 1010 1950 2 v 82 -1049 a Fd(\023)g Fc(14x)p 236 1068 2 59 v 167 w Fb(`)p -424 1068 V 172 w(a)p 612 1068 V 169 w(b)p 800 1068 V -168 w(c)p 988 1068 V 169 w(d)p 1176 1068 V 169 w(e)p -1364 1068 V 172 w(f)p 1552 1068 V 171 w(g)p 1740 1068 -V 0 1070 1742 2 v 1814 1079 a Fd(})p Fa(6x)82 1109 y -Fd(\023)g Fc(15x)p 236 1128 2 59 v 164 w Fb(h)p 424 1128 -V 172 w(i)p 612 1128 V 176 w(j)p 800 1128 V 171 w(k)p -988 1128 V 172 w(l)p 1176 1128 V 166 w(m)p 1364 1128 -V 161 w(n)p 1552 1128 V 168 w(o)p 1740 1128 V 0 1129 -1950 2 v 82 1169 a Fd(\023)g Fc(16x)p 236 1188 2 59 v -164 w Fb(p)p 424 1188 V 167 w(q)p 612 1188 V 171 w(r)p -800 1188 V 173 w(s)p 988 1188 V 174 w(t)p 1176 1188 V -171 w(u)p 1364 1188 V 167 w(v)p 1552 1188 V 163 w(w)p -1740 1188 V 0 1189 1742 2 v 1814 1199 a Fd(})p Fa(7x)82 -1229 y Fd(\023)g Fc(17x)p 236 1247 2 59 v 164 w Fb(x)p -424 1247 V 167 w(y)p 612 1247 V 168 w(z)p 800 1247 V -170 w({)p 988 1247 V 174 w(|)p 1176 1247 V 174 w(})p -1364 1247 V 167 w(~)p 1552 1247 V 1740 1247 V 0 1249 -1950 2 v 82 1288 a Fd(\023)g Fc(20x)p 236 1307 2 59 v -424 1307 V 612 1307 V 544 w Fb(\202)p 800 1307 V 170 -w(\203)p 988 1307 V 168 w(\204)p 1176 1307 V 159 w(\205)p -1364 1307 V 156 w(\206)p 1552 1307 V 168 w(\207)p 1740 -1307 V 0 1309 1742 2 v 1814 1318 a Fd(})p Fa(8x)82 1354 -y Fd(\023)g Fc(21x)p 236 1373 2 65 v 167 w Fb(\210)p -424 1373 V 161 w(\211)p 612 1373 V 155 w(\212)p 800 1373 -V 170 w(\213)p 988 1373 V 162 w(\214)p 1176 1373 V 1364 -1373 V 1552 1373 V 1740 1373 V 0 1374 1950 2 v 82 1414 -a Fd(\023)g Fc(22x)p 236 1433 2 59 v 424 1433 V 612 1433 -V 800 1433 V 729 w Fb(\223)p 988 1433 V 170 w(\224)p -1176 1433 V 173 w(\225)p 1364 1433 V 169 w(\226)p 1552 -1433 V 157 w(\227)p 1740 1433 V 0 1434 1742 2 v 1814 -1444 a Fd(})p Fa(9x)82 1478 y Fd(\023)g Fc(23x)p 236 -1496 2 62 v 167 w Fb(\230)p 424 1496 V 161 w(\231)p 612 -1496 V 159 w(\232)p 800 1496 V 174 w(\233)p 988 1496 -V 166 w(\234)p 1176 1496 V 1364 1496 V 1552 1496 V 534 -w(\237)p 1740 1496 V 0 1498 1950 2 v 82 1537 a Fd(\023)g -Fc(24x)p 236 1556 2 59 v 424 1556 V 356 w Fb(\241)p 612 -1556 V 170 w(\242)p 800 1556 V 167 w(\243)p 988 1556 -V 167 w(\244)p 1176 1556 V 167 w(\245)p 1364 1556 V 174 -w(\246)p 1552 1556 V 174 w(\247)p 1740 1556 V 0 1558 -1742 2 v 1814 1567 a Fd(})p Fa(Ax)82 1597 y Fd(\023)g -Fc(25x)p 236 1616 2 59 v 167 w Fb(\250)p 424 1616 V 166 -w(\251)p 612 1616 V 166 w(\252)p 800 1616 V 172 w(\253)p -988 1616 V 166 w(\254)p 1176 1616 V 170 w(\255)p 1364 -1616 V 165 w(\256)p 1552 1616 V 165 w(\257)p 1740 1616 -V 0 1617 1950 2 v 82 1657 a Fd(\023)g Fc(26x)p 236 1676 -2 59 v 166 w Fb(\260)p 424 1676 V 168 w(\261)p 612 1676 -V 170 w(\262)p 800 1676 V 176 w(\263)p 988 1676 V 176 -w(\264)p 1176 1676 V 170 w(\265)p 1364 1676 V 168 w(\266)p -1552 1676 V 174 w(\267)p 1740 1676 V 0 1677 1742 2 v -1814 1687 a Fd(})p Fa(Bx)82 1717 y Fd(\023)g Fc(27x)p -236 1735 2 59 v 167 w Fb(\270)p 424 1735 V 175 w(\271)p -612 1735 V 176 w(\272)p 800 1735 V 171 w(\273)p 988 1735 -V 162 w(\274)p 1176 1735 V 157 w(\275)p 1364 1735 V 157 -w(\276)p 1552 1735 V 164 w(\277)p 1740 1735 V 0 1737 -1950 2 v 82 1782 a Fd(\023)g Fc(30x)p 236 1801 2 65 v -159 w Fb(\300)p 424 1801 V 158 w(\301)p 612 1801 V 159 -w(\302)p 800 1801 V 158 w(\303)p 988 1801 V 158 w(\304)p -1176 1801 V 158 w(\305)p 1364 1801 V 154 w(\306)p 1552 -1801 V 156 w(\307)p 1740 1801 V 0 1803 1742 2 v 1814 -1812 a Fd(})p Fa(Cx)82 1848 y Fd(\023)g Fc(31x)p 236 -1867 2 65 v 162 w Fb(\310)p 424 1867 V 163 w(\311)p 612 -1867 V 163 w(\312)p 800 1867 V 163 w(\313)p 988 1867 -V 169 w(\314)p 1176 1867 V 174 w(\315)p 1364 1867 V 174 -w(\316)p 1552 1867 V 174 w(\317)p 1740 1867 V 0 1868 -1950 2 v 82 1914 a Fd(\023)g Fc(32x)p 236 1932 2 65 v -159 w Fb(\320)p 424 1932 V 158 w(\321)p 612 1932 V 159 -w(\322)p 800 1932 V 158 w(\323)p 988 1932 V 158 w(\324)p -1176 1932 V 158 w(\325)p 1364 1932 V 158 w(\326)p 1552 -1932 V 161 w(\327)p 1740 1932 V 0 1934 1742 2 v 1814 -1944 a Fd(})p Fa(Dx)82 1979 y Fd(\023)g Fc(33x)p 236 -1998 2 65 v 159 w Fb(\330)p 424 1998 V 158 w(\331)p 612 -1998 V 159 w(\332)p 800 1998 V 158 w(\333)p 988 1998 -V 158 w(\334)p 1176 1998 V 158 w(\335)p 1364 1998 V 161 -w(\336)p 1552 1998 V 167 w(\337)p 1740 1998 V 0 2000 -1950 2 v 82 2039 a Fd(\023)g Fc(34x)p 236 2058 2 59 v -165 w Fb(\340)p 424 2058 V 170 w(\341)p 612 2058 V 170 -w(\342)p 800 2058 V 170 w(\343)p 988 2058 V 170 w(\344)p -1176 2058 V 171 w(\345)p 1364 2058 V 165 w(\346)p 1552 -2058 V 165 w(\347)p 1740 2058 V 0 2059 1742 2 v 1814 -2069 a Fd(})p Fa(Ex)82 2099 y Fd(\023)g Fc(35x)p 236 -2118 2 59 v 165 w Fb(\350)p 424 2118 V 170 w(\351)p 612 -2118 V 170 w(\352)p 800 2118 V 170 w(\353)p 988 2118 -V 174 w(\354)p 1176 2118 V 176 w(\355)p 1364 2118 V 176 -w(\356)p 1552 2118 V 176 w(\357)p 1740 2118 V 0 2119 -1950 2 v 82 2159 a Fd(\023)g Fc(36x)p 236 2177 2 59 v -164 w Fb(\360)p 424 2177 V 167 w(\361)p 612 2177 V 167 -w(\362)p 800 2177 V 167 w(\363)p 988 2177 V 167 w(\364)p -1176 2177 V 167 w(\365)p 1364 2177 V 167 w(\366)p 1552 -2177 V 166 w(\367)p 1740 2177 V 0 2179 1742 2 v 1814 -2189 a Fd(})p Fa(Fx)82 2218 y Fd(\023)g Fc(37x)p 236 -2237 2 59 v 164 w Fb(\370)p 424 2237 V 167 w(\371)p 612 -2237 V 167 w(\372)p 800 2237 V 167 w(\373)p 988 2237 -V 167 w(\374)p 1176 2237 V 167 w(\375)p 1364 2237 V 167 -w(\376)p 1552 2237 V 168 w(\377)p 1740 2237 V 0 2239 -1950 2 v 236 2305 2 67 v 309 2286 a Fd(})p Fa(8)p 424 -2305 V 145 w Fd(})p Fa(9)p 612 2305 V 145 w Fd(})p Fa(A)p -800 2305 V 145 w Fd(})p Fa(B)p 988 2305 V 145 w Fd(})p -Fa(C)p 1176 2305 V 145 w Fd(})p Fa(D)p 1364 2305 V 146 -w Fd(})p Fa(E)p 1552 2305 V 145 w Fd(})p Fa(F)p 1740 -2305 V eop -%%Trailer -end -userdict /end-hook known{end-hook}if -%%EOF diff -Naur xdvik-22.40n/texk/xdvik/CVS/Entries xdvik-22.40o/texk/xdvik/CVS/Entries --- xdvik-22.40n/texk/xdvik/CVS/Entries Mon Sep 16 17:45:07 2002 +++ xdvik-22.40o/texk/xdvik/CVS/Entries Wed Oct 16 23:45:11 2002 @@ -3,70 +3,72 @@ /BUGS/1.1.1.1/Wed Apr 18 14:24:38 2001//Txdvik_22_40_STABLE /FAQ/1.1.1.1/Wed Apr 18 14:24:38 2001//Txdvik_22_40_STABLE /MAKE-VMS.COM/1.1.1.1/Wed Apr 18 14:24:38 2001//Txdvik_22_40_STABLE -/Makefile.in/1.8.4.5/Sat Sep 14 00:24:48 2002//Txdvik_22_40_STABLE +/Makefile.in/1.8.4.6/Sat Oct 12 13:28:49 2002//Txdvik_22_40_STABLE /README.VMS/1.1.1.1/Wed Apr 18 14:24:39 2001//Txdvik_22_40_STABLE /README.src-specials/1.1.6.2/Thu Aug 1 23:40:08 2002//Txdvik_22_40_STABLE -/README.t1fonts/1.2.4.5/Wed Aug 14 22:27:35 2002//Txdvik_22_40_STABLE +/README.t1fonts/1.2.4.6/Sat Oct 12 14:51:16 2002//Txdvik_22_40_STABLE /VMS-C.OPT/1.1.1.1/Wed Apr 18 14:24:39 2001//Txdvik_22_40_STABLE /XDVI.RNH/1.1.1.1/Wed Apr 18 14:24:39 2001//Txdvik_22_40_STABLE /acconfig.h/1.1.4.1/Wed Apr 10 01:14:48 2002//Txdvik_22_40_STABLE -/aclocal.m4/1.2.6.1/Wed Apr 10 01:14:48 2002//Txdvik_22_40_STABLE +/aclocal.m4/1.2.6.2/Sun Oct 6 15:26:46 2002//Txdvik_22_40_STABLE /alloc-debug.h/1.1.1.1/Wed Apr 18 14:24:39 2001//Txdvik_22_40_STABLE -/alloca.c/1.1.1.1/Wed Apr 18 14:24:39 2001//Txdvik_22_40_STABLE +/alloca.c/1.1.1.1.6.2/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE /app-defaults-xdvik/1.1.1.1.6.2/Fri Aug 30 23:49:40 2002//Txdvik_22_40_STABLE -/c-auto.in/1.6.4.4/Wed Apr 10 01:14:48 2002//Txdvik_22_40_STABLE +/c-auto.in/1.6.4.5/Wed Oct 16 22:26:23 2002//Txdvik_22_40_STABLE /c-openmx.h/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/configure/1.6.4.9/Sat Sep 14 00:24:48 2002//Txdvik_22_40_STABLE -/configure.in/1.7.4.6/Sat Sep 14 00:24:48 2002//Txdvik_22_40_STABLE -/depend.mk/1.6.4.4/Mon Sep 16 10:10:50 2002//Txdvik_22_40_STABLE -/dvi-draw.c/1.33.4.28/Sat Sep 14 23:18:43 2002//Txdvik_22_40_STABLE -/dvi-init.c/1.22.4.10/Tue Aug 27 17:56:52 2002//Txdvik_22_40_STABLE +/configure/1.6.4.13/Wed Oct 16 22:26:23 2002//Txdvik_22_40_STABLE +/configure.in/1.7.4.9/Mon Oct 14 23:05:48 2002//Txdvik_22_40_STABLE +/depend.mk/1.6.4.5/Wed Oct 16 22:26:23 2002//Txdvik_22_40_STABLE +/dvi-draw.c/1.33.4.40/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE +/dvi-init.c/1.22.4.16/Thu Oct 10 22:54:34 2002//Txdvik_22_40_STABLE /dvi.h/1.1.1.1/Wed Apr 18 14:24:42 2001//Txdvik_22_40_STABLE -/dvips.c/1.3.6.2/Sat Sep 14 23:18:43 2002//Txdvik_22_40_STABLE -/events.c/1.10.4.20/Sat Sep 14 23:18:43 2002//Txdvik_22_40_STABLE -/font-open.c/1.3.6.2/Sat Sep 14 23:18:44 2002//Txdvik_22_40_STABLE -/gf.c/1.1.1.1/Wed Apr 18 14:24:43 2001//Txdvik_22_40_STABLE +/dvips.c/1.3.6.3/Thu Oct 10 18:38:21 2002//Txdvik_22_40_STABLE +/events.c/1.10.4.34/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE +/font-open.c/1.3.6.8/Sat Oct 12 16:52:20 2002//Txdvik_22_40_STABLE +/gf.c/1.1.1.1.6.1/Thu Sep 19 23:10:04 2002//Txdvik_22_40_STABLE /gs/1.1.1.1/Wed Apr 18 14:24:43 2001//Txdvik_22_40_STABLE -/help-window.c/1.10.4.3/Sat Aug 24 16:09:55 2002//Txdvik_22_40_STABLE +/help-window.c/1.10.4.5/Sun Oct 6 15:26:47 2002//Txdvik_22_40_STABLE /help-window.h/1.1.1.1/Wed Apr 18 14:24:43 2001//Txdvik_22_40_STABLE -/hypertex.c/1.16.4.17/Sat Aug 31 16:43:23 2002//Txdvik_22_40_STABLE -/message-window.c/1.15.4.3/Sat Aug 31 22:09:55 2002//Txdvik_22_40_STABLE +/hypertex.c/1.16.4.20/Sun Oct 6 15:26:47 2002//Txdvik_22_40_STABLE +/message-window.c/1.15.4.6/Mon Oct 14 23:42:31 2002//Txdvik_22_40_STABLE /message-window.h/1.3.4.2/Tue Aug 6 23:40:26 2002//Txdvik_22_40_STABLE -/mime.c/1.5.4.1/Sat Aug 31 16:43:23 2002//Txdvik_22_40_STABLE +/mime.c/1.5.4.2/Thu Sep 19 23:10:04 2002//Txdvik_22_40_STABLE /mksedscript/1.1.1.1.6.3/Tue Apr 30 17:35:57 2002//Txdvik_22_40_STABLE -/my-vsnprintf.c/1.1.1.1.6.2/Thu May 30 17:39:38 2002//Txdvik_22_40_STABLE -/my-vsnprintf.h/1.1.1.1.6.2/Thu May 30 12:02:01 2002//Txdvik_22_40_STABLE -/pk.c/1.1.1.1.6.1/Sat Aug 31 16:43:23 2002//Txdvik_22_40_STABLE -/psdps.c/1.1.1.1.6.2/Mon Mar 4 17:35:11 2002//Txdvik_22_40_STABLE -/psgs.c/1.2.4.14/Sat Aug 31 16:43:23 2002//Txdvik_22_40_STABLE +/my-vsnprintf.c/1.1.1.1.6.3/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE +/my-vsnprintf.h/1.1.1.1.6.3/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE +/pk.c/1.1.1.1.6.2/Thu Sep 19 23:10:04 2002//Txdvik_22_40_STABLE +/psdps.c/1.1.1.1.6.7/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE +/psgs.c/1.2.4.21/Mon Oct 14 22:48:24 2002//Txdvik_22_40_STABLE /psheader.txt/1.1.1.1/Wed Apr 18 14:24:45 2001//Txdvik_22_40_STABLE -/psnews.c/1.1.1.1.6.2/Mon Mar 4 17:35:11 2002//Txdvik_22_40_STABLE -/sfDir.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/sfDraw.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/sfPath.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/sfSelFile.c/1.2.6.1/Wed Apr 10 01:14:49 2002//Txdvik_22_40_STABLE -/sfinternal.h/1.1.1.1/Wed Apr 18 14:24:45 2001//Txdvik_22_40_STABLE -/special.c/1.5.4.8/Sat Sep 14 23:18:44 2002//Txdvik_22_40_STABLE +/psnews.c/1.1.1.1.6.7/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE +/sfDir.c/1.2.6.1/Thu Sep 19 23:10:04 2002//Txdvik_22_40_STABLE +/sfDraw.c/1.2.6.2/Sun Oct 6 15:26:47 2002//Txdvik_22_40_STABLE +/sfPath.c/1.2.6.2/Sun Oct 6 15:26:47 2002//Txdvik_22_40_STABLE +/sfSelFile.c/1.2.6.3/Sun Oct 6 15:26:47 2002//Txdvik_22_40_STABLE +/sfinternal.h/1.1.1.1.6.1/Sun Oct 6 15:26:47 2002//Txdvik_22_40_STABLE +/special.c/1.5.4.13/Sun Oct 6 15:26:47 2002//Txdvik_22_40_STABLE /squeeze.c/1.2/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE -/stamp-auto.in/1.2/Sun May 20 22:19:03 2001//Txdvik_22_40_STABLE +/stamp-auto.in/1.2.6.1/Wed Oct 16 22:26:23 2002//Txdvik_22_40_STABLE /startxdvi/1.1.6.2/Tue Aug 6 23:47:53 2002//Txdvik_22_40_STABLE -/statusline.c/1.3.6.4/Tue Aug 27 17:56:52 2002//Txdvik_22_40_STABLE +/statusline.c/1.3.6.8/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE /statusline.h/1.1.1.1/Wed Apr 18 14:24:46 2001//Txdvik_22_40_STABLE -/string-utils.c/1.3.4.1/Thu May 30 12:02:01 2002//Txdvik_22_40_STABLE +/string-utils.c/1.3.4.2/Thu Sep 19 23:10:05 2002//Txdvik_22_40_STABLE /string-utils.h/1.2/Sat Jun 30 17:00:46 2001//Txdvik_22_40_STABLE /t1mapper/1.1.1.1.6.1/Wed Aug 14 22:50:17 2002//Txdvik_22_40_STABLE /t1mapper.1/1.1.2.3/Mon Mar 4 17:35:11 2002//Txdvik_22_40_STABLE /tfmload.c/1.5.4.1/Sat Sep 14 23:18:44 2002//Txdvik_22_40_STABLE -/util.c/1.12.4.11/Sat Sep 14 23:18:44 2002//Txdvik_22_40_STABLE -/version.h/1.7.4.17/Mon Sep 16 17:08:18 2002//Txdvik_22_40_STABLE -/vf.c/1.1.1.1/Wed Apr 18 14:24:47 2001//Txdvik_22_40_STABLE +/util.c/1.12.4.12/Thu Sep 19 23:10:05 2002//Txdvik_22_40_STABLE +/version.h/1.7.4.25/Wed Oct 16 23:22:32 2002//Txdvik_22_40_STABLE +/vf.c/1.1.1.1.6.2/Thu Oct 10 18:38:22 2002//Txdvik_22_40_STABLE /withenable.ac/1.4.4.3/Sat Aug 24 16:10:05 2002//Txdvik_22_40_STABLE -/wwwfetch.c/1.9.4.7/Fri Sep 13 00:59:29 2002//Txdvik_22_40_STABLE -/xdvi-config.h/1.3/Mon May 21 14:19:25 2001//Txdvik_22_40_STABLE +/wwwfetch.c/1.9.4.11/Sat Oct 12 23:59:36 2002//Txdvik_22_40_STABLE +/xdvi-config.h/1.3.6.1/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE /xdvi-search.el/1.2.4.4/Thu Sep 12 22:04:29 2002//Txdvik_22_40_STABLE /xdvi-sh/1.1.1.1.6.2/Mon Mar 4 20:03:41 2002//Txdvik_22_40_STABLE -/xdvi.c/1.19.4.21/Sat Sep 14 23:18:44 2002//Txdvik_22_40_STABLE -/xdvi.h/1.16.4.19/Sat Sep 14 23:18:44 2002//Txdvik_22_40_STABLE +/xdvi.c/1.19.4.30/Tue Oct 15 21:15:02 2002//Txdvik_22_40_STABLE +/xdvi.h/1.16.4.28/Tue Oct 15 22:48:32 2002//Txdvik_22_40_STABLE /xdvi.icon/1.1.1.1/Wed Apr 18 14:24:48 2001//Txdvik_22_40_STABLE -/xdvi.man/1.5.4.21/Sat Aug 31 17:11:40 2002//Txdvik_22_40_STABLE +/xdvi.man/1.5.4.26/Sun Oct 13 21:03:11 2002//Txdvik_22_40_STABLE +/xdvizilla/1.1.2.1/Sat Oct 12 13:28:50 2002//Txdvik_22_40_STABLE +/xdvizilla.1/1.1.2.1/Sat Oct 12 13:28:50 2002//Txdvik_22_40_STABLE D/texmf//// diff -Naur xdvik-22.40n/texk/xdvik/Makefile.in xdvik-22.40o/texk/xdvik/Makefile.in --- xdvik-22.40n/texk/xdvik/Makefile.in Sat Sep 14 00:24:48 2002 +++ xdvik-22.40o/texk/xdvik/Makefile.in Sat Oct 12 13:28:49 2002 @@ -103,6 +103,8 @@ for p in $(program); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done $(INSTALL_SCRIPT) $(srcdir)/$(perlprog) $(scriptdir)/$(perlprog) $(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/xdvi + $(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/xdvizilla + uninstall-exec: for p in $(program) $(perlprog) xdvi; do rm -f $(bindir)/$$p; done @@ -110,13 +112,15 @@ install-data: xdvi.1 t1mapper.1 $(INSTALL_DATA) xdvi.1 $(mandir)/xdvi.$(manext) $(INSTALL_DATA) $(srcdir)/t1mapper.1 $(mandir)/t1mapper.$(manext) - # $(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(texmf)/xdvi - # $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi - # $(INSTALL_DATA) $(srcdir)/texmf/ps2pk.map $(texmf)/xdvi + $(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(mandir)/xdvizilla.$(manext) +# $(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(texmf)/xdvi +# $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi +# $(INSTALL_DATA) $(srcdir)/texmf/ps2pk.map $(texmf)/xdvi uninstall-data: rm -f $(mandir)/xdvi.$(manext) - rm -f $(mandir)/t1mapper.$(manext) + rm -f $(mandir)/t1mapper.$(manext) + rm -f $(mandir)/xdvizilla.$(manext) $(scriptdir)/xdvizilla distname = xdvik program_files = *.man *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \ diff -Naur xdvik-22.40n/texk/xdvik/README.t1fonts xdvik-22.40o/texk/xdvik/README.t1fonts --- xdvik-22.40n/texk/xdvik/README.t1fonts Wed Aug 14 22:27:35 2002 +++ xdvik-22.40o/texk/xdvik/README.t1fonts Sat Oct 12 14:51:16 2002 @@ -16,9 +16,6 @@ configured in texmf.cnf for all your users if you're familiar with that file). If you're interested in using t1 fonts please read on. -OF TYPE1 FONTS AND FONTMAPS IN XDVI -=================================== - NOTE: The rest of this file is only interesting to system integrators, TeX software developers, and people that build their own tex software. People installing OS packages such as provided by/for BSD or Red @@ -26,37 +23,80 @@ taken care of by the packager. -NOTE FOR TETEX USERS: ---------------------- +Note for teTeX/TeXLive users +============================ + +With current versions of teTeX (teTeX-beta or teTeX > 1.0), or TeXLive +(>= 6b), you don't need to run the t1mapper utility described below; +the texmf tree will already contain the needed .pfa or .pfb files. If +your Type1 font setup doesn't work, please check the following things: + +1. Make sure that xdvi finds your xdvi.cfg file (it will print a warning + to stderr if it doesn't). + +2. Make sure that $XDVIINPUTS/xdvi.cfg contains the line: + dvipsmap ps2pk.map + +3. Make sure that xdvi finds ps2pk.map (use + kpsewhich -debug -1 ps2pk.map + to debug your setup; see the manpage of kpsewhich for more details). + +4. Make sure that xdvi finds the Type-1 versions of your fonts; e.g. + kpsewhich cmr10.pfb + should return the full path name of the font. If this doesn't work, + use `kpsewhich -debug -1' to debug your setup, as above. + +See also kpathsea.dvi and TETEXDOC.dvi for more information on the +how kpathsea works. + + +For older versions of teTeX, you might need to use xdvifont.map instead +of ps2pk.map, and the xdvi.cfg file from the texk/xdvik/texmf/ subdirectory +of the xdvik distribution. + +The file xdvi-teTeX.cfg is the same as the file used in newer versions +of teTeX, and is included as a reference only. -With current versions of teTeX, you don't need to run the t1mapper -utility described below; the texmf tree will already contain the -needed .pfb files. Also, with teTeX versions >= 1.0, use the file -xdvi-teTeX.cfg instead of xdvi.cfg. Xdvik will then share the font -files with ps2pk, and updmap will automatically update this file when -new .map files are added. - -The notes below assume that you have an older teTeX version installed -under /usr/local/teTeX. You may need to change the paths accordingly. - -[ END NOTE FOR TETEX USERS ] - -To be able to support t1 fonts xdvik now needs a xdvi.cfg file. It -needs to load all fonts from disk, and like dvips that means that it -needs to translate the TeX names for fonts to filenames, load encoding -vectors, and such according to map files and so on. But unlike dvips, -which produces Postscript code for printers with builtin fonts, xdvik -has _no_ builtin fonts, and cannot share all font maps with dvips (it -can share quite a few fontmaps though, Read On). - -Thus, if you install this version of xdvik and not a xdvi.cfg file you -will see warnings about it missing. This file is usualy put in the -texmf hierarchy, in a separate directory called xdvi. This directory -is pointed to by the XDVIINPUTS variable in texmf.cnf (see +If you don't have a current version of teTeX or TeXLive, you should +consider getting one, since it makes things really easier ;-) + +Else, please read on ... + + + +OF TYPE1 FONTS AND FONTMAPS IN XDVI +=================================== + +The following notes assume that you have an older teTeX version +which is installed under /usr/local/teTeX. You may need to change +that path name if your installation is in a different place. + +To be able to support t1 fonts xdvik needs a xdvi.cfg file. (It will +warn you if it isn't able to locate that file). This file is usually +put into the texmf hierarchy, in a separate directory called xdvi. This +directory is pointed to by the XDVIINPUTS variable in texmf.cnf (see kpathsea.dvi if you're not familiar with this file). In texk/xdvik/texmf you will find the files you need to put in your XDVIINPUTS directory, but please look at them, and esp. the xdvi.cfg -file itself. +file itself, before installing them. + +Xdvi then needs to load all Type1 fonts from disk, which means that it +(just as dvips) needs to translate the TeX names for fonts to +filenames, load encoding vectors, according to map files and so on. +But unlike dvips, which produces Postscript code for printers with +built-in fonts, xdvik has _no_ builtin fonts, and thus cannot share +all font maps with dvips. +The main difference is that fontmaps for xdvi always need to contain +the name of a `real' Type1 font file (a .pfa or .pfb file) at the end +of the line, e.g. `utmr8a.pfb' in the following case: + + ptmr8r NimbusRomNo9L-Regu "TeXBase1Encoding ReEncodeFont" <8r.enc = 4.x installed or fetched and -unpacked. Including both font packages ('std' and 'other'). If you +Have gs (ghostscript) version >= 4.x installed (or downloaded and +unpacked), including both font packages ('std' and 'other'). If you have gs on your machine already you can check what version you have -with the command 'gs -help', this also tells you where the installed +with the command 'gs -help'; this also tells you where the installed gs stores its fonts. Find the Fontmap file and the fonts. If you -can't find them pretend you don't have them and follow the +can't find them, pretend you don't have them and follow the instructions in the next paragraph. If you don't have gs installed you need to get it and and the font @@ -126,43 +165,44 @@ http://www.gnu.org/software/ghostscript/ghostscript.html Please note that Aladdin aka AFPL ghostscript has restrictions on -commercial use including any distribution for money, and other license -limits on the included fonts. Please read the file PUBLIC for the -full licensing terms. +commercial use including any distribution for money, and other +licensing limitations on the included fonts. Please read the file +PUBLIC for the full licensing terms. If you get the GNU version of Ghostscript then you get the GPL license, see the file COPYING included in the source package for the terms. From the source package you extract the file 'Fontmap' or 'Fontmap.GS'. Extract the two font packages too. Now you have the -files you need. Install them somewhere, -/usr/local/share/ghostscript/fonts for example. If you wonder about +files you need. Install them somewhere, e.g. to +/usr/local/share/ghostscript/fonts. If you wonder about the contents of the Ghostscript font packages, and their relation to -the "real" type1 fonts used in printers please look at the GS docs. +the "real" type1 fonts used in printers, please look at the GS docs. -Decide where to install the type1 files for xdvi. +Decide where to install the font files for xdvi. /usr/local/teTeX/share/texmf/fonts/type1/gs is a likely place. Now -run t1mapper (as root probably) to install fonts there: +run t1mapper (probably as root) to install the fonts: t1mapper -lns -gs /usr/local/share/ghostscript/5.50/Fontmap \ /usr/local/share/ghostscript/fonts \ /usr/local/teTeX/share/texmf/fonts/type1/gs NOTE: -- For the meaning of -lns -gs and other t1mapper options see below -- If you unpacked the gs packages and installed them by hand please - correct the Fontmap path -- The .../type1/gs directory will be created if it does not already - exist. +- For the meaning of -lns -gs and other t1mapper options,e see below. +- If you unpacked the gs packages and installed them by hand, please + correct the Fontmap path. +- The directory + /usr/local/teTeX/share/texmf/fonts/type1/gs + will be created if it does not already exist. - With ghostscript >= 6.51, Fontmap is only a wrapper for Fontmap.GS. - Use Fontmap.GS instead of Fontmap in the invocation of t1mapper. + Use `Fontmap.GS' instead of `Fontmap' in the invocation of t1mapper. -In some versions of Linux, such as Red Hat Linux 7 they have split the +In some versions of Linux, such as Red Hat Linux 7.x, they split the files into two directories. Listing the contents of the gs related font packages reveals that they have been put in both /usr/share/fonts/default/ghostscript and -/usr/share/fonts/default/Type1. If you use such a distribution this -might be the right commands: +/usr/share/fonts/default/Type1. If you use such a distribution, this +might be the commands to use: t1mapper -lns -gs /usr/share/ghostscript/5.50/Fontmap \ /usr/share/fonts/default/ghostscript \ @@ -171,14 +211,14 @@ /usr/share/fonts/default/Type1 \ /usr/share/texmf/fonts/type1/gs -When the command is complete all the fonts gs knows about will have +When the command is complete, all the fonts gs knows about will have been copied to /usr/local/teTeX/share/texmf/fonts/type1/gs. This will give you the standard PostScript fonts as well as some others. 2. Install Other Postscript Fonts -If you already have some type1 fonts, other than the ones from -ghostscript, you want to add them too, probably. Some sites have +If you already have some type1 fonts (other than the ones from +ghostscript), you might want to add them as well. Some sites have extensive postscript font collections. All these fonts can be used. Additionaly, if you use a machine with a comercial Unix version (such @@ -207,7 +247,7 @@ moving a font there. The -lns option will cause t1mapper to symlink the fonts instead of -copying them, saving a good deal of diskspace. These options are +copying them, saving a good deal of disk space. These options are available to modify how t1mapper atempts to copy/link files: -cp copy the font files, this is the default and will always work @@ -222,8 +262,9 @@ 3. AFM files -AFM files are no longer needed by xdvik. TFM files have more -accurate width data and *must* be used to get correct alignment. +AFM files are not needed by xdvik. TFM files have more accurate width +data and *must* be used to get correct alignment. + 4a. Standard TeX fonts in postscript version @@ -231,7 +272,7 @@ traditional TeX fonts you need to get them from CTAN, e.g., ftp.tex.ac.uk:/tex-archive/fonts/cm/ps-type1/bluesky/pfb/. Just drop them in a texmf directory, such as fonts/type1/bluesky/cm/. No -further configuration is needed of {\em these} fonts. +further configuration should be needed to use these fonts. 4b. AMS TeX fonts in postscript version @@ -250,16 +291,16 @@ NOTE: - There are license restrictions on the use of the bakoma fonts - which might prevent you from using them. Including using them in - finished documents. The license should be less restricing for xdvi - use than for dvips use though, since xdvi does not produce lasting ink - marks on paper. + which might prevent you from using them; one of them being the + inclusion in finished documents. The license shouldn't be applicable + for use with xdvik though, since unlike dvips, xdvi does not produce + files that can be printed on paper. - The bakoma fonts was made by an automatic process which results in less precise type1 fonts than the manual process used to create the bluesky fonts. Many people would not use the bakoma fonts with printers. They are probably quite fine to use with xdvi though. -If you do not want dvips to use the bakoma fonts ensure that there is +If you do not want dvips to use the bakoma fonts, make sure that there is no xdvi fontmaps describing them. 5. xdvi config files @@ -273,7 +314,7 @@ 6. Almost finished All the font files are now where they should be. If you use a file -database it's time to update it. teTeX users run 'texhash' to obtain +database it's time to update it. TeTeX users run 'texhash' to obtain this effect. xdvi can now find all the nice files and will not need pk versions of diff -Naur xdvik-22.40n/texk/xdvik/aclocal.m4 xdvik-22.40o/texk/xdvik/aclocal.m4 --- xdvik-22.40n/texk/xdvik/aclocal.m4 Wed Apr 10 01:14:48 2002 +++ xdvik-22.40o/texk/xdvik/aclocal.m4 Sun Oct 6 15:26:46 2002 @@ -106,3 +106,66 @@ AC_DEFINE(HAVE_REALPATH) fi]) + +dnl SU: the following is copied from gnome/compiler-flags.m4: turn on warnings for gcc +dnl +dnl COMPILER_WARNINGS +dnl Turn on many useful compiler warnings +dnl For now, only works on GCC +AC_DEFUN([COMPILER_WARNINGS],[ + AC_ARG_ENABLE(compile-warnings, + [ --enable-compile-warnings=[no/minimum/yes/maximum] + Turn on compiler warnings.],,enable_compile_warnings=minimum) + + AC_MSG_CHECKING(what warning flags to pass to the C compiler) + warnCFLAGS= + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi + + if test "x$enable_compile_warnings" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) warnCFLAGS="-W -Wall -Wunused" ;; + esac + + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_compile_warnings" = "xyes"; then + warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations" + elif test "x$enable_compile_warnings" = "xmaximum"; then + ## just turn on about everything: + warnCFLAGS="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wimplicit -Wparentheses -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings" + fi + fi + fi + AC_MSG_RESULT($warnCFLAGS) + + AC_ARG_ENABLE(iso-c, + [ --enable-iso-c Try to warn if code is not ISO C ],, + enable_iso_c=no) + + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + + case " $CFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCFLAGS) + if test "x$cflags_set" != "xyes"; then + CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS" + cflags_set=yes + AC_SUBST(cflags_set) + fi +]) + diff -Naur xdvik-22.40n/texk/xdvik/alloca.c xdvik-22.40o/texk/xdvik/alloca.c --- xdvik-22.40n/texk/xdvik/alloca.c Wed Apr 18 14:24:39 2001 +++ xdvik-22.40o/texk/xdvik/alloca.c Tue Oct 15 21:15:02 2002 @@ -85,7 +85,7 @@ #define STACK_DIR stack_dir static void -find_stack_direction( /* void */ ) +find_stack_direction(void) { static char *addr = NULL; /* address of first `dummy', once known */ @@ -188,4 +188,6 @@ } } +#else /* avoid empty compilation unit warning */ +int ___alloca; #endif /* not HAVE_ALLOCA */ diff -Naur xdvik-22.40n/texk/xdvik/c-auto.in xdvik-22.40o/texk/xdvik/c-auto.in --- xdvik-22.40n/texk/xdvik/c-auto.in Wed Apr 10 01:14:48 2002 +++ xdvik-22.40o/texk/xdvik/c-auto.in Wed Oct 16 22:26:23 2002 @@ -46,6 +46,9 @@ /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Define if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME + /* Define vfork as fork if vfork does not work. */ #undef vfork @@ -91,12 +94,6 @@ /* ??? */ #undef LDT1LIB -#undef MAKE_OMEGA_OCP_BY_DEFAULT -#undef MAKE_OMEGA_OFM_BY_DEFAULT -#undef MAKE_TEX_MF_BY_DEFAULT -#undef MAKE_TEX_PK_BY_DEFAULT -#undef MAKE_TEX_TFM_BY_DEFAULT - /* Define to compile in statusline */ #undef STATUSLINE @@ -109,17 +106,20 @@ #undef HAVE_REALPATH +#undef NOTOOL + +/* Define if you have the fchdir function. */ #undef HAVE_FCHDIR +/* Define if you have the getcwd function. */ #undef HAVE_GETCWD -#undef HAVE_LSTAT - -#undef NOTOOL - /* Define if you have the isinf function. */ #undef HAVE_ISINF +/* Define if you have the lstat function. */ +#undef HAVE_LSTAT + /* Define if you have the memcpy function. */ #undef HAVE_MEMCPY @@ -138,9 +138,6 @@ /* Define if you have the strerror function. */ #undef HAVE_STRERROR -/* Define if you have the tempnam function. */ -#undef HAVE_TEMPNAM - /* Define if you have the ulltostr function. */ #undef HAVE_ULLTOSTR @@ -167,6 +164,12 @@ /* Define if you have the header file. */ #undef HAVE_SYS_SELECT_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_TIME_H + +/* Define if you have the m library (-lm). */ +#undef HAVE_LIBM /* Define if you have the www library (-lwww). */ #undef HAVE_LIBWWW diff -Naur xdvik-22.40n/texk/xdvik/configure xdvik-22.40o/texk/xdvik/configure --- xdvik-22.40n/texk/xdvik/configure Sat Sep 14 00:24:48 2002 +++ xdvik-22.40o/texk/xdvik/configure Wed Oct 16 22:26:23 2002 @@ -25,10 +25,19 @@ ac_help="$ac_help --without-mkofm-default do not run mkofm if OFM file missing" ac_help="$ac_help + --with-mktexfmt-default run mktexfmt if format file missing" +ac_help="$ac_help + --with-mktextex-default run mktextex if TeX source missing" +ac_help="$ac_help --enable-multiplatform put executables in bin/PLATFORM" ac_help="$ac_help --with-x use the X Window System" ac_help="$ac_help + --enable-compile-warnings=[no/minimum/yes/maximum] + Turn on compiler warnings." +ac_help="$ac_help + --enable-iso-c Try to warn if code is not ISO C " +ac_help="$ac_help --with-x-toolkit=KIT use a toolkit (KIT=xaw/xaw3d/neXtaw)" ac_help="$ac_help --with-ps=PS use PostScript; default gs (PS=no/yes/gs/dps/news)" @@ -581,7 +590,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:585: checking for $ac_word" >&5 +echo "configure:594: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -612,7 +621,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:616: checking for $ac_word" >&5 +echo "configure:625: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -664,7 +673,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:668: checking for $ac_word" >&5 +echo "configure:677: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -697,7 +706,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:701: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:710: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -708,12 +717,12 @@ cat > conftest.$ac_ext << EOF -#line 712 "configure" +#line 721 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -739,12 +748,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:743: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:752: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:748: checking whether we are using GNU C" >&5 +echo "configure:757: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -753,7 +762,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -772,7 +781,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:776: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:785: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -840,7 +849,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:844: checking for a BSD compatible install" >&5 +echo "configure:853: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -895,7 +904,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:899: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:908: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -922,7 +931,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:926: checking whether ln -s works" >&5 +echo "configure:935: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -944,10 +953,45 @@ echo "$ac_t""no" 1>&6 fi +echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +echo "configure:958: checking whether time.h and sys/time.h may both be included" >&5 +if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#include +#include +int main() { +struct tm *tp; +; return 0; } +EOF +if { (eval echo configure:972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_time=no +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_header_time" 1>&6 +if test $ac_cv_header_time = yes; then + cat >> confdefs.h <<\EOF +#define TIME_WITH_SYS_TIME 1 +EOF + +fi + echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:951: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:995: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -966,7 +1010,7 @@ echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6 -echo "configure:970: checking for loader (symbol LD)" >&5 +echo "configure:1014: checking for loader (symbol LD)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -980,7 +1024,7 @@ echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6 -echo "configure:984: checking for archiver (symbol AR)" >&5 +echo "configure:1028: checking for archiver (symbol AR)" >&5 if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -993,18 +1037,18 @@ echo "$ac_t""$AR" 1>&6 -echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 -echo "configure:998: checking for archiver options (symbol AR_OPTS)" >&5 -if eval "test \"`echo '$''{'cf_cv_subst_AR_OPTS'+set}'`\" = set"; then +echo $ac_n "checking for archiver options (symbol ARFLAGS)""... $ac_c" 1>&6 +echo "configure:1042: checking for archiver options (symbol ARFLAGS)" >&5 +if eval "test \"`echo '$''{'cf_cv_subst_ARFLAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -test -z "$AR_OPTS" && AR_OPTS=rc -cf_cv_subst_AR_OPTS=$AR_OPTS +test -z "$ARFLAGS" && ARFLAGS=rc +cf_cv_subst_ARFLAGS=$ARFLAGS fi -AR_OPTS=${cf_cv_subst_AR_OPTS} -echo "$ac_t""$AR_OPTS" 1>&6 +ARFLAGS=${cf_cv_subst_ARFLAGS} +echo "$ac_t""$ARFLAGS" 1>&6 @@ -1013,80 +1057,64 @@ withval="$with_mktexmf_default" : else - withval=yes + with_mktexmf_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_MF_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktexpk-default or --without-mktexpk-default was given. if test "${with_mktexpk_default+set}" = set; then withval="$with_mktexpk_default" : else - withval=yes + with_mktexpk_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_PK_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mktextfm-default or --without-mktextfm-default was given. if test "${with_mktextfm_default+set}" = set; then withval="$with_mktextfm_default" : else - withval=yes + with_mktextfm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_TEX_TFM_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkocp-default or --without-mkocp-default was given. if test "${with_mkocp_default+set}" = set; then withval="$with_mkocp_default" : else - withval=yes + with_mkocp_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OCP_BY_DEFAULT 1 -EOF - -fi # Check whether --with-mkofm-default or --without-mkofm-default was given. if test "${with_mkofm_default+set}" = set; then withval="$with_mkofm_default" : else - withval=yes + with_mkofm_default=yes fi -if test "x$withval" = xyes; then - cat >> confdefs.h <<\EOF -#define MAKE_OMEGA_OFM_BY_DEFAULT 1 -EOF +# Check whether --with-mktexfmt-default or --without-mktexfmt-default was given. +if test "${with_mktexfmt_default+set}" = set; then + withval="$with_mktexfmt_default" + : +fi +# Check whether --with-mktextex-default or --without-mktextex-default was given. +if test "${with_mktextex_default+set}" = set; then + withval="$with_mktextex_default" + with_mktextex_default=yes +else + with_mktextex_default=no fi + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1090: checking host system type" >&5 +echo "configure:1118: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1118,7 +1146,7 @@ echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 -echo "configure:1122: checking where the main texmf tree is located" >&5 +echo "configure:1150: checking where the main texmf tree is located" >&5 texmfmain= if test "x$datadir" != 'x${prefix}/share'; then # First case, datadir is defined... @@ -1152,6 +1180,13 @@ if test -n "$texmfmain"; then echo "$ac_t"""$texmfmain"" 1>&6 else + ### SU: added using `kpsewhich' as last fallback before giving up; since + ### xdvik is most likely to be installed with an *existing* kpathsearch + ### system, this seemed reasonable to me. + texmfmain=`kpsewhich --expand-path='$TEXMFMAIN' 2>/dev/null | sed 's,//*,/,g'` + if test -d "$texmfmain"; then + echo "$ac_t"""$texmfmain"" 1>&6 + else eval texmfmain="$datadir/texmf" echo "$ac_t""not found" 1>&6 echo "configure: warning: The main texmf tree was not found. @@ -1161,12 +1196,13 @@ in systems/web2c. Winging it by using the default location $texmfmain." 1>&2 fi + fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1170: checking how to run the C preprocessor" >&5 +echo "configure:1206: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1181,13 +1217,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1198,13 +1234,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1215,13 +1251,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1246,12 +1282,12 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1250: checking for ANSI C header files" >&5 +echo "configure:1286: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1259,7 +1295,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1276,7 +1312,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1294,7 +1330,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1315,7 +1351,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1326,7 +1362,7 @@ exit (0); } EOF -if { (eval echo configure:1330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1350,12 +1386,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1354: checking for pid_t" >&5 +echo "configure:1390: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1384,17 +1420,17 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:1388: checking for vfork.h" >&5 +echo "configure:1424: checking for vfork.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1419,18 +1455,18 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:1423: checking for working vfork" >&5 +echo "configure:1459: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:1429: checking for vfork" >&5 +echo "configure:1465: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -1475,7 +1511,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext < @@ -1570,7 +1606,7 @@ } } EOF -if { (eval echo configure:1574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -1593,12 +1629,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1597: checking for vprintf" >&5 +echo "configure:1633: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1645,12 +1681,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1649: checking for _doprnt" >&5 +echo "configure:1685: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -1699,12 +1735,12 @@ # begin additions SU, 2000/03/07 echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:1703: checking for vsnprintf" >&5 +echo "configure:1739: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'xdvi_cv_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1712,7 +1748,7 @@ (void)vsnprintf((char *)NULL, 0, (char *)NULL, NULL); ; return 0; } EOF -if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xdvi_cv_vsnprintf=yes else @@ -1732,12 +1768,12 @@ fi echo $ac_n "checking for realpath""... $ac_c" 1>&6 -echo "configure:1736: checking for realpath" >&5 +echo "configure:1772: checking for realpath" >&5 if eval "test \"`echo '$''{'xdvi_cv_realpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1745,7 +1781,7 @@ (void)realpath((const char *)NULL, NULL); ; return 0; } EOF -if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xdvi_cv_realpath=yes else @@ -1767,19 +1803,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1771: checking for working alloca.h" >&5 +echo "configure:1807: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1800,12 +1836,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1804: checking for alloca" >&5 +echo "configure:1840: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1865,12 +1901,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1869: checking whether alloca needs Cray hooks" >&5 +echo "configure:1905: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1899: checking for $ac_func" >&5 +echo "configure:1935: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1950,7 +1986,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1954: checking stack direction for C alloca" >&5 +echo "configure:1990: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1958,7 +1994,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2000,7 +2036,7 @@ # end additions SU echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2004: checking for 8-bit clean memcmp" >&5 +echo "configure:2040: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2008,7 +2044,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2036,12 +2072,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2040: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2076: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2057,7 +2093,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2078,12 +2114,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2082: checking return type of signal handlers" >&5 +echo "configure:2118: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2100,7 +2136,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2119,14 +2155,14 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2123: checking whether byte ordering is bigendian" >&5 +echo "configure:2159: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -2137,11 +2173,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:2141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -2152,7 +2188,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:2156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2172,7 +2208,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2215,7 +2251,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:2219: checking for X" >&5 +echo "configure:2255: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -2277,12 +2313,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2351,14 +2387,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2466,17 +2502,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:2470: checking whether -R must be followed by a space" >&5 +echo "configure:2506: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -2492,14 +2528,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -2537,7 +2573,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2541: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2577: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2545,7 +2581,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2578,7 +2614,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:2582: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2618: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2586,7 +2622,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2626,12 +2662,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2630: checking for gethostbyname" >&5 +echo "configure:2666: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2675,7 +2711,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2679: checking for gethostbyname in -lnsl" >&5 +echo "configure:2715: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2683,7 +2719,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2724,12 +2760,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:2728: checking for connect" >&5 +echo "configure:2764: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2773,7 +2809,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2777: checking for connect in -lsocket" >&5 +echo "configure:2813: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2781,7 +2817,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2816,12 +2852,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2820: checking for remove" >&5 +echo "configure:2856: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2865,7 +2901,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2869: checking for remove in -lposix" >&5 +echo "configure:2905: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2873,7 +2909,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2908,12 +2944,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2912: checking for shmat" >&5 +echo "configure:2948: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2957,7 +2993,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2961: checking for shmat in -lipc" >&5 +echo "configure:2997: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2965,7 +3001,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3009,7 +3045,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:3013: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3049: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3017,7 +3053,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3053,12 +3089,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3057: checking for size_t" >&5 +echo "configure:3093: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3088,12 +3124,12 @@ # XDVI checks by Paul Vojta echo $ac_n "checking whether C compiler supports string concatenation""... $ac_c" 1>&6 -echo "configure:3092: checking whether C compiler supports string concatenation" >&5 +echo "configure:3128: checking whether C compiler supports string concatenation" >&5 if eval "test \"`echo '$''{'xdvi_cc_concat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3102,7 +3138,7 @@ ; return 0; } EOF -if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* xdvi_cc_concat=yes else @@ -3122,7 +3158,7 @@ fi echo $ac_n "checking for integer type to use in bitmaps""... $ac_c" 1>&6 -echo "configure:3126: checking for integer type to use in bitmaps" >&5 +echo "configure:3162: checking for integer type to use in bitmaps" >&5 if eval "test \"`echo '$''{'xdvi_cv_bitmap_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3130,7 +3166,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -3148,7 +3184,7 @@ exit(0); } EOF -if { (eval echo configure:3152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then xdvi_cv_bitmap_type="`cat conftestval`" else @@ -3173,12 +3209,12 @@ echo "$ac_t""unsigned $BMTYPE, size = $BMBYTES" 1>&6 echo $ac_n "checking for stropts.h and isastream()""... $ac_c" 1>&6 -echo "configure:3177: checking for stropts.h and isastream()" >&5 +echo "configure:3213: checking for stropts.h and isastream()" >&5 if eval "test \"`echo '$''{'xdvi_cv_sys_streams'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3190,7 +3226,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xdvi_cv_sys_streams=yes else @@ -3210,7 +3246,7 @@ fi echo $ac_n "checking for SunOS 4""... $ac_c" 1>&6 -echo "configure:3214: checking for SunOS 4" >&5 +echo "configure:3250: checking for SunOS 4" >&5 if eval "test \"`echo '$''{'xdvi_cv_sys_sunos_4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3229,12 +3265,12 @@ fi echo $ac_n "checking for poll.h and poll()""... $ac_c" 1>&6 -echo "configure:3233: checking for poll.h and poll()" >&5 +echo "configure:3269: checking for poll.h and poll()" >&5 if eval "test \"`echo '$''{'xdvi_cv_func_poll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3242,7 +3278,7 @@ poll((struct pollfd *) 0, 0, 0); ; return 0; } EOF -if { (eval echo configure:3246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xdvi_cv_func_poll=yes else @@ -3265,17 +3301,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3269: checking for $ac_hdr" >&5 +echo "configure:3305: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3303,6 +3339,76 @@ fi +# SU: added flags to turn on gcc warnings, taken from gnome/compiler-flags.m4 and put into aclocal.m4 + + # Check whether --enable-compile-warnings or --disable-compile-warnings was given. +if test "${enable_compile_warnings+set}" = set; then + enableval="$enable_compile_warnings" + : +else + enable_compile_warnings=minimum +fi + + + echo $ac_n "checking what warning flags to pass to the C compiler""... $ac_c" 1>&6 +echo "configure:3355: checking what warning flags to pass to the C compiler" >&5 + warnCFLAGS= + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi + + if test "x$enable_compile_warnings" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *\ \ -Wall\ \ *) ;; + *) warnCFLAGS="-W -Wall -Wunused" ;; + esac + + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_compile_warnings" = "xyes"; then + warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations" + elif test "x$enable_compile_warnings" = "xmaximum"; then + ## just turn on about everything: + warnCFLAGS="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wimplicit -Wparentheses -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings" + fi + fi + fi + echo "$ac_t""$warnCFLAGS" 1>&6 + + # Check whether --enable-iso-c or --disable-iso-c was given. +if test "${enable_iso_c+set}" = set; then + enableval="$enable_iso_c" + : +else + enable_iso_c=no +fi + + + echo $ac_n "checking what language compliance flags to pass to the C compiler""... $ac_c" 1>&6 +echo "configure:3390: checking what language compliance flags to pass to the C compiler" >&5 + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *\ \ -ansi\ \ *) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + + case " $CFLAGS " in + *\ \ -pedantic\ \ *) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + echo "$ac_t""$complCFLAGS" 1>&6 + if test "x$cflags_set" != "xyes"; then + CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS" + cflags_set=yes + + fi + + # These were probably missing from the test-set? # On the other hand, they are not used already, why start now? -janl # AC_TYPE_OFF_T @@ -3311,12 +3417,12 @@ for ac_func in mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr fchdir getcwd lstat do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3315: checking for $ac_func" >&5 +echo "configure:3421: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3365,21 +3471,21 @@ # is for ISC 4.0, to define fd_set in psgs.c. -for ac_hdr in netdb.h sys/bsdtypes.h X11/Xosdefs.h sys/fcntl.h +for ac_hdr in netdb.h sys/bsdtypes.h sys/time.h X11/Xosdefs.h sys/fcntl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3373: checking for $ac_hdr" >&5 +echo "configure:3479: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3552,7 +3658,7 @@ # Extract the first word of "pwd", so it can be a program name with args. set dummy pwd; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3556: checking for $ac_word" >&5 +echo "configure:3662: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BINPWD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3701,7 +3807,7 @@ # Extract the first word of "$libwww_config", so it can be a program name with args. set dummy $libwww_config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3705: checking for $ac_word" >&5 +echo "configure:3811: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LIBWWW_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3777,17 +3883,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3781: checking for $ac_hdr" >&5 +echo "configure:3887: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3832,7 +3938,7 @@ LDLIBWWW=-lwww libwww_libdir_found=yes echo $ac_n "checking for HTParse in -lwww""... $ac_c" 1>&6 -echo "configure:3836: checking for HTParse in -lwww" >&5 +echo "configure:3942: checking for HTParse in -lwww" >&5 ac_lib_var=`echo www'_'HTParse | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3840,7 +3946,7 @@ ac_save_LIBS="$LIBS" LIBS="-lwww $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3953,7 +4059,7 @@ if test "$with_system_t1lib" = yes; then echo $ac_n "checking for T1_AddFont in -lt1""... $ac_c" 1>&6 -echo "configure:3957: checking for T1_AddFont in -lt1" >&5 +echo "configure:4063: checking for T1_AddFont in -lt1" >&5 ac_lib_var=`echo t1'_'T1_AddFont | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3961,7 +4067,7 @@ ac_save_LIBS="$LIBS" LIBS="-lt1 -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3999,13 +4105,13 @@ LDFLAGS="$LDFLAGS $EXTRA_LIBT1_LIBDIR -lt1 -lm" if test "$with_system_t1lib" = yes; then echo $ac_n "checking whether installed T1 lib is >= v 1.3.1 ""... $ac_c" 1>&6 -echo "configure:4003: checking whether installed T1 lib is >= v 1.3.1 " >&5 +echo "configure:4109: checking whether installed T1 lib is >= v 1.3.1 " >&5 if test "$cross_compiling" = yes; then ac_compile_t1lib=1 ] else cat > conftest.$ac_ext < @@ -4036,7 +4142,7 @@ } EOF -if { (eval echo configure:4040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_compile_t1lib=0 else @@ -4089,7 +4195,7 @@ XLFLAG= fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:4093: checking for XextCreateExtension in -lXext" >&5 +echo "configure:4199: checking for XextCreateExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4097,7 +4203,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext -lX11 $X_EXTRA_LIBS $XLFLAG $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4164,7 +4270,7 @@ echo "$ac_t""adding DPS includes and libraries for Solaris" 1>&6 X_CFLAGS="$X_CFLAGS -I/usr/openwin/include/X11" echo $ac_n "checking for isinf in -lsunmath""... $ac_c" 1>&6 -echo "configure:4168: checking for isinf in -lsunmath" >&5 +echo "configure:4274: checking for isinf in -lsunmath" >&5 ac_lib_var=`echo sunmath'_'isinf | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4172,7 +4278,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsunmath $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4210,12 +4316,12 @@ for ac_func in isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4214: checking for $ac_func" >&5 +echo "configure:4320: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4266,17 +4372,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4270: checking for $ac_hdr" >&5 +echo "configure:4376: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4314,7 +4420,7 @@ # needed for web2c later than 7.3.4: echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:4318: checking for main in -lm" >&5 +echo "configure:4424: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4322,14 +4428,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4499,7 +4605,7 @@ s%@MAINT@%$MAINT%g s%@LD@%$LD%g s%@AR@%$AR%g -s%@AR_OPTS@%$AR_OPTS%g +s%@ARFLAGS@%$ARFLAGS%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -4513,6 +4619,7 @@ s%@X_PRE_LIBS@%$X_PRE_LIBS%g s%@X_LIBS@%$X_LIBS%g s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g +s%@cflags_set@%$cflags_set%g s%@LDT1LIB@%$LDT1LIB%g s%@BINPWD@%$BINPWD%g s%@LIBWWW_CONFIG@%$LIBWWW_CONFIG%g diff -Naur xdvik-22.40n/texk/xdvik/configure.in xdvik-22.40o/texk/xdvik/configure.in --- xdvik-22.40n/texk/xdvik/configure.in Sat Sep 14 00:24:48 2002 +++ xdvik-22.40o/texk/xdvik/configure.in Mon Oct 14 23:05:48 2002 @@ -8,6 +8,7 @@ AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_LN_S +AC_HEADER_TIME sinclude(../kpathsea/withenable.ac) @@ -34,6 +35,9 @@ XDVI_SYS_SUNOS_4 XDVI_FUNC_POLL +# SU: added flags to turn on gcc warnings, taken from gnome/compiler-flags.m4 and put into aclocal.m4 +COMPILER_WARNINGS + # These were probably missing from the test-set? # On the other hand, they are not used already, why start now? -janl # AC_TYPE_OFF_T @@ -42,7 +46,7 @@ AC_CHECK_FUNCS(mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr fchdir getcwd lstat) # is for ISC 4.0, to define fd_set in psgs.c. -AC_CHECK_HEADERS(netdb.h sys/bsdtypes.h X11/Xosdefs.h sys/fcntl.h) +AC_CHECK_HEADERS(netdb.h sys/bsdtypes.h sys/time.h X11/Xosdefs.h sys/fcntl.h) # For the bitmap size. -- I think this is in XDVI_C_BITMAP_TYPE now -janl # AC_CHECK_SIZEOF(long) diff -Naur xdvik-22.40n/texk/xdvik/depend.mk xdvik-22.40o/texk/xdvik/depend.mk --- xdvik-22.40n/texk/xdvik/depend.mk Mon Sep 16 10:10:50 2002 +++ xdvik-22.40o/texk/xdvik/depend.mk Wed Oct 16 22:26:23 2002 @@ -1,180 +1,83 @@ alloca.o: alloca.c c-auto.h -dvi-draw.o: dvi-draw.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ +dvi-draw.o: dvi-draw.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/c-stat.h \ $(kpathsea_srcdir)/magstep.h $(kpathsea_srcdir)/tex-file.h dvi.h string-utils.h -dvi-init.o: dvi-init.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ +dvi-init.o: dvi-init.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/c-stat.h $(kpathsea_srcdir)/magstep.h \ - $(kpathsea_srcdir)/tex-glyph.h $(kpathsea_srcdir)/tex-file.h dvi.h string-utils.h -dvips.o: dvips.c xdvi-config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ - $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h $(kpathsea_srcdir)/c-minmax.h \ - $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ - $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h xdvi.h \ - $(kpathsea_srcdir)/c-vararg.h message-window.h $(kpathsea_srcdir)/tex-file.h -events.o: events.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ + $(kpathsea_srcdir)/tex-glyph.h dvi.h string-utils.h +dvips.o: dvips.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ + $(kpathsea_srcdir)/tex-file.h +events.o: events.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ string-utils.h -font-open.o: font-open.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ - $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/tex-glyph.h $(kpathsea_srcdir)/tex-file.h -gf.o: gf.c xdvi-config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ - $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h $(kpathsea_srcdir)/c-minmax.h \ - $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ - $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h xdvi.h \ - $(kpathsea_srcdir)/c-vararg.h message-window.h -help-window.o: help-window.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ +font-open.o: font-open.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ + $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/tex-glyph.h +gf.o: gf.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ + c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h +help-window.o: help-window.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ version.h -hypertex.o: hypertex.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ +hypertex.o: hypertex.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/c-stat.h \ version.h string-utils.h -message-window.o: message-window.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ - my-vsnprintf.h -mime.o: mime.c xdvi-config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ - $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h $(kpathsea_srcdir)/c-minmax.h \ - $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ - $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h xdvi.h \ - $(kpathsea_srcdir)/c-vararg.h message-window.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/variable.h -my-vsnprintf.o: my-vsnprintf.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ +message-window.o: message-window.c xdvi-config.h xdvi.h \ + $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h c-auto.h \ + $(kpathsea_srcdir)/c-vararg.h message-window.h my-vsnprintf.h +mime.o: mime.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ + $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/variable.h +my-vsnprintf.o: my-vsnprintf.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ my-vsnprintf.h -pk.o: pk.c xdvi-config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ - $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h $(kpathsea_srcdir)/c-minmax.h \ - $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ - $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h xdvi.h \ - $(kpathsea_srcdir)/c-vararg.h message-window.h +pk.o: pk.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ + c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h psdps.o: psdps.c -psgs.o: psgs.c xdvi-config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ - $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h $(kpathsea_srcdir)/c-minmax.h \ - $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ - $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h xdvi.h \ - $(kpathsea_srcdir)/c-vararg.h message-window.h $(kpathsea_srcdir)/c-pathmx.h +psgs.o: psgs.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ + $(kpathsea_srcdir)/c-pathmx.h psheader.o: psheader.c psnews.o: psnews.c sfDir.o: sfDir.c c-auto.h sfinternal.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/c-dir.h $(kpathsea_srcdir)/c-stat.h + $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-dir.h $(kpathsea_srcdir)/c-stat.h sfDraw.o: sfDraw.c c-auto.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ - $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h $(kpathsea_srcdir)/c-minmax.h \ - $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ - $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ $(kpathsea_srcdir)/c-stat.h sfinternal.h sfPath.o: sfPath.c c-auto.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ - $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h $(kpathsea_srcdir)/c-minmax.h \ - $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ - $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \ - $(kpathsea_srcdir)/c-stat.h sfinternal.h -sfSelFile.o: sfSelFile.c c-auto.h xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ $(kpathsea_srcdir)/c-stat.h sfinternal.h -special.o: special.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ +sfSelFile.o: sfSelFile.c c-auto.h xdvi-config.h xdvi.h \ + $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-vararg.h \ + message-window.h $(kpathsea_srcdir)/c-stat.h sfinternal.h +special.o: special.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/c-stat.h \ $(kpathsea_srcdir)/line.h $(kpathsea_srcdir)/tex-file.h dvi.h squeeze.o: squeeze.c $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-memstr.h -statusline.o: statusline.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ +statusline.o: statusline.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ version.h statusline.h my-vsnprintf.h -string-utils.o: string-utils.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ +string-utils.o: string-utils.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ string-utils.h -tfmload.o: tfmload.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ +tfmload.o: tfmload.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ $(kpathsea_srcdir)/tex-file.h -util.o: util.c xdvi-config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ - $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h $(kpathsea_srcdir)/c-minmax.h \ - $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ - $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h xdvi.h \ - $(kpathsea_srcdir)/c-vararg.h message-window.h $(kpathsea_srcdir)/c-ctype.h \ - $(kpathsea_srcdir)/c-fopen.h -vf.o: vf.c xdvi-config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ - $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h $(kpathsea_srcdir)/c-minmax.h \ - $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ - $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h xdvi.h \ - $(kpathsea_srcdir)/c-vararg.h message-window.h dvi.h -wwwfetch.o: wwwfetch.c xdvi-config.h $(kpathsea_dir)/c-auto.h \ - $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h \ - $(kpathsea_srcdir)/systypes.h $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h \ - $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h \ - $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h \ - $(kpathsea_srcdir)/progname.h xdvi.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ +util.o: util.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ + $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/c-fopen.h +vf.o: vf.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ + c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h dvi.h +wwwfetch.o: wwwfetch.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/c-stat.h \ statusline.h -xdvi.o: xdvi.c xdvi-config.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \ - $(kpathsea_srcdir)/c-std.h $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \ - $(kpathsea_srcdir)/c-memstr.h $(kpathsea_srcdir)/c-errno.h $(kpathsea_srcdir)/c-minmax.h \ - $(kpathsea_srcdir)/c-limits.h $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \ - $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h xdvi.h \ - $(kpathsea_srcdir)/c-vararg.h message-window.h c-openmx.h \ - $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/c-pathch.h \ - $(kpathsea_srcdir)/c-stat.h $(kpathsea_srcdir)/proginit.h $(kpathsea_srcdir)/tex-file.h \ - $(kpathsea_srcdir)/tex-hush.h $(kpathsea_srcdir)/tex-make.h string-utils.h \ +xdvi.o: xdvi.c xdvi-config.h xdvi.h $(kpathsea_dir)/c-auto.h \ + $(kpathsea_srcdir)/config.h c-auto.h $(kpathsea_srcdir)/c-vararg.h message-window.h \ + c-openmx.h $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/c-fopen.h \ + $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-stat.h $(kpathsea_srcdir)/proginit.h \ + $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/tex-hush.h $(kpathsea_srcdir)/tex-make.h \ + string-utils.h \ krheader.h version.h xdvi.icon diff -Naur xdvik-22.40n/texk/xdvik/dvi-draw.c xdvik-22.40o/texk/xdvik/dvi-draw.c --- xdvik-22.40n/texk/xdvik/dvi-draw.c Sat Sep 14 23:18:43 2002 +++ xdvik-22.40o/texk/xdvik/dvi-draw.c Tue Oct 15 21:15:02 2002 @@ -49,7 +49,7 @@ #endif #define BUF_SIZE 1024 - +typedef enum { FAILURE_BLANK = -2, FAILURE_PK = -1, SUCCESS = 0 } t1font_load_status_t; #ifdef T1LIB #define PRIVATE static @@ -171,6 +171,17 @@ char *pathname; /* Full path of the font, once needed and located */ int tfmidx; /* Index in tfminfo array, or -1 */ Boolean warned_about; /* whether a warning message about this font has been displayed yet */ + /* + if the font file was not readable for some reason (e.g. corrupt, + or encrypted for proprietry distribution), load_font_now() will + try to load a PK version via load_font() instead. If this is + successful, it will set force_pk to true, which will tell + get_t1_glyph() to return immediately, and just use the standard + set_char() routine to set the PK glyph. If even that fails, + get_t1_glyph() returns an error status in a special flag that's + evaluated by set_t1_char(). + */ + Boolean force_pk; } fontmap; PRIVATE fontmap *fontmaps; @@ -210,7 +221,7 @@ PRIVATE int wlidx = -1; /* For file reading */ -#define BUFFER_SIZE 512 +#define BUFFER_SIZE 1024 /* This is the conversion factor from TeXs pt to TeXs bp (big point). Maximum machine precision is needed to keep it accurate. */ @@ -231,14 +242,11 @@ int padMismatch=0; /* Does t1lib padding match xdvi required padding? */ int archpad; -PRIVATE void load_font_now(int idx); - -PRIVATE struct glyph *get_t1_glyph +PRIVATE struct glyph *get_t1_glyph( #ifdef TEXXET -(wide_ubyte cmd, wide_ubyte ch); -#else -(wide_ubyte ch); + wide_ubyte cmd, #endif + wide_ubyte ch, t1font_load_status_t *flag); #ifdef WORDS_BIGENDIAN unsigned char rbits[] = { @@ -594,10 +602,7 @@ /* HTEX needs this to be non-static -janl */ void -put_rule(highlight, x, y, w, h) - Boolean highlight; - int x, y; - unsigned int w, h; +put_rule(Boolean highlight, int x, int y, unsigned int w, unsigned int h) { if (x < max_x && x + (int)w >= min_x && y < max_y && y + (int)h >= min_y) { if (--event_counter == 0) { @@ -615,9 +620,7 @@ } static void -put_bitmap(bitmap, x, y) - struct bitmap *bitmap; - int x, y; +put_bitmap(struct bitmap *bitmap, int x, int y) { #ifdef HTEX @@ -653,9 +656,7 @@ #ifdef GREY static void -put_image(g, x, y) - struct glyph *g; - int x, y; +put_image(struct glyph *g, int x, int y) { XImage *img = g->image2; @@ -690,10 +691,7 @@ */ static void -put_border(x, y, width, height, ourGC) - int x, y; - unsigned int width, height; - GC ourGC; +put_border(int x, int y, unsigned int width, unsigned int height, GC ourGC) { --width; @@ -705,10 +703,7 @@ #ifdef GRID /* drawing grid */ void -put_grid(x, y, width, height, unit, gc) - int x, y; - unsigned int width, height, unit; - GC gc; +put_grid(int x, int y, unsigned int width, unsigned int height, unsigned int unit, GC gc) { int i; /* looping variable */ float sep; /* grid separation */ @@ -719,15 +714,15 @@ /* drawing vertial grid */ -#define DRAWGRID_VER(gc) for (i=1; \ - (tmp=x+(int) (((float) i)*sep)) < x+width; \ - i++) \ - XFillRectangle(DISP, currwin.win, (gc), \ +#define DRAWGRID_VER(gc) for (i = 1; \ + (tmp = x + (int)(i * sep)) < (int)(x + width); \ + i++) \ + XFillRectangle(DISP, currwin.win, (gc), \ tmp, y, 1, height) - /* drawing horizontal grid */ -#define DRAWGRID_HOR(gc) for (i=1; \ - (tmp=y+(int) (((float) i)*sep)) < y+height; \ - i++) \ + /* draw horizontal grid */ +#define DRAWGRID_HOR(gc) for (i = 1; \ + (tmp = y + (int)(i * sep)) < (int)(y + height); \ + i++) \ XFillRectangle(DISP, currwin.win, (gc), \ x, tmp, width, 1) @@ -760,7 +755,7 @@ (currinf.end - (pos))) static ubyte -xxone() +xxone(void) { if (currinf.virtual) { ++currinf.pos; @@ -774,8 +769,7 @@ #define xone() (currinf.pos < currinf.end ? *(currinf.pos)++ : xxone()) static unsigned long -xnum(size) - ubyte size; +xnum(ubyte size) { long x = 0; @@ -785,8 +779,7 @@ } static long -xsnum(size) - ubyte size; +xsnum(ubyte size) { long x; @@ -805,8 +798,7 @@ #define xsfour() xsnum(4) static void -xskip(offset) - long offset; +xskip(long offset) { currinf.pos += offset; if (!currinf.virtual && currinf.pos > currinf.end) @@ -815,18 +807,19 @@ } static NORETURN void -tell_oops PVAR1C(_Xconst char *, message, args) +tell_oops(_Xconst char * message, ...) { - Fprintf(stderr, "%s: ", prog); - + va_list args; + va_start(args, message); + fprintf(stderr, "%s: ", prog); (void)vfprintf(stderr, message, args); va_end(args); if (currinf.virtual) - Fprintf(stderr, " in virtual font %s\n", currinf.virtual->fontname); + fprintf(stderr, " in virtual font %s\n", currinf.virtual->fontname); else - Fprintf(stderr, ", offset %ld\n", xtell(currinf.pos - 1)); + fprintf(stderr, ", offset %ld\n", xtell(currinf.pos - 1)); xdvi_exit(1); -}} +} /* @@ -834,8 +827,7 @@ */ static void -print_bitmap(bitmap) - struct bitmap *bitmap; +print_bitmap(struct bitmap *bitmap) { BMUNIT *ptr = (BMUNIT *) bitmap->bits; int x, y, i; @@ -859,9 +851,7 @@ } static void -print_char(ch, g) - ubyte ch; - struct glyph *g; +print_char(ubyte ch, struct glyph *g) { Printf("char %d", ch); if (ISPRINT(ch)) @@ -891,8 +881,7 @@ }; static void -print_dvi(ch) - ubyte ch; +print_dvi(ubyte ch) { _Xconst char *s; @@ -928,9 +917,7 @@ }; static int -sample(bits, bytes_wide, bit_skip, w, h) - BMUNIT *bits; - int bytes_wide, bit_skip, w, h; +sample(BMUNIT *bits, int bytes_wide, int bit_skip, int w, int h) { BMUNIT *ptr, *endp; BMUNIT *cp; @@ -981,8 +968,7 @@ } static void -shrink_glyph(g) - struct glyph *g; +shrink_glyph(struct glyph *g) { int shrunk_bytes_wide, shrunk_height; int rows_left, rows, init_cols; @@ -1066,8 +1052,7 @@ #ifdef GREY static void -shrink_glyph_grey(g) - struct glyph *g; +shrink_glyph_grey(struct glyph *g) { int rows_left, rows, init_cols; int cols_left; @@ -1159,8 +1144,7 @@ */ static void -change_font(n) - unsigned long n; +change_font(unsigned long n) { struct tn *tnp; @@ -1188,8 +1172,7 @@ */ static void -open_font_file(fontp) - struct font *fontp; +open_font_file(struct font *fontp) { if (fontp->file == NULL) { fontp->file = xfopen_local(fontp->filename, OPEN_MODE); @@ -1204,8 +1187,7 @@ */ static char * -read_special(nbytes) - long nbytes; +read_special(long nbytes) { static char *spcl = NULL; static long spcl_len = -1; @@ -1288,8 +1270,7 @@ */ static void -spcl_scan(spcl_proc) - void (*spcl_proc) ARGS((char *)); +spcl_scan(void (*spcl_proc)(char *)) { ubyte ch; ubyte n; @@ -1344,7 +1325,7 @@ */ static void -prescan() +prescan(void) { int nextreportpage; @@ -1492,6 +1473,8 @@ static void set_empty_char(wide_ubyte cmd, wide_ubyte ch) { + UNUSED(ch); + UNUSED(cmd); return; } #endif @@ -1504,9 +1487,9 @@ load_n_set_char(wide_ubyte cmd, wide_ubyte ch) #endif { - if (load_font(currinf.fontp)) { /* if not found */ + if (!load_font(currinf.fontp)) { /* if not found */ /* FIXME: replace by GUI warning! */ - Fputs("Character(s) will be left blank.\n", stderr); + fprintf(stderr, "Character(s) will be left blank.\n"); currinf.set_char_p = currinf.fontp->set_char_p = set_empty_char; #if 0 //TODO SU: following not used in xdvi @@ -1630,8 +1613,7 @@ */ static void -set_rule(h, w) - int h, w; +set_rule(int h, int w) { #ifndef TEXXET put_rule(False, PXL_H, PXL_V - h + 1, (unsigned int)w, (unsigned int)h); @@ -1650,9 +1632,7 @@ #define xspell_conv(n) spell_conv0(n, current_dimconv) static void -draw_part(minframe, current_dimconv) - struct frame *minframe; - double current_dimconv; +draw_part(struct frame *minframe, double current_dimconv) { ubyte ch; #ifdef TEXXET @@ -1978,8 +1958,10 @@ dvi_pointer_frame = &currinf; #ifdef HTEX htex_initpage(); /* Start up the hypertext stuff for this page */ +#ifdef PS_GS FIXME_ps_lock = FALSE; #endif +#endif psfig_begun = False; draw_part(current_frame = &frame0, dimconv); dvi_pointer_frame = NULL; @@ -2009,7 +1991,7 @@ /* Parse dvi pages not yet scanned by xdvi, searching for html anchors */ void -htex_parsepages() +htex_parsepages(void) { int i; if (debug & DBG_HYPER) @@ -2023,8 +2005,7 @@ } Boolean -htex_parse_page(i) - int i; +htex_parse_page(int i) { if (debug & DBG_HYPER) fprintf(stderr, "htex_parse_page called for %d\n", i); @@ -2065,8 +2046,7 @@ do anything other than record html anchors */ /* Assumes page has been set up properly as above */ void -htex_scanpage(pageno) - int pageno; +htex_scanpage(int pageno) { ubyte ch; long a; @@ -2186,9 +2166,7 @@ /* Do the same same stuff as special() in dvi_draw.c */ /* But only check HTeX specials */ void -htex_dospecial(nbytes, pageno) - long nbytes; - int pageno; +htex_dospecial(long nbytes, int pageno) { static char *cmd = NULL; static long cmdlen = -1; @@ -2274,9 +2252,7 @@ */ static long -geom_do_char(g_info, ch) - struct geom_info *g_info; - wide_ubyte ch; +geom_do_char(struct geom_info *g_info, wide_ubyte ch) { if (currinf.set_char_p == set_no_char) { if (currinf.virtual == NULL @@ -2290,9 +2266,9 @@ return 0; /* error; we'll catch it later */ if (currinf.set_char_p == load_n_set_char) { - if (load_font(currinf.fontp)) { /* if not found */ + if (!load_font(currinf.fontp)) { /* if not found */ /* FIXME: replace by GUI warning! */ - Fputs("Character(s) will be left blank.\n", stderr); + fprintf(stderr, "Character(s) will be left blank.\n"); currinf.set_char_p = currinf.fontp->set_char_p = set_empty_char; return 0; } @@ -2374,16 +2350,19 @@ #ifdef T1LIB else if (currinf.set_char_p == set_t1_char) { struct glyph *g ; - long x,y; + long x, y; + t1font_load_status_t dummy; #ifdef TEXXET - g = get_t1_glyph(0, ch); + g = get_t1_glyph(0, ch, &dummy); + assert(g != NULL); if (geom_scan_frame == NULL) { long dvi_h_sav = DVI_H; if (currinf.dir < 0) DVI_H -= g->dvi_adv; #else - g = get_t1_glyph(ch); + g = get_t1_glyph(ch, &dummy); + assert(g != NULL); #endif x = G_PXL_H - g->x; y = PXL_V - g->y; @@ -2408,9 +2387,7 @@ */ static void -geom_do_rule(g_info, h, w) - struct geom_info *g_info; - long h, w; +geom_do_rule(struct geom_info *g_info, long h, long w) { long x, y; #ifdef TEXXET @@ -2436,10 +2413,7 @@ */ static void -geom_scan_part(g_info, minframe, current_dimconv) - struct geom_info *g_info; - struct frame *minframe; - double current_dimconv; +geom_scan_part(struct geom_info *g_info, struct frame *minframe, double current_dimconv) { ubyte ch; #ifdef TEXXET @@ -2661,7 +2635,7 @@ case XXX4: a = xnum(ch - XXX1 + 1); if (a > 0) { - _Xconst char *str = read_special(a); + char *str = read_special(a); /* process the bounding box */ geom_do_special(g_info, str, current_dimconv); @@ -2702,10 +2676,9 @@ */ static void -geom_scan(g_info) - struct geom_info *g_info; +geom_scan(struct geom_info *g_info) { - off_t pos_save = 0; + volatile off_t pos_save = 0; struct drawinf currinf_save; ubyte maxchar_save; @@ -2772,9 +2745,7 @@ }; static void -src_parse(str, parsed) - _Xconst char *str; - struct src_parsed_special *parsed; +src_parse(_Xconst char *str, struct src_parsed_special *parsed) { _Xconst char *p; @@ -2812,9 +2783,7 @@ } static void -src_spec_box(g_info, ulx, uly, lrx, lry) - struct geom_info *g_info; - long ulx, uly, lrx, lry; +src_spec_box(struct geom_info *g_info, long ulx, long uly, long lrx, long lry) { struct src_spec_data *data = g_info->geom_data; unsigned long distance; @@ -2862,9 +2831,7 @@ static Boolean src_fwd_active; static void -src_spec_special(g_info, str) - struct geom_info *g_info; - _Xconst char *str; +src_spec_special(struct geom_info *g_info, _Xconst char *str) { struct src_spec_data *data = g_info->geom_data; @@ -2910,8 +2877,7 @@ static jmp_buf scan_env; static void -scan_first_src_spcl(str) - char *str; +scan_first_src_spcl(char *str) { if (memcmp(str, "src:", 4) != 0) return; @@ -2922,8 +2888,7 @@ } static void -scan_last_src_spcl(str) - char *str; +scan_last_src_spcl(char *str) { if (memcmp(str, "src:", 4) != 0) return; @@ -2934,9 +2899,7 @@ #if !HAVE_ULLTOSTR static char * -ulltostr(value, p) - unsigned int value; - char *p; +ulltostr(unsigned int value, char *p) { do *--p = value % 10 + '0'; @@ -2970,9 +2933,7 @@ *------------------------------------------------------------*/ static char * -src_find_file(filename, statbuf) - char *filename; - struct stat *statbuf; +src_find_file(char *filename, struct stat *statbuf) { char *tmp; @@ -3044,8 +3005,7 @@ } static void -src_spawn_editor(parsed) - _Xconst struct src_parsed_special *parsed; +src_spawn_editor(_Xconst struct src_parsed_special *parsed) { #if HAVE_ULLTOSTR char scr_str[5 * sizeof(unsigned long long) / 2]; @@ -3235,9 +3195,7 @@ */ void -source_reverse_search(x, y, call_editor) - int x, y; - wide_bool call_editor; +source_reverse_search(int x, int y, wide_bool call_editor) { struct geom_info g_info; struct src_spec_data data; @@ -3266,8 +3224,8 @@ * nothing found on current page; * scan next and previous pages with increasing offset */ - int upper, lower; - off_t pos_save = 0; + volatile int upper, lower; + volatile off_t pos_save = 0; struct drawinf currinf_save; ubyte maxchar_save; @@ -3381,9 +3339,7 @@ }; static void -src_spec_show_box(g_info, ulx, uly, lrx, lry) - struct geom_info *g_info; - long ulx, uly, lrx, lry; +src_spec_show_box(struct geom_info *g_info, long ulx, long uly, long lrx, long lry) { struct src_spec_show_data *data = g_info->geom_data; @@ -3401,9 +3357,7 @@ /* ARGSUSED */ static void -src_spec_show_special(g_info, str) - struct geom_info *g_info; - _Xconst char *str; +src_spec_show_special(struct geom_info *g_info, _Xconst char *str) { if (memcmp(str, "src:", 4) != 0) return; @@ -3413,8 +3367,7 @@ } void -source_special_show(do_them_all) - wide_bool do_them_all; +source_special_show(wide_bool do_them_all) { struct geom_info g_info; struct src_spec_show_data data; @@ -3464,8 +3417,7 @@ static long src_fwd_min_y2, src_fwd_max_y2; static void -src_scan_special(str) - char *str; +src_scan_special(char *str) { char *p; int col = 0; @@ -3537,10 +3489,9 @@ /* ARGSUSED */ static void -src_spec_fwd_box(g_info, ulx, uly, lrx, lry) - struct geom_info *g_info; - long ulx, uly, lrx, lry; +src_spec_fwd_box(struct geom_info *g_info, long ulx, long uly, long lrx, long lry) { + UNUSED(g_info); if (src_fwd_active) { if (ulx < src_fwd_min_x) src_fwd_min_x = ulx; @@ -3554,9 +3505,7 @@ } static void -src_spec_fwd_special(g_info, str) - struct geom_info *g_info; - _Xconst char *str; +src_spec_fwd_special(struct geom_info *g_info, _Xconst char *str) { long pos; @@ -3589,7 +3538,7 @@ */ static void -source_fwd_draw_box() +source_fwd_draw_box(void) { long x, y; @@ -3617,10 +3566,9 @@ } void -source_forward_search(str) - _Xconst char *str; +source_forward_search(_Xconst char *str) { - off_t pos_save = 0; + volatile off_t pos_save = 0; struct drawinf currinf_save; ubyte maxchar_save; struct geom_info g_info; @@ -3782,29 +3730,30 @@ static const char *t1_errlist[] = { - "Attempted to load a Multiple Master font (unsupported)", - "Couldn't open file for reading", - "Memory limit of MAXTRIAL exceeded", - "Scan error (malformed Type 1 file)", - "Encountered end-of-file during parsing", - "(No description available)", - "Path construction error (malformed or corrupted Type 1 file)", - "Parse error (inconsistent Type 1 font)", - "Rasterizer aborted (malformed Type 1 file)", - "(No description available)", - "(No description available)", - "(No description available)", - "(No description available)", - "(No description available)", - "(No description available)", - "Invalid font ID (ID out of range, or library incorrectly initialized)", - "Invalid parameter in t1lib function call", - "Operation not permitted", - "Out of memory", - "Couldn't open file for reading or writing", - "Error 15 (possibly a too old t1lib version?)", - "Required AFM information not available", - "X11 library function error", + /* -5 */ "Attempted to load a Multiple Master font (unsupported)", + /* -4 */ "Couldn't open file for reading", + /* -3 */ "Memory limit of MAXTRIAL exceeded", + /* -2 */ "Scan error (malformed Type 1 file)", + /* -1 */ "Encountered end-of-file during parsing", + /* 0 */ "(No description available)", + /* 1 */ "Path construction error (malformed or corrupted Type 1 file)", + /* 2 */ "Parse error (inconsistent Type 1 font)", + /* 3 */ "Rasterizer aborted (malformed Type 1 file)", + /* 4 */ "(No description available)", + /* 5 */ "(No description available)", + /* 6 */ "(No description available)", + /* 7 */ "(No description available)", + /* 8 */ "(No description available)", + /* 9 */ "(No description available)", + /* 10 */ "Invalid font ID (ID out of range, or library incorrectly initialized)", + /* 11 */ "Invalid parameter in t1lib function call", + /* 12 */ "Operation not permitted", + /* 13 */ "Out of memory", + /* 14 */ "Couldn't open file for reading or writing", + /* 15 */ "Unspecified error (maybe a too old t1lib version?)", + /* 16 */ "Required AFM information not available", + /* 17 */ "X11 library function error", + /* 18 */ "Error with composite char", }; #define ERR_OFFSET 5 /* T1_ERR* values start at -ERR_OFFSET */ @@ -3812,16 +3761,16 @@ static const char * T1_strerror(int errnum) { - if (errnum < 0 || errnum >= sizeof(t1_errlist) / sizeof(t1_errlist[0])) + int err_idx = errnum + ERR_OFFSET; + if (err_idx < 0 || err_idx >= (int)(sizeof(t1_errlist) / sizeof(t1_errlist[0]))) return "(no details available)"; - return t1_errlist[errnum + ERR_OFFSET]; + return t1_errlist[err_idx]; } PRIVATE char ** load_vector(char *enc) { char *filename; - char **vector = NULL; /* First we try to see if there is a xdvi version of the .enc file. */ filename = kpse_find_file(enc, kpse_program_text_format, 0); @@ -3830,20 +3779,9 @@ filename = kpse_find_file(enc, kpse_tex_ps_header_format, 1); if (filename != NULL) { - vector = T1_LoadEncoding(filename); - if (vector == NULL) { - fprintf(stderr, "xdvi: fatal t1lib error while parsing \ -encoding vector in %s: %s\n", - filename, T1_strerror(T1_errno)); - fprintf(stderr, "xdvi: exiting.\n"); - exit(1); - } - TRACE_T1((stderr, "Loaded vector: %s from %s", enc, filename)); + return T1_LoadEncoding(filename); } - else - fprintf(stderr, "Unable to load encoding vector %s\n", enc); - - return vector; + return NULL; } @@ -3961,9 +3899,8 @@ return t1lidx; } - PRIVATE int -find_texfont(char *texname) +find_texfont(const char *texname) { /* Find fontmap index of texfont */ int i; @@ -3978,10 +3915,14 @@ PRIVATE int -setup_encoded_T1_font(char * mapfile, +setup_encoded_T1_font(const char *mapfile, int lineno, - char *texname, char *alias, - char *filename, int enc, int ext, int sl) + const char *texname, + const char *alias, + const char *filename, + int enc, + int ext, + int sl) { /* xdvi T1 Font loading is done in two steps: @@ -4070,13 +4011,63 @@ } fontmaps[curr_idx].tfmidx = -1; fontmaps[curr_idx].warned_about = False; + fontmaps[curr_idx].force_pk = False; return curr_idx; } -PRIVATE void -load_font_now(int idx) +static t1font_load_status_t +try_pk_fallback(int idx, struct font *fontp) +{ + Boolean save_t1lib_resource = resource.t1lib; + Boolean success; + + /* force loading the non-t1 version by setting + the T1 resource temporarily to false, which will be + evaluated by load_font(): */ + resource.t1lib = False; + success = load_font(fontp); + fontmaps[idx].force_pk = True; + TRACE_T1((stderr, + "setting force_pk for %d to true; success for PK fallback: %d\n", + idx, success)); + + if (!success) { + /* this is probably serious enough for a GUI warning */ + do_popup_message(MSG_ERR, + /* helptext */ + "You don't seem to have a working installation/configuration of fonts " + "for previewing DVI files available. This error only occurs when xdvi has " + "tried all of the following possibilities in turn, and all of them have failed:\n\n" + " (1) If the resource t1lib is set, try a Postscript Type1 version of a font.\n\n" + " (2) Otherwise, or if the Type1 version hasn't been found, try to " + "locate, or generate via mktexpk, a TeX Pixel (PK) version of the font.\n\n" + " (3) Use the fallback font defined via the \"altfont\" resource (cmr10 by default), " + "both as Type1 and as PK version, at various resolutions.\n\n" + "Since all of them have failed, xdvi had to leave all characters " + "coming from that font blank.", + /* errmsg */ + "Error loading font %s: Neither a Type1 version nor " + "a pixel version could be found. The character(s) " + "will be left blank.", + fontmaps[idx].texname); + currinf.set_char_p = currinf.fontp->set_char_p = set_empty_char; + return FAILURE_BLANK; + } + /* free unneeded resources. We mustn't free + fontmaps[idx].texname, + else find_T1_font will try to load the font all over again. + */ + free(fontmaps[idx].filename); + free(fontmaps[idx].pathname); + resource.t1lib = save_t1lib_resource; + currinf.set_char_p = currinf.fontp->set_char_p = set_char; + return FAILURE_PK; +} + +PRIVATE t1font_load_status_t +load_font_now(int idx, struct font *fontp) { /* At this point xdvi needs to draw a glyph from this font. But first it must be loaded/copied and modified if needed. */ @@ -4095,10 +4086,15 @@ t1id = fontmaps[idx].t1libid = t1fonts[t1idx].t1id; if (!t1fonts[t1idx].loaded && T1_LoadFont(t1id) == -1) { - fprintf(stderr, "Could not load T1 font %s from %s alias %s\n", - fontmaps[idx].texname, fontmaps[idx].filename, - fontmaps[idx].pathname); - exit(1); + /* this error is somehow better kept at stderr instead of + a popup (too annoying) or the statusline (might disappear + too fast) ... */ + fprintf(stderr, + "%s: Could not load Type1 font %s from %s: %s (T1_errno = %d); " + "will try pixel version instead.\n" + "Please see the T1lib documentation for details about this.\n", + prog, fontmaps[idx].texname, fontmaps[idx].pathname, T1_strerror(T1_errno), T1_errno); + return try_pk_fallback(idx, fontp); } fontmaps[idx].tfmidx = add_tfm(fontmaps[idx].texname); @@ -4111,7 +4107,7 @@ sl = fontmaps[idx].slant; if (enc == -1 && ext == 0 && sl == 0) - return; + return SUCCESS; /* The fontmap entry speaks of a modified font. Copy it first. */ cid = T1_CopyFont(t1id); @@ -4124,16 +4120,26 @@ encodings[enc].vector = load_vector(encodings[enc].file); if (encodings[enc].vector == NULL) { + /* this error is somehow better kept at stderr instead of + a popup (too annoying) or the statusline (might disappear + too fast) ... */ fprintf(stderr, - "xdvik: Could not load encoding file %s for vector %s.\n" - "The font '%s' is affected by this.\n", encodings[enc].file, - encodings[enc].enc, fontmaps[idx].texname); + "%s: Could not load load encoding file %s for vector %s (font %s): %s (T1_errno = %d); " + "will try pixel version instead.\n" + "Please see the T1lib documentation for details about this.\n", + prog, encodings[enc].file, encodings[enc].enc, fontmaps[idx].texname, + T1_strerror(T1_errno), T1_errno); + return try_pk_fallback(idx, fontp); } else { if (T1_ReencodeFont(cid, encodings[enc].vector) != 0) { fprintf(stderr, - "xdvi: WARNING: Re-encoding of %s did not work.\n", - fontmaps[idx].texname); + "%s: Re-encoding of %s failed: %s (T1_errno = %d); " + "will try pixel version instead.\n" + "Please see the T1lib documentation for details about this.\n", + prog, fontmaps[idx].texname, + T1_strerror(T1_errno), T1_errno); + return try_pk_fallback(idx, fontp); } } } @@ -4144,15 +4150,15 @@ if (sl) T1_SlantFont(cid, sl / 10000.0); - return; + return SUCCESS; } PUBLIC int -find_T1_font(char *texname) +find_T1_font(const char *texname) { /* Step 1b in the scenario above. xdvi knows that this font is - needed. Check if it is available. But do not load yet. + needed. Check if it is available. But do not load it yet. Return the fontmap index at which the font was found */ int idx; /* Iterator, t1 font id */ @@ -4164,6 +4170,9 @@ idx = find_texfont(texname); if (idx != -1) { + if (fontmaps[idx].force_pk) { + return idx; + } if (fontmaps[idx].pathname == NULL) { filename = kpse_find_file(fontmaps[idx].filename, kpse_type1_format, 0); /* It should have been on disk according to the map, but never @@ -4291,7 +4300,7 @@ PUBLIC void add_T1_mapentry(int lineno, char *mapfile, - char *name, + const char *name, char *file, char *vec, char *spec) @@ -4383,9 +4392,13 @@ while (fgets(buffer, BUFFER_SIZE, mapfile) != NULL) { len = strlen(buffer); if (buffer[len - 1] != '\n') { - fprintf(stderr, "xdvi: Error in config file %s: Line longer than %d (%d)\n", - filename, BUFFER_SIZE, (int)buffer[len]); - exit(1); + int c; + /* this really shouldn't happen ... */ + fprintf(stderr, "%s: Error in config file %s: Skipping line longer than %d characters:\n%s ...\n", + prog, filename, BUFFER_SIZE, buffer); + /* read until end of this line */ + while((c = fgetc(mapfile)) != '\n' && c != EOF) { ; } + continue; } keyword = buffer; @@ -4406,16 +4419,29 @@ TRACE_T1((stderr,"DVIPSMAP: '%s'", f)); if (!getpsinfo(f)) { - fprintf(stderr, "Could not load dvips map %s\n", f); - exit(1); + /* at least, nag them with a popup so that they'll do something about this ... */ + do_popup_message(MSG_ERR, + "Direct Type 1 (PostScript) font rendering has been disabled. " + "You should try to fix this error, since direct " + "Type 1 font rendering gives you a lot of benefits, such as:\n" + " - quicker startup time, since no bitmap fonts need to be generated;\n" + " - saving disk space for storing the bitmap fonts.\n" + "To fix this error, check that the dvips map file is located somewhere " + "in your XDVIINPUTS path. Have a look at the xdvi wrapper shell script " + "(type \"which xdvi\" to locate that shell script) for the current setting " + "of XDVIINPUTS.", + "Could not load dvips map %s - disabling T1lib.", + f); + resource.t1lib = False; + return; } } else if (strcmp(keyword, "encmap") == 0) { do_popup_message(MSG_ERR, - "Your xdvi.cfg file is for a previous version of xdvik. Please replace \ -it by the xdvi.cfg file in the current xdvik distribution.", - "Keyword \"encmap\" in xdvi.cfg is no longer supported, \ -please update the config file %s.", + "Your xdvi.cfg file is for a previous version of xdvik. Please replace " + "it by the xdvi.cfg file in the current xdvik distribution.", + "Keyword \"encmap\" in xdvi.cfg is no longer supported, " + "please update the config file %s.", filename); continue; } @@ -4426,9 +4452,13 @@ i = new_encoding(enc, f); TRACE_T1((stderr, "Encoding[%d]: '%s' = '%s' -> '%s'\n", i, enc, name, f)); } else { - fprintf(stderr, "xdvi: Error in config file %s: Unknown keyword '%s'\n", - filename, keyword); - exit(1); + /* again, nag them with a popup so that they'll do something about this ... */ + do_popup_message(MSG_ERR, + "Please check the syntax of your config file. " + "Valid keywords are: \"enc\" and \"dvipsmap\".", + "Skipping unknown keyword \"%s\" in config file %s.", + keyword, filename); + continue; } } @@ -4447,12 +4477,11 @@ /* Set character# ch */ PRIVATE struct glyph * -get_t1_glyph +get_t1_glyph( #ifdef TEXXET -(wide_ubyte cmd, wide_ubyte ch) -#else -(wide_ubyte ch) + wide_ubyte cmd, #endif + wide_ubyte ch, t1font_load_status_t *flag) { /* A problem is that there are some gaps in math modes tall braces @@ -4472,13 +4501,26 @@ GLYPH *G; /* t1lib glyph */ struct glyph *g; /* xdvi glyph */ +#ifdef TEXXET + UNUSED(cmd); +#endif + *flag = SUCCESS; + + /* return immediately if we need to use the fallback PK */ + if (fontmaps[id].force_pk) + return NULL; + TRACE_T1((stderr, "scale: %ld, ppi %d, sf: %d, size: %f", currinf.fontp->scale, pixels_per_inch, shrink_factor, size)); if (t1libid == -1) { TRACE_T1((stderr, "trying to load font %d", id)); - load_font_now(id); + *flag = load_font_now(id, currinf.fontp); + if (*flag < 0) { + TRACE_T1((stderr, "load_font_now failed for T1 font %d", id)); + return NULL; + } t1libid = fontmaps[id].t1libid; } @@ -4532,8 +4574,8 @@ /* Fix alignment mismatch */ int from_bytes = T1PAD(g->bitmap.w,8)/8; - f=G->bits; - t=g->bitmap.bits; + f = (unsigned char *)G->bits; + t = (unsigned char *)g->bitmap.bits; memset(t, 0, bitmapbytes); /* OR ELSE! you get garbage */ @@ -4576,16 +4618,35 @@ set_t1_char(wide_ubyte ch) #endif { + t1font_load_status_t flag; /* Process events even deepest in the drawing loop */ if (--event_counter == 0) { read_events(False); } -#ifdef TEXXET - get_t1_glyph(cmd, ch); - set_char(cmd, ch); + + /* + get_t1_glyph() will itself set currinf.fontp->set_char_p + to set_empty_char() or set_char() if it failed to load the + T1 version, but for the *current* call of set_t1_char, + we still need to know whether (1) or (2) holds: + (1) Type1 font hasn't been found but PK is working, + use set_char() to set the PK version + (2) neither Type1 nor PK have been found (this is the + FAILURE_BLANK case), use set_empty_char(). + So we need the flag to pass this additional information. + */ +#ifdef TEXXET + (void)get_t1_glyph(cmd, ch, &flag); + if (flag == FAILURE_BLANK) + set_empty_char(cmd, ch); + else + set_char(cmd, ch); #else - get_t1_glyph(ch); - return set_char(ch); + (void)get_t1_glyph(ch, &flag); + if (flag == FAILURE_BLANK) + return set_empty_char(cmd, ch); + else + return set_char(ch); #endif } @@ -4594,6 +4655,7 @@ PUBLIC void read_T1_char(struct font *fontp, wide_ubyte ch) { + UNUSED(fontp); /* Should never be called */ fprintf(stderr, "BUG: asked to load %c\n", ch); } diff -Naur xdvik-22.40n/texk/xdvik/dvi-init.c xdvik-22.40o/texk/xdvik/dvi-init.c --- xdvik-22.40n/texk/xdvik/dvi-init.c Tue Aug 27 17:56:52 2002 +++ xdvik-22.40o/texk/xdvik/dvi-init.c Thu Oct 10 22:54:34 2002 @@ -56,8 +56,6 @@ static ino_t dvi_inode = 0; /* inode number in dvi prop. */ static struct stat fstatbuf; -static Boolean font_not_found; - #ifdef SELFILE extern void set_icon_and_title(); /* from xdvi.c */ @@ -68,7 +66,7 @@ * DVI preamble and postamble information. */ static char job_id[300]; -static long numerator, denominator; +static unsigned long numerator, denominator; /* * Offset in DVI file of last page, set in read_postamble(). @@ -84,8 +82,7 @@ */ static void -free_vf_chain(tnp) - struct tn *tnp; +free_vf_chain(struct tn *tnp) { while (tnp != NULL) { struct tn *tnp1 = tnp->next; @@ -99,8 +96,7 @@ */ static void -delete_glyphs(fontp) - struct font *fontp; +delete_glyphs(struct font *fontp) { struct glyph *g; @@ -127,7 +123,7 @@ */ void -reset_fonts() +reset_fonts(void) { struct font *f; @@ -142,7 +138,7 @@ * free up fonts no longer in use. */ static void -free_unused_fonts() +free_unused_fonts(void) { struct font *fontp; struct font **fontpp; @@ -186,7 +182,7 @@ } void -free_fontlist() +free_fontlist(void) { struct font *fontp; for (fontp = font_head; fontp != NULL; fontp = fontp->next) { @@ -201,9 +197,7 @@ */ void -realloc_font(fontp, newsize) - struct font *fontp; - wide_ubyte newsize; +realloc_font(struct font *fontp, wide_ubyte newsize) { struct glyph *glyph; @@ -221,9 +215,7 @@ */ void -realloc_virtual_font(fontp, newsize) - struct font *fontp; - wide_ubyte newsize; +realloc_virtual_font(struct font *fontp, wide_ubyte newsize) { struct macro *macro; @@ -239,12 +231,11 @@ /* * load_font locates the t1 font or raster file and reads the index of * characters, plus whatever other preprocessing is done (depending on - * the format). Return True on error, False on success. + * the format). Return False on error, True on success. */ Boolean -load_font(fontp) - struct font *fontp; +load_font(struct font *fontp) { double fsize = fontp->fsize; int dpi = fsize + 0.5; @@ -260,6 +251,13 @@ fontp->file = font_open(fontp->fontname, &font_found, fsize, &size_found, fontp->magstepval, &fontp->filename, &fontp->t1id); +#else + fontp->file = font_open(fontp->fontname, &font_found, + fsize, &size_found, fontp->magstepval, + &fontp->filename); +#endif /* T1LIB */ + +#ifdef T1LIB if (fontp->t1id >= 0 && resource.t1lib) { /* It's a type1 font */ fontp->fsize = fsize; /* It comes in all sizes */ @@ -270,40 +268,42 @@ fontp->read_char = read_T1_char; fontp->glyph = xmalloc (256 * sizeof (struct glyph)); bzero ((char *) fontp->glyph, 256 * sizeof (struct glyph)); - return False; + if (font_found != NULL) { + print_statusline(STATUS_MEDIUM, + "Can't find font %s; using Type1 version of %s instead.", + fontp->fontname, font_found); + force_statusline_update(); + free(fontp->fontname); + fontp->fontname = font_found; /* this has been allocated by font_open */ + } + return True; } -#else - fontp->file = font_open(fontp->fontname, &font_found, - fsize, &size_found, fontp->magstepval, - &fontp->filename); #endif /* T1LIB */ - + /* when not using T1lib, fontp->file == NULL means total failure */ if (fontp->file == NULL) { print_statusline(STATUS_MEDIUM, "Can't find font %s.%dpk", fontp->fontname, dpi); - force_statusline_update(); - /* Err, can we just return here? Mustn't we load cmr10 in the - fonts place? Looks like type1 version of replacement is - never loaded. */ - return True; + return False; } + --n_files_left; - if (font_found != NULL) { + if (font_found != NULL) { /* fallback used */ print_statusline(STATUS_MEDIUM, - "Can't find font %s; using %s instead at %d dpi.", + "Can't find pixel font %s; using %s instead at %d dpi.", fontp->fontname, font_found, dpi); force_statusline_update(); free(fontp->fontname); - fontp->fontname = font_found; + fontp->fontname = font_found; /* this has been allocated by font_open */ hushcs = True; } - else if (!kpse_bitmap_tolerance((double)size_found, fsize)) { + else if (!kpse_bitmap_tolerance((double)size_found, fsize)) { /* a different size used */ print_statusline(STATUS_MEDIUM, - "Can't find font %s at %d dpi; using %d dpi instead.", + "Can't find pixel font %s at %d dpi; using %d dpi instead.", fontp->fontname, dpi, size_found); force_statusline_update(); } + /* PK version of some font found */ fontp->fsize = size_found; fontp->timestamp = ++current_timestamp; fontp->maxchar = maxchar = 255; @@ -342,7 +342,7 @@ if (maxchar < 255) realloc_font(fontp, WIDENINT maxchar); } - return False; + return True; } @@ -356,8 +356,7 @@ #define NOBUILD 29999 static int -magstepvalue(mag) - float *mag; +magstepvalue(float *mag) { int m = 0; double fmag = *mag; @@ -394,8 +393,7 @@ */ static void -reuse_font(fontp) - struct font *fontp; +reuse_font(struct font *fontp) { struct font **fp; struct tn *tnp; @@ -423,15 +421,15 @@ * all of the fonts used in the job. */ struct font * -define_font(file, cmnd, vfparent, tntable, tn_table_len, tn_headpp) - FILE *file; - wide_ubyte cmnd; - struct font *vfparent; /* vf parent of this font, or NULL */ - struct font **tntable; /* table for low TeXnumbers */ - unsigned int tn_table_len; /* length of table for TeXnumbers */ - struct tn **tn_headpp; /* addr of head of list of TeXnumbers */ +define_font(FILE *file, + wide_ubyte cmnd, + struct font *vfparent, /* vf parent of this font, or NULL */ + struct font **tntable, /* table for low TeXnumbers */ + unsigned int tn_table_len, /* length of table for TeXnumbers */ + struct tn **tn_headpp, /* addr of head of list of TeXnumbers */ + Boolean *not_found_flag) /* signal that font hasn't been found */ { - int TeXnumber; + unsigned int TeXnumber; struct font *fontp; float fsize; double scale_dimconv; @@ -462,11 +460,11 @@ else { /* * The scaled size is given in units of vfparent->scale * 2 ** -20 - * SPELL units, so we convert it into SPELL units by multiplying by - * vfparent->dimconv. - * The design size is given in units of 2 ** -20 pt, so we convert - * into SPELL units by multiplying by - * (pixels_per_inch * 2**16) / (72.27 * 2**20). + * SPELL units, so we convert it into SPELL units by multiplying by + * vfparent->dimconv. + * The design size is given in units of 2 ** -20 pt, so we convert + * into SPELL units by multiplying by + * (pixels_per_inch * 2**16) / (72.27 * 2**20). */ fsize = (72.27 * (1 << 4)) * vfparent->dimconv * scale / design; scale_dimconv = vfparent->dimconv; @@ -491,8 +489,12 @@ fontp->dimconv = orig_scale * scale_dimconv / (1 << 20); fontp->set_char_p = load_n_set_char; fontp->scale = scale; - if (vfparent == NULL) - font_not_found |= load_font(fontp); + if (vfparent == NULL) { + if (!load_font(fontp)) { + *not_found_flag = True; + } + } + fontp->next = font_head; font_head = fontp; break; @@ -524,7 +526,7 @@ * it into global variables for later use. */ static void -process_preamble() +process_preamble(void) { ubyte k; @@ -553,7 +555,7 @@ */ #define TMPSIZ 516 /* 4 trailer bytes + 512 junk bytes allowed */ static void -find_postamble() +find_postamble(void) { long pos; ubyte temp[TMPSIZ]; @@ -603,8 +605,10 @@ * used in the job. */ static void -read_postamble() +read_postamble(void) { + Boolean font_not_found = False; + ubyte cmnd; if (one(dvi_file) != POST) @@ -623,20 +627,21 @@ unshrunk_page_w = unshrunk_paper_w; (void)two(dvi_file); /* max stack size */ total_pages = two(dvi_file); - font_not_found = False; - while ((cmnd = one(dvi_file)) >= FNTDEF1 && cmnd <= FNTDEF4) + + while ((cmnd = one(dvi_file)) >= FNTDEF1 && cmnd <= FNTDEF4) { (void)define_font(dvi_file, cmnd, (struct font *)NULL, - tn_table, TNTABLELEN, &tn_head); + tn_table, TNTABLELEN, &tn_head, &font_not_found); + if (font_not_found) + dvi_oops("Not all pixel files were found"); + } if (cmnd != POSTPOST) dvi_oops("Non-fntdef command found in postamble"); - if (font_not_found) - dvi_oops("Not all pixel files were found"); free_unused_fonts(); } static void -prepare_pages() +prepare_pages(void) { int i; @@ -655,7 +660,7 @@ } void -init_page() +init_page(void) { page_w = ROUNDUP(unshrunk_page_w, mane.shrinkfactor) + 2; page_h = ROUNDUP(unshrunk_page_h, mane.shrinkfactor) + 2; @@ -671,8 +676,7 @@ */ static Boolean -internal_open_dvi(path) - _Xconst char *path; +internal_open_dvi(_Xconst char *path) { dvi_file = xdvi_xfopen(path, OPEN_MODE); if (dvi_file == NULL) @@ -709,7 +713,7 @@ **/ void -open_dvi_file() +open_dvi_file(void) { char *new_name; unsigned int n; @@ -747,7 +751,7 @@ **/ void -form_dvi_property() +form_dvi_property(void) { size_t len; unsigned long ino; @@ -780,7 +784,7 @@ */ static void -internal_init_dvi() +internal_init_dvi(void) { process_preamble(); find_postamble(); @@ -803,8 +807,7 @@ maybe we should only allow files ending in .dvi to be selected. */ FILE * -select_filename(open, move_home) - int open, move_home; +select_filename(int open, int move_home) { extern FILE *XsraSelFile(); FILE *dummy_file; @@ -867,7 +870,7 @@ **/ void -init_dvi_file() +init_dvi_file(void) { if (setjmp(dvi_env)) oops(dvi_oops_msg); @@ -881,7 +884,7 @@ **/ void -set_dvi_property() +set_dvi_property(void) { XChangeProperty(DISP, XtWindow(top_level), ATOM_DVI_FILE, ATOM_DVI_FILE, 8, PropModeReplace, dvi_property, dvi_property_length); diff -Naur xdvik-22.40n/texk/xdvik/dvips.c xdvik-22.40o/texk/xdvik/dvips.c --- xdvik-22.40n/texk/xdvik/dvips.c Sat Sep 14 23:18:43 2002 +++ xdvik-22.40o/texk/xdvik/dvips.c Thu Oct 10 18:38:21 2002 @@ -7,6 +7,7 @@ */ #include "xdvi-config.h" +#include "xdvi.h" #ifdef T1LIB @@ -17,7 +18,6 @@ #define INLINE_SIZE (2000) static char was_inline[INLINE_SIZE]; -extern void add_T1_mapentry(int, char *, char *, char *, char *, char *); /* Read a dvips psfont map file. Return 1 if it was read ok. 0 otherwise. */ diff -Naur xdvik-22.40n/texk/xdvik/events.c xdvik-22.40o/texk/xdvik/events.c --- xdvik-22.40n/texk/xdvik/events.c Sat Sep 14 23:18:43 2002 +++ xdvik-22.40o/texk/xdvik/events.c Tue Oct 15 21:15:02 2002 @@ -250,6 +250,7 @@ void null_mouse(XEvent *event) { + UNUSED(event); } static ACTION_DECL(Act_digit); @@ -301,6 +302,8 @@ static ACTION_DECL(Act_select_dvi_file); #endif static ACTION_DECL(Act_discard_number); +static ACTION_DECL(Act_href); +static ACTION_DECL(Act_href_newwindow); static ACTION_DECL(Act_magnifier); static ACTION_DECL(Act_drag); static ACTION_DECL(Act_wheel); @@ -364,6 +367,8 @@ #endif /* SELFILE */ {"discard-number", Act_discard_number}, {"magnifier", Act_magnifier}, + {"do-href", Act_href}, + {"do-href-newwindow", Act_href_newwindow}, {"drag", Act_drag}, {"wheel", Act_wheel}, {"motion", Act_motion}, @@ -480,8 +485,7 @@ }; static struct xdvi_action * -compile_action(str) - _Xconst char *str; +compile_action(_Xconst char *str) { _Xconst char *p, *p1, *p2; XtActionsRec *actp; @@ -568,7 +572,7 @@ static struct button_info *b_head; void -create_buttons() +create_buttons(void) { Dimension max_button_width; Dimension y_pos; @@ -789,8 +793,7 @@ #if !MOTIF void -set_button_panel_height(h) - XtArgVal h; +set_button_panel_height(XtArgVal h) { height_arg.value = h; XtSetValues(line_widget, &height_arg, 1); @@ -906,9 +909,7 @@ #define gamma resource._gamma static void -mask_shifts(mask, pshift1, pshift2) - Pixel mask; - int *pshift1, *pshift2; +mask_shifts(Pixel mask, int *pshift1, int *pshift2) { int k, l; @@ -925,7 +926,7 @@ */ void -init_plane_masks() +init_plane_masks(void) { Pixel pixel; @@ -968,13 +969,13 @@ GCFunction | GCForeground | GCBackground, &values)) void -init_pix() +init_pix(void) { static int shrink_allocated_for = 0; static float oldgamma = 0.0; static Pixel palette[17]; XGCValues values; - int i; + unsigned int i; if (fore_color_data.pixel == back_color_data.pixel) { /* get foreground and background RGB values for interpolating */ @@ -1175,7 +1176,7 @@ shrink_allocated_for = mane.shrinkfactor; } - for (i = 0; i <= mane.shrinkfactor * mane.shrinkfactor; ++i) + for (i = 0; i <= (unsigned)(mane.shrinkfactor * mane.shrinkfactor); ++i) pixeltbl[i] = palette[(i * 30 + mane.shrinkfactor * mane.shrinkfactor) / (2 * mane.shrinkfactor * mane.shrinkfactor)]; } @@ -1189,8 +1190,7 @@ */ static int -tick_scale(k) - int k; +tick_scale(int k) { if (k == 0) return 3; @@ -1212,9 +1212,7 @@ static void -draw_rulers(width, height, ourGC) - unsigned int width, height; - GC ourGC; +draw_rulers(unsigned int width, unsigned int height, GC ourGC) { int k; /* tick counter */ double old_pixels_per_tick; @@ -1362,35 +1360,27 @@ */ static void -expose(windowrec, x, y, w, h) - struct WindowRec *windowrec; - int x, y; - unsigned int w, h; +expose(struct WindowRec *windowrec, int x, int y, unsigned int w, unsigned int h) { if (windowrec->min_x > x) windowrec->min_x = x; - if (windowrec->max_x < x + w) + if (windowrec->max_x < (int)(x + w)) windowrec->max_x = x + w; if (windowrec->min_y > y) windowrec->min_y = y; - if (windowrec->max_y < y + h) + if (windowrec->max_y < (int)(y + h)) windowrec->max_y = y + h; } void -clearexpose(windowrec, x, y, w, h) - struct WindowRec *windowrec; - int x, y; - unsigned int w, h; +clearexpose(struct WindowRec *windowrec, int x, int y, unsigned int w, unsigned int h) { XClearArea(DISP, windowrec->win, x, y, w, h, False); expose(windowrec, x, y, w, h); } static void -scrollwindow(windowrec, x0, y0) - struct WindowRec *windowrec; - int x0, y0; +scrollwindow(struct WindowRec *windowrec, int x0, int y0) { int x, y; int x2 = 0, y2 = 0; @@ -1410,13 +1400,13 @@ if (windowrec->min_x < 0) windowrec->min_x = 0; windowrec->max_x -= x; - if (windowrec->max_x > windowrec->width) + if (windowrec->max_x > (int)windowrec->width) windowrec->max_x = windowrec->width; windowrec->min_y -= y; if (windowrec->min_y < 0) windowrec->min_y = 0; windowrec->max_y -= y; - if (windowrec->max_y > windowrec->height) + if (windowrec->max_y > (int)windowrec->height) windowrec->max_y = windowrec->height; if (x < 0) { x2 = -x; @@ -1474,10 +1464,7 @@ #ifdef MOTIF static int -set_bar_value(bar, value, max) - Widget bar; - int value; - int max; +set_bar_value(Widget bar, int value, int max) { XmScrollBarCallbackStruct call_data; @@ -1495,8 +1482,7 @@ /* not static because SELFILE stuff in dvi_init.c needs it */ void -home(scrl) - wide_bool scrl; +home(wide_bool scrl) { #if PS psp.interrupt(); @@ -1545,11 +1531,10 @@ #ifndef MOTIF /*ARGSUSED*/ static void -handle_destroy_bar(w, client_data, call_data) - Widget w; - XtPointer client_data; - XtPointer call_data; +handle_destroy_bar(Widget w, XtPointer client_data, XtPointer call_data) { + UNUSED(call_data); + UNUSED(w); *(Widget *) client_data = NULL; } #endif @@ -1558,7 +1543,7 @@ static Boolean resized = False; static void -get_geom() +get_geom(void) { static Dimension new_clip_w, new_clip_h; static Arg arg_wh_clip[] = { @@ -1598,13 +1583,13 @@ * callback routines */ - /*ARGSUSED*/ void -handle_resize(widget, junk, event, cont) - Widget widget; - XtPointer junk; - XEvent *event; - Boolean *cont; /* unused */ +/*ARGSUSED*/ void +handle_resize(Widget widget, XtPointer junk, XEvent *event, Boolean *cont) { + UNUSED(cont); + UNUSED(event); + UNUSED(junk); + UNUSED(widget); resized = True; #ifdef STATUSLINE handle_statusline_resize(); @@ -1613,13 +1598,11 @@ #ifdef BUTTONS /*ARGSUSED*/ static void -handle_command(widget, client_data, call_data) - Widget widget; - XtPointer client_data; - XtPointer call_data; +handle_command(Widget widget, XtPointer client_data, XtPointer call_data) { struct xdvi_action *actp; + UNUSED(call_data); for (actp = (struct xdvi_action *)client_data; actp != NULL; actp = actp->next) @@ -1627,11 +1610,11 @@ } /*ARGSUSED*/ static void -handle_destroy_buttons(w, client_data, call_data) - Widget w; - XtPointer client_data; - XtPointer call_data; +handle_destroy_buttons(Widget w, XtPointer client_data, XtPointer call_data) { + UNUSED(call_data); + UNUSED(client_data); + UNUSED(w); if (--destroy_count != 0) { return; } @@ -1661,7 +1644,7 @@ #endif /* BUTTONS */ void -reconfig() +reconfig(void) { #if BUTTONS && !MOTIF XtSetValues(vport_widget, resizable_off, XtNumber(resizable_off)); @@ -1680,7 +1663,7 @@ */ static void -paint_x_bar() +paint_x_bar(void) { int new_x_bgn = mane.base_x * clip_w / page_w; int new_x_end = (mane.base_x + clip_w) * clip_w / page_w; @@ -1709,7 +1692,7 @@ } static void -paint_y_bar() +paint_y_bar(void) { int new_y_bgn = mane.base_y * clip_h / page_h; int new_y_end = (mane.base_y + clip_h) * clip_h / page_h; @@ -1738,8 +1721,7 @@ } static void -scrollmane(x, y) - int x, y; +scrollmane(int x, int y) { int old_base_x = mane.base_x; int old_base_y = mane.base_y; @@ -1763,7 +1745,7 @@ } void -reconfig() +reconfig(void) { int x_thick = 0; int y_thick = 0; @@ -1849,8 +1831,7 @@ } void -home(scrl) - wide_bool scrl; +home(wide_bool scrl) { int x = 0, y = 0; @@ -1897,8 +1878,7 @@ }; static void -do_pulldown_action(actp) - struct pd_act *actp; +do_pulldown_action(struct pd_act *actp) { (actp->proc) ( /* widget */ NULL, NULL, &actp->param, &actp->num_params); } @@ -1910,10 +1890,7 @@ /* ARGSUSED */ void -file_pulldown_callback(w, client_data, call_data) - Widget w; - XtPointer client_data; - XtPointer call_data; +file_pulldown_callback(Widget w, XtPointer client_data, XtPointer call_data) { do_pulldown_action(file_pulldown_actions + (int)client_data); } @@ -1929,10 +1906,7 @@ /* ARGSUSED */ void -navigate_pulldown_callback(w, client_data, call_data) - Widget w; - XtPointer client_data; - XtPointer call_data; +navigate_pulldown_callback(Widget w, XtPointer client_data, XtPointer call_data) { do_pulldown_action(navigate_pulldown_actions + (int)client_data); } @@ -1947,17 +1921,13 @@ /* ARGSUSED */ void -scale_pulldown_callback(w, client_data, call_data) - Widget w; - XtPointer client_data; - XtPointer call_data; +scale_pulldown_callback(Widget w, XtPointer client_data, XtPointer call_data) { do_pulldown_action(scale_pulldown_actions + (int)client_data); } void -set_shrink_factor(shrink) - int shrink; +set_shrink_factor(int shrink) { static Widget active_shrink_button = NULL; Widget new_shrink_button; @@ -1980,8 +1950,7 @@ #endif /* MOTIF */ void -showmessage(message) - _Xconst char *message; +showmessage(_Xconst char *message) { get_xy(); XDrawImageString(DISP, mane.win, copyGC, @@ -2014,6 +1983,7 @@ have_arg = False; \ number = 0; \ sign = 1; \ + print_statusline(STATUS_SHORT, "");\ } \ else \ {default} \ @@ -2036,6 +2006,7 @@ have_arg = False; \ number = 0; \ sign = 1; \ + print_statusline(STATUS_SHORT, "");\ } \ else \ {default;} \ @@ -2119,6 +2090,8 @@ ACTION(Act_digit) { unsigned int digit; + UNUSED(w); + UNUSED(event); #if TOOLKIT if (*num_params != 1 || (digit = **params - '0') > 9) { @@ -2130,18 +2103,33 @@ #endif have_arg = True; number = number * 10 + digit; + print_statusline(STATUS_SHORT, "numerical prefix: %s%d\n", sign < 0 ? "-" : "", number); } static ACTION(Act_minus) { + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); + have_arg = True; sign = -sign; + if (number > 0) + print_statusline(STATUS_SHORT, "numerical prefix: %s%d\n", sign < 0 ? "-" : "", number); + else + print_statusline(STATUS_SHORT, "numerical prefix: %s\n", sign < 0 ? "-" : ""); } static ACTION(Act_quit) { + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); + #if !FLAKY_SIGPOLL if (debug & DBG_EVENT) puts(event_freq < 0 @@ -2153,6 +2141,11 @@ static ACTION(Act_help) { + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); + #ifdef TOOLKIT show_help(top_level); #else @@ -2165,6 +2158,8 @@ ACTION(Act_goto_page) { int arg; + UNUSED(w); + UNUSED(event); GET_ARG6(arg, arg = atoi(*params) - pageno_correct, 'e', arg = total_pages - 1, @@ -2180,9 +2175,13 @@ ACTION(Act_forward_page) { int arg, bak; + UNUSED(w); + UNUSED(event); +#ifdef PS_GS if (FIXME_ps_lock) return; +#endif GET_ARG(arg, 1); bak = arg; @@ -2201,9 +2200,13 @@ ACTION(Act_back_page) { int arg, bak; + UNUSED(w); + UNUSED(event); +#ifdef PS_GS if (FIXME_ps_lock) return; +#endif GET_ARG(arg, 1); bak = arg; @@ -2221,6 +2224,8 @@ ACTION(Act_declare_page_number) { int arg; + UNUSED(w); + UNUSED(event); GET_ARG(arg, 0); pageno_correct = arg - current_page; @@ -2230,6 +2235,11 @@ static ACTION(Act_home) { + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); + home(True); } @@ -2237,6 +2247,10 @@ ACTION(Act_center) { int x, y; + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); #if BUTTONS if (event == NULL) @@ -2289,6 +2303,8 @@ static ACTION(Act_set_keep_flag) { + UNUSED(w); + UNUSED(event); #if TOOLKIT if (*num_params == 0) { #endif @@ -2319,6 +2335,8 @@ static ACTION(Act_left) { + UNUSED(w); + UNUSED(event); #if TOOLKIT #if !MOTIF if (x_bar != NULL) @@ -2346,6 +2364,8 @@ static ACTION(Act_right) { + UNUSED(w); + UNUSED(event); #if TOOLKIT #if !MOTIF if (x_bar != NULL) @@ -2373,7 +2393,8 @@ static ACTION(Act_up) { - + UNUSED(w); + UNUSED(event); #if TOOLKIT #if !MOTIF if (y_bar != NULL) @@ -2401,6 +2422,8 @@ static ACTION(Act_down) { + UNUSED(w); + UNUSED(event); #if TOOLKIT #if !MOTIF if (y_bar != NULL) @@ -2428,8 +2451,12 @@ static ACTION(Act_down_or_next) { + UNUSED(w); + UNUSED(event); +#ifdef PS_GS if (FIXME_ps_lock) return; +#endif if (!resource.keep_flag) { #if TOOLKIT @@ -2482,8 +2509,12 @@ static ACTION(Act_up_or_previous) { + UNUSED(w); + UNUSED(event); +#ifdef PS_GS if (FIXME_ps_lock) return; +#endif if (!resource.keep_flag) { #if TOOLKIT @@ -2592,6 +2623,10 @@ ACTION(Act_set_margins) { Window ww; + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); #if BUTTONS if (event == NULL) @@ -2608,13 +2643,18 @@ static ACTION(Act_show_display_attributes) { + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); + print_statusline(STATUS_SHORT, "Unit = %d, bitord = %d, byteord = %d", BitmapUnit(DISP), BitmapBitOrder(DISP), ImageByteOrder(DISP)); } static int -shrink_to_fit() +shrink_to_fit(void) { int value1; int value2; @@ -2641,6 +2681,8 @@ ACTION(Act_set_shrink_factor) { int arg; + UNUSED(w); + UNUSED(event); GET_ARG6(arg, arg = atoi(*params), 'a', arg = shrink_to_fit(), number, arg = shrink_to_fit()); @@ -2679,6 +2721,8 @@ ACTION(Act_shrink_to_dpi) { int arg; + UNUSED(w); + UNUSED(event); GET_ARG(arg, 0); @@ -2718,6 +2762,9 @@ ACTION(Act_set_density) { int arg; + unsigned int u_arg; + UNUSED(w); + UNUSED(event); GET_ARG4(arg, arg = atoi(*params), sign * number, { XBell(DISP, 10); @@ -2750,19 +2797,20 @@ "set-density requires a positive value"); return; } - print_statusline(STATUS_SHORT, "density: %d", arg); - if (arg == density) { - print_statusline(STATUS_SHORT, "density value: %d", arg); + u_arg = (unsigned)arg; + print_statusline(STATUS_SHORT, "density: %u", u_arg); + if (u_arg == density) { + print_statusline(STATUS_SHORT, "density value: %d", u_arg); return; } - density = arg; + density = u_arg; reset_fonts(); if (mane.shrinkfactor == 1) { print_statusline(STATUS_SHORT, "set-density ignored with magnification 1"); return; } - print_statusline(STATUS_SHORT, "density value: %d", arg); + print_statusline(STATUS_SHORT, "density value: %u", u_arg); } canit = True; XFlush(DISP); @@ -2774,6 +2822,8 @@ ACTION(Act_set_greyscaling) { int arg; + UNUSED(w); + UNUSED(event); GET_ARG4(arg, arg = atoi(*params), sign * number, { TOGGLE(use_grey); use_grey = !use_grey; if (use_grey) { print_statusline(STATUS_SHORT, "greyscaling on");} @@ -2812,18 +2862,21 @@ static ACTION(Act_set_ps) { + UNUSED(w); + UNUSED(event); TOGGLE(resource._postscript) resource._postscript = !resource._postscript; if (resource._postscript) { - scanned_page = scanned_page_bak; + scanned_page = scanned_page_bak; print_statusline(STATUS_SHORT, "postscript rendering on"); } else { print_statusline(STATUS_SHORT, "postscript rendering off"); } + psp.toggle(); - /* TODO: change button label on toggle */ + canit = True; XFlush(DISP); } @@ -2834,6 +2887,11 @@ static ACTION(Act_htex_back) { + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); + htex_goback(); } @@ -2842,6 +2900,11 @@ { int x, y; Window ww; + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); + (void)XTranslateCoordinates(DISP, event->xkey.window, mane.win, event->xkey.x, event->xkey.y, &x, &y, &ww); htex_displayanchor(current_page, x, y); @@ -2852,6 +2915,8 @@ static ACTION(Act_set_gs_alpha) { + UNUSED(w); + UNUSED(event); TOGGLE(resource.gs_alpha) resource.gs_alpha = !resource.gs_alpha; @@ -2871,7 +2936,7 @@ #ifdef STATUSLINE static void -do_set_statusline() +do_set_statusline(void) { if (!resource.statusline) { resource.statusline = True; @@ -2893,6 +2958,8 @@ ACTION(Act_set_expert_mode) { int arg; + UNUSED(w); + UNUSED(event); GET_ARG(arg, -1); #ifdef STATUSLINE @@ -2973,6 +3040,11 @@ static ACTION(Act_reread_dvi_file) { + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); + dvi_time = 0; #if PS @@ -2986,6 +3058,11 @@ static ACTION(Act_discard_number) { + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); + have_arg = False; number = 0; sign = 1; @@ -2999,8 +3076,7 @@ static void mag_release ARGS((XEvent *)); static void -compute_mag_pos(xp, yp) - int *xp, *yp; +compute_mag_pos(int *xp, int *yp) { int t; @@ -3018,43 +3094,71 @@ *yp = t; } +static Boolean skip_next_mouseevent = False; + +#ifdef HTEX +static +ACTION(Act_href) +{ + int x, y; + Window ww; + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); + + (void)XTranslateCoordinates(DISP, event->xkey.window, mane.win, + event->xkey.x, event->xkey.y, &x, &y, &ww); /* throw away last argument */ + if (htex_handleref(False, current_page, x, y) == 1) + skip_next_mouseevent = True; +} + +static +ACTION(Act_href_newwindow) +{ + int x, y; + Window ww; + UNUSED(w); + UNUSED(event); + UNUSED(params); + UNUSED(num_params); + + (void)XTranslateCoordinates(DISP, event->xkey.window, mane.win, + event->xkey.x, event->xkey.y, &x, &y, &ww); /* throw away last argument */ + if (htex_handleref(True, current_page, x, y) == 1) + skip_next_mouseevent = True; +} +#endif /* HTEX */ + static ACTION(Act_magnifier) { - _Xconst char *p; int x, y; + _Xconst char *p; XSetWindowAttributes attr; #if TOOLKIT && !MOTIF Window throwaway; #endif + UNUSED(w); + UNUSED(params); + UNUSED(num_params); + if (skip_next_mouseevent) { + skip_next_mouseevent = False; + return; + } + #if TOOLKIT - if (event->type != ButtonPress || mouse_release != null_mouse || alt.win != (Window) 0 || mane.shrinkfactor == 1 || *num_params != 1) { XBell(DISP, 20); if (mane.shrinkfactor == 1) { + XBell(DISP, 20); print_statusline(STATUS_SHORT, - "No magnification available at shrik factor 1"); + "No magnification available at shrink factor 1"); } return; } -#ifdef HTEX - if (event->xbutton.button == 1 || event->xbutton.button == 2) { - int ret; - int x, y; - Window ww; - (void)XTranslateCoordinates(DISP, event->xkey.window, mane.win, - event->xkey.x, event->xkey.y, &x, &y, &ww); /* throw away last argument */ - /* Only do this if there's actually an href right there */ - if (event->xbutton.button == 2) - ret = htex_handleref(True, current_page, x, y); - else - ret = htex_handleref(False, current_page, x, y); - if (ret == 1) - return; - } -#endif p = *params; if (*p == '*') { @@ -3125,17 +3229,29 @@ XSelectInput(DISP, alt.win, ExposureMask); XMapWindow(DISP, alt.win); - /***************************************************************** - This call will draw the point rulers when the magnifier first - pops up, if the XDvi*delayRulers resource is false. Some users - may prefer rulers to remain invisible until the magnifier is - moved, so the default is true. Rulers can be suppressed entirely - by setting the XDvi*tickLength resource to zero or negative. - - It is better to use highGC for draw_rulers() than foreGC, - because this allows the ruler to be drawn in a different color, - helping to distinguish ruler ticks from normal typeset text. - *****************************************************************/ + + /* + This call will draw the point rulers when the magnifier first + pops up, if the XDvi*delayRulers resource is false. Some users + may prefer rulers to remain invisible until the magnifier is + moved, so the default is true. Rulers can be suppressed entirely + by setting the XDvi*tickLength resource to zero or negative. + + It is better to use highGC for draw_rulers() than foreGC, + because this allows the ruler to be drawn in a different color, + helping to distinguish ruler ticks from normal typeset text. + + This call will draw the point rulers when the magnifier first + pops up, if the XDvi*delayRulers resource is false. Some users + may prefer rulers to remain invisible until the magnifier is + moved, so the default is true. Rulers can be suppressed entirely + by setting the XDvi*tickLength resource to zero or negative. + + It is better to use highGC for draw_rulers() than foreGC, + because this allows the ruler to be drawn in a different color, + helping to distinguish ruler ticks from normal typeset text. + */ + if (!delay_rulers) draw_rulers(alt.width, alt.height, rulerGC); @@ -3157,6 +3273,8 @@ static void mag_release(XEvent *event) { + UNUSED(event); + if (alt.win != (Window) 0) { if (alt_stat) alt_stat = -1; /* destroy upon expose */ @@ -3201,6 +3319,12 @@ static ACTION(Act_drag) { + UNUSED(w); + + if (skip_next_mouseevent) { + skip_next_mouseevent = False; + return; + } if (mouse_release != null_mouse && mouse_release != drag_release) return; @@ -3317,7 +3441,12 @@ { #if TOOLKIT int dist; + UNUSED(w); + if (skip_next_mouseevent) { + skip_next_mouseevent = False; + return; + } if (*num_params == 0) { XBell(DISP, 20); return; @@ -3332,6 +3461,10 @@ (void)set_bar_value(y_bar, dist - window_y, (int)(page_h - clip_h)); #endif /* MOTIF */ #else /* not TOOLKIT */ + if (skip_next_mouseevent) { + skip_next_mouseevent = False; + return; + } scrollmane(mane.base_x, mane.base_y + (event->xbutton.button == 5 ? resource.wheel_unit : -resource.wheel_unit)); @@ -3350,11 +3483,15 @@ { #ifdef HTEX int x, y; + UNUSED(w); + UNUSED(params); + UNUSED(num_params); + if (pointerlocate(&x, &y)) { htex_displayanchor(current_page, x, y); } #endif - if (event->xbutton.button != wheel_button) { + if ((int)event->xbutton.button != wheel_button) { mouse_motion(event); } } @@ -3363,7 +3500,11 @@ static ACTION(Act_release) { - if (event->xbutton.button == wheel_button) { + UNUSED(w); + UNUSED(params); + UNUSED(num_params); + + if ((int)event->xbutton.button == wheel_button) { wheel_button = -1; return; } @@ -3374,10 +3515,14 @@ static ACTION(Act_switch_magnifier_units) { - int k = 0; + size_t k = 0; static char *TeX_units[] = { "bp", "cc", "cm", "dd", "in", "mm", "pc", "pt", "sp", }; + UNUSED(w); + UNUSED(params); + UNUSED(event); + UNUSED(num_params); for (k = 0; k < sizeof(TeX_units) / sizeof(TeX_units[0]); ++k) if (strcmp(tick_units, TeX_units[k]) == 0) @@ -3394,6 +3539,11 @@ ACTION(Act_toggle_grid_mode) { int arg; + UNUSED(w); + UNUSED(params); + UNUSED(event); + UNUSED(num_params); + GET_ARG(arg, -1); switch (arg) { case -1: @@ -3433,6 +3583,9 @@ { int x, y; Window ww; + UNUSED(w); + UNUSED(params); + UNUSED(num_params); if ((event->type == ButtonPress && mouse_release != null_mouse) || alt.win != (Window) 0) { @@ -3458,6 +3611,7 @@ { int arg; GET_ARG(arg, -1); + UNUSED(w); if ((event->type == ButtonPress && mouse_release != null_mouse) || alt.win != (Window) 0) { @@ -3472,6 +3626,9 @@ { int my_x, my_y; Window ww; + UNUSED(w); + UNUSED(params); + UNUSED(num_params); (void)XTranslateCoordinates(DISP, event->xkey.window, mane.win, event->xkey.x, event->xkey.y, &my_x, &my_y, &ww); /* throw away last argument */ @@ -3485,6 +3642,10 @@ static ACTION(Act_select_dvi_file) { + UNUSED(w); + UNUSED(params); + UNUSED(event); + UNUSED(num_params); /* * signal we want a new file in dvi_file_changed; for this, dvi_time @@ -3504,8 +3665,7 @@ /* APS Pointer locator: */ int -pointerlocate(xpos, ypos) /* Return screen positions */ - int *xpos, *ypos; +pointerlocate(int *xpos, int *ypos) /* Return screen positions */ { Window root, child; int root_x, root_y; @@ -3518,15 +3678,12 @@ #if TOOLKIT - /*ARGSUSED*/ void -handle_expose(widget, closure, ev, cont) - Widget widget; - XtPointer closure; - XEvent *ev; -#define event (&(ev->xexpose)) - Boolean *cont; /* unused */ +/*ARGSUSED*/ void +handle_expose(Widget widget, XtPointer closure, XEvent *ev, Boolean *cont) { struct WindowRec *windowrec = (struct WindowRec *)closure; + UNUSED(widget); + UNUSED(cont); if (windowrec == &alt) { if (alt_stat < 0) { /* destroy upon exposure */ @@ -3538,10 +3695,10 @@ alt_stat = 0; } +#define event (&(ev->xexpose)) expose(windowrec, event->x, event->y, (unsigned int)event->width, (unsigned int)event->height); } - #undef event #endif /* TOOLKIT */ @@ -3555,9 +3712,13 @@ ) #define event (&(ev->xproperty)) { - unsigned char *src_goto_property; + char *src_goto_property; size_t src_goto_len; + UNUSED(widget); + UNUSED(junk); + UNUSED(cont); + if (event->window != XtWindow(top_level) || event->atom != ATOM_SRC_GOTO) /* if spurious event */ return; @@ -3567,7 +3728,7 @@ */ src_goto_len = property_get_data(XtWindow(top_level), ATOM_SRC_GOTO, - &src_goto_property, XGetWindowProperty); + (unsigned char **)&src_goto_property, XGetWindowProperty); if (src_goto_len == 0) { if (debug & DBG_CLIENT) @@ -3597,12 +3758,9 @@ void #if PS -ps_read_events(wait, allow_can) - wide_bool wait; - wide_bool allow_can; +ps_read_events(wide_bool wait, wide_bool allow_can) #else -read_events(wait) - wide_bool wait; +read_events(wide_bool wait) #define allow_can True #endif { @@ -3860,7 +4018,7 @@ break; case ButtonRelease: - if (event.xbutton.button == wheel_button) + if ((int)event.xbutton.button == wheel_button) wheel_button = -1; else mouse_release(&event); @@ -3954,8 +4112,7 @@ } static void -redraw(windowrec) - struct WindowRec *windowrec; +redraw(struct WindowRec *windowrec) { static Boolean do_clear = False; @@ -4012,7 +4169,7 @@ } void -redraw_page() +redraw_page(void) { if (debug & DBG_EVENT) Fputs("Redraw page: ", stdout); @@ -4053,8 +4210,7 @@ */ static void -can_exposures(windowrec) - struct WindowRec *windowrec; +can_exposures(struct WindowRec *windowrec) { windowrec->min_x = windowrec->min_y = MAXDIM; windowrec->max_x = windowrec->max_y = 0; @@ -4063,9 +4219,9 @@ #ifndef FLAKY_SIGPOLL /* ARGSUSED */ static RETSIGTYPE -handle_sigpoll(signo) - int signo; +handle_sigpoll(int signo) { + UNUSED(signo); event_counter = 1; event_freq = -1; /* forget Plan B */ #if !HAVE_SIGACTION @@ -4076,9 +4232,9 @@ /* ARGSUSED */ static RETSIGTYPE -handle_sigusr(signo) - int signo; +handle_sigusr(int signo) { + UNUSED(signo); event_counter = 1; canit = True; dvi_time = 0; @@ -4089,31 +4245,31 @@ /* ARGSUSED */ static RETSIGTYPE -handle_sigchld(signo) - int signo; +handle_sigchld(int signo) { + UNUSED(signo); child_flag = True; } /* ARGSUSED */ static RETSIGTYPE -handle_sigterm(signo) - int signo; +handle_sigterm(int signo) { + UNUSED(signo); terminate_flag = True; } /* ARGSUSED */ static RETSIGTYPE -handle_sigsegv(signo) - int signo; +handle_sigsegv(int signo) { + UNUSED(signo); fprintf(stderr, "xdvik: caught segmentation fault - trying to clean up and aborting ...\n"); xdvi_abort(); } void -enable_intr() +enable_intr(void) { #ifndef FLAKY_SIGPOLL int sock_fd = ConnectionNumber(DISP); @@ -4230,7 +4386,7 @@ } void -do_pages() +do_pages(void) { if (debug & DBG_BATCH) { #ifdef TOOLKIT diff -Naur xdvik-22.40n/texk/xdvik/font-open.c xdvik-22.40o/texk/xdvik/font-open.c --- xdvik-22.40n/texk/xdvik/font-open.c Sat Sep 14 23:18:44 2002 +++ xdvik-22.40o/texk/xdvik/font-open.c Sat Oct 12 16:52:20 2002 @@ -36,86 +36,97 @@ FILE * font_open(char *font, char **font_ret, double dpi, int *dpi_ret, + int dummy, char **filename_ret #ifdef T1LIB , int *t1id #endif ) { - FILE *ret; char *name; + kpse_glyph_file_type file_ret; + UNUSED(dummy); + /* defaults in case of success; filename_ret will be + non-NULL iff the fallback font is used. + */ + *font_ret = NULL; + /* filename_ret is NULL iff a T1 version of a font has been used */ + *filename_ret = NULL; + *dpi_ret = dpi; + #ifdef Omega name = kpse_find_ovf(font); if (!name) #else name = kpse_find_vf(font); #endif + #ifdef T1LIB if (resource.t1lib) { *t1id = -1; } #endif /* T1LIB */ - if (name) { - /* VF fonts don't have a resolution, but load_font will complain if - we don't return what it asked for. */ + if (name) { /* found a vf font */ + /* pretend it has the expected dpi value, else caller will complain */ *dpi_ret = dpi; - *font_ret = NULL; + *filename_ret = name; + return xfopen_local(name, FOPEN_R_MODE); } - else { - kpse_glyph_file_type file_ret; #ifdef T1LIB + if (resource.t1lib) { + /* First try: T1 font of correct size */ + *t1id = find_T1_font(font); + if (*t1id >= 0) { + TRACE_T1((stderr, "found T1 font %s", font)); + return NULL; + } + TRACE_T1((stderr, + "T1 version of font %s not found, trying pixel version next, then fallback", + font)); + } +#endif /* T1LIB */ + /* Second try: PK/GF/... font within allowable size range */ + name = kpse_find_glyph(font, (unsigned)(dpi + .5), + kpse_any_glyph_format, &file_ret); + + if (name) { /* success */ + *dpi_ret = file_ret.dpi; + *filename_ret = name; + return xfopen_local(name, FOPEN_R_MODE); + } + else if (alt_font != NULL) { + /* The strange thing about kpse_find_glyph() is that it + won't create a PK version of alt_font if it doesn't + already exist. So we invoke it explicitly a second time + for that one. + */ +#ifdef T1LIB if (resource.t1lib) { - /* First attempt to load it as T1 font */ - *dpi_ret = dpi; - *font_ret = NULL; - *filename_ret = NULL; - *t1id = find_T1_font(font); - if (*t1id >= 0) + /* Third try: T1 version of fallback font */ + *t1id = find_T1_font(alt_font); + if (*t1id >= 0) { + TRACE_T1((stderr, "found fallback font %s\n", font)); + *font_ret = xstrdup(alt_font); return NULL; - else if (debug & DBG_T1) { - fprintf(stderr, "T1 version of font %s not found, trying pk\n", - font); } + TRACE_T1((stderr, + "Type1 version of fallback font %s not found, trying pixel version", + alt_font)); } - #endif /* T1LIB */ - -#if 0 - /* SU 2000/03/11 something like this would allow us to to check - * for existing fonts only, and issue a message `creating font ...' else - */ - - name = kpse_find_existing_glyph(font, (unsigned)(dpi + .5), - kpse_any_glyph_format, &file_ret); - if (!name) { - fprintf(stderr, "=== generating font %s with mktexpk\n", font); - name = kpse_find_nonexisting_glyph(font, (unsigned)(dpi + .5), - kpse_any_glyph_format, - &file_ret); - } -#endif /* 0 */ - - name = kpse_find_glyph(font, (unsigned)(dpi + .5), + /* Forth try: PK version of fallback font */ + name = kpse_find_glyph(alt_font, (unsigned)(dpi + .5), kpse_any_glyph_format, &file_ret); - - if (name) { - /* If we got it normally, from an alias, or from mktexpk, - don't fill in FONT_RET. That tells load_font to complain. */ - /* tell load_font we found something good */ - *font_ret = (file_ret.source == kpse_glyph_source_fallback ? - xstrdup(file_ret.name) : NULL); - + if (name) { /* success */ *dpi_ret = file_ret.dpi; + *filename_ret = name; + *font_ret = xstrdup(alt_font); + return xfopen_local(name, FOPEN_R_MODE); } - /* If no VF and no PK, FONT_RET is irrelevant? */ } - - /* If we found a name, return the stream. */ - ret = name ? xfopen_local(name, FOPEN_R_MODE) : NULL; - *filename_ret = name; - - return ret; + /* all other cases are failure */ + return NULL; } diff -Naur xdvik-22.40n/texk/xdvik/gf.c xdvik-22.40o/texk/xdvik/gf.c --- xdvik-22.40n/texk/xdvik/gf.c Wed Apr 18 14:24:43 2001 +++ xdvik-22.40o/texk/xdvik/gf.c Thu Sep 19 23:10:04 2002 @@ -59,8 +59,7 @@ static FILE *GF_file; static void -expect(ch) - ubyte ch; +expect(ubyte ch) { ubyte ch1 = one(GF_file); @@ -69,8 +68,7 @@ } static void -too_many_bits(ch) - ubyte ch; +too_many_bits(ubyte ch) { oops("Too many bits found when loading character %d", ch); } @@ -81,13 +79,7 @@ static void -#if NeedFunctionPrototypes read_GF_char(struct font *fontp, wide_ubyte ch) -#else /* !NeedFunctionPrototypes */ -read_GF_char(fontp, ch) - struct font *fontp; - ubyte ch; -#endif /* NeedFunctionPrototypes */ { struct glyph *g; ubyte cmnd; @@ -242,9 +234,7 @@ void -read_GF_index(fontp, hushcs) - struct font *fontp; - wide_bool hushcs; +read_GF_index(struct font *fontp, wide_bool hushcs) { int hppp, vppp; ubyte ch, cmnd; diff -Naur xdvik-22.40n/texk/xdvik/help-window.c xdvik-22.40o/texk/xdvik/help-window.c --- xdvik-22.40n/texk/xdvik/help-window.c Sat Aug 24 16:09:55 2002 +++ xdvik-22.40o/texk/xdvik/help-window.c Sun Oct 6 15:26:47 2002 @@ -116,10 +116,12 @@ /* ARGSUSED */ static void -popdown_help_callback(w, a, b) - Widget w; - XtPointer a, b; +popdown_help_callback(Widget w, XtPointer a, XtPointer b) { + UNUSED(w); + UNUSED(a); + UNUSED(b); + if (!help_active) { return; } @@ -146,10 +148,10 @@ /* ARGSUSED */ static void -select_help_topic_callback(w, client_data, call_data) - Widget w; - XtPointer client_data, call_data; +select_help_topic_callback(Widget w, XtPointer client_data, XtPointer call_data) { + UNUSED(call_data); + if (client_data == NULL) { fprintf(stderr, "shouldn't happen - resource `%s' is NULL!\n", XtName(w)); @@ -185,12 +187,11 @@ #ifdef TOOLKIT void -show_help(toplevel) - Widget toplevel; #else void show_help () #endif /* TOOLKIT */ +show_help(Widget toplevel) { #ifdef TOOLKIT Widget topicsmenu, helpclose, helppaned, helppanel, topicsbutton, w; diff -Naur xdvik-22.40n/texk/xdvik/hypertex.c xdvik-22.40o/texk/xdvik/hypertex.c --- xdvik-22.40n/texk/xdvik/hypertex.c Sat Aug 31 16:43:23 2002 +++ xdvik-22.40o/texk/xdvik/hypertex.c Sun Oct 6 15:26:47 2002 @@ -189,9 +189,7 @@ /* Only understand my version of anchors so far */ /* ie.: his TYPE=text for hrefs, frag for names */ void -hy_handletag(cp, pageno) - char *cp; - int pageno; +hy_handletag(char *cp, int pageno) { int beginend = BEGIN; @@ -206,9 +204,7 @@ } int -checkHyperTeX(cp, pageno) - char *cp; - int pageno; +checkHyperTeX(char *cp, int pageno) { Boolean htex_ref_found = False; @@ -233,9 +229,7 @@ } static void -htex_handletag(cp, pageno) - char *cp; - int pageno; +htex_handletag(char *cp, int pageno) { int beginend = BEGIN; @@ -268,9 +262,7 @@ /* Should use WWW library stuff ? */ static void -htex_anchor(beginend, cp, pageno) - int beginend, pageno; - char *cp; +htex_anchor(int beginend, char *cp, int pageno) { int *nap, *maxp; int oldllx, oldlly, oldurx, oldury; @@ -396,7 +388,7 @@ void -htex_open_dvi_file() +htex_open_dvi_file(void) { char *cp = getenv("WWWBROWSER"); if (cp) @@ -416,7 +408,7 @@ if (!(URLbase || htex_is_url(dvi_name))) { char *new_name; - int n; + size_t n; n = strlen(dvi_name); new_name = dvi_name; @@ -456,8 +448,9 @@ void -htex_initpage() -{ /* Starting a new page */ +htex_initpage(void) +{ + /* Starting a new page */ if (htex_parsedpages == NULL) htex_reinit(); HTeXAnestlevel = 0; /* Start with zero nesting level for a page */ @@ -470,8 +463,7 @@ * record position for current anchor */ void -htex_recordbits(x, y, w, h) /* x,y are pixel positions on current page */ - int x, y, w, h; +htex_recordbits(int x, int y, int w, int h) /* x,y are pixel positions on current page */ { int dvix, dviy, dvix2, dviy2; int ch = 0; @@ -515,8 +507,7 @@ } void -htex_donepage(i, pflag) /* This page has been completed */ - int i, pflag; +htex_donepage(int i, int pflag) /* This page has been completed */ { HTeX_Anchor *HTeXAp; @@ -555,7 +546,7 @@ /* If the dvi file has changed, assume all links have changed also, and reset everything! */ void -htex_reinit() +htex_reinit(void) { int i; @@ -602,7 +593,7 @@ to new .dvi file (or back) */ static void -dvi_reinit() +dvi_reinit(void) { if (debug & DBG_HYPER) fprintf(stderr, "dvi_reinit called!\n"); @@ -625,9 +616,7 @@ /* html: */ /* html: is * -1 if had been trucated to ; for glibc 2.1, @@ -355,8 +356,14 @@ #endif #ifndef TOOLKIT - fprintf(stderr, "%s:\n%s\n", msg_type, msg_buf); + fprintf(stderr, "\n%s:\n%s\n%s\n\n", msg_type, msg_buf, helptext ? helptext : ""); #else + if (!XtIsRealized(top_level)) { + /* additionally dump it to STDERR, since in some cases such as non-found + T1 resources, it might cause mktexpk to be run before the main window + comes up. */ + fprintf(stderr, "\n%s:\n%s\n%s\n\n", msg_type, msg_buf, helptext ? helptext : ""); + } /* search for first free position in g_popup_array */ while (my_popup_num < MAX_POPUPS && (g_popup_array[my_popup_num] == 1)) { my_popup_num++; @@ -395,4 +402,4 @@ XtPopup(popup_message[my_popup_num], XtGrabNone); #endif /* not TOOLKIT */ free(msg_buf); -}} +} diff -Naur xdvik-22.40n/texk/xdvik/mime.c xdvik-22.40o/texk/xdvik/mime.c --- xdvik-22.40n/texk/xdvik/mime.c Sat Aug 31 16:43:23 2002 +++ xdvik-22.40o/texk/xdvik/mime.c Thu Sep 19 23:10:04 2002 @@ -137,7 +137,7 @@ #define MIMESTEP 50 int -parsemimes() +parsemimes(void) { int i; char buf[LINE], *cp, *cp2; @@ -209,7 +209,7 @@ } int -parsemailcap() +parsemailcap(void) { int i; char buf[LINE], *cp, *cp2; @@ -279,9 +279,8 @@ char * -figure_mime_type(filename) - char *filename; +figure_mime_type(char *filename) { /* Separated this code from invoke_viewer on the rationale that If @@ -369,8 +368,7 @@ int -invokeviewer(filename) - char *filename; +invokeviewer(char *filename) { int i, j = 0; char *content_type = NULL; diff -Naur xdvik-22.40n/texk/xdvik/my-vsnprintf.c xdvik-22.40o/texk/xdvik/my-vsnprintf.c --- xdvik-22.40n/texk/xdvik/my-vsnprintf.c Thu May 30 17:39:38 2002 +++ xdvik-22.40o/texk/xdvik/my-vsnprintf.c Tue Oct 15 21:15:02 2002 @@ -51,11 +51,7 @@ *------------------------------------------------------------*/ int -my_vsnprintf(buf, len, format, argp) - char *buf; - int len; - char *format; - va_list argp; +my_vsnprintf(char *buf, int len, const char *format, va_list argp) { int pipe_fd[2]; FILE *fd; diff -Naur xdvik-22.40n/texk/xdvik/my-vsnprintf.h xdvik-22.40o/texk/xdvik/my-vsnprintf.h --- xdvik-22.40n/texk/xdvik/my-vsnprintf.h Thu May 30 12:02:01 2002 +++ xdvik-22.40o/texk/xdvik/my-vsnprintf.h Tue Oct 15 21:15:02 2002 @@ -26,15 +26,15 @@ #if HAVE_VSNPRINTF -# include -# include -# define VSNPRINTF(buf, len, format, args) vsnprintf(buf, len, format, args) +#include +#include +#define VSNPRINTF(buf, len, format, args) vsnprintf(buf, len, format, args) #else /* HAVE_VSNPRINTF */ -# include /* for pipe() */ -extern int my_vsnprintf ARGS((char *, int, char*, va_list)); -# define VSNPRINTF(buf, len, format, args) my_vsnprintf(buf, len, format, args) +#include /* for pipe() */ +extern int my_vsnprintf(char *buf, int len, const char *format, va_list argp); +#define VSNPRINTF(buf, len, format, args) my_vsnprintf(buf, len, format, args) #endif /* HAVE_VSNPRINTF */ diff -Naur xdvik-22.40n/texk/xdvik/pk.c xdvik-22.40o/texk/xdvik/pk.c --- xdvik-22.40n/texk/xdvik/pk.c Sat Aug 31 16:43:23 2002 +++ xdvik-22.40o/texk/xdvik/pk.c Thu Sep 19 23:10:04 2002 @@ -50,8 +50,7 @@ static int PK_repeat_count; static int -PK_get_nyb(fp) - FILE *fp; +PK_get_nyb(FILE *fp) { unsigned temp; if (PK_bitpos < 0) { @@ -65,8 +64,7 @@ static int -PK_packed_num(fp) - FILE *fp; +PK_packed_num(FILE *fp) { int i, j; @@ -98,8 +96,7 @@ static void -PK_skip_specials(fontp) - struct font *fontp; +PK_skip_specials(struct font *fontp) { int i, j; FILE *fp = fontp->file; @@ -138,13 +135,7 @@ */ static void -#if NeedFunctionPrototypes read_PK_char(struct font *fontp, wide_ubyte ch) -#else /* !NeedFunctionPrototypes */ -read_PK_char(fontp, ch) - struct font *fontp; - ubyte ch; -#endif /* NeedFunctionPrototypes */ { int i, j; int n; @@ -312,9 +303,7 @@ } void -read_PK_index(fontp, hushcs) - struct font *fontp; - wide_bool hushcs; +read_PK_index(struct font *fontp, wide_bool hushcs) { int hppp, vppp; long checksum; diff -Naur xdvik-22.40n/texk/xdvik/psdps.c xdvik-22.40o/texk/xdvik/psdps.c --- xdvik-22.40n/texk/xdvik/psdps.c Mon Mar 4 17:35:11 2002 +++ xdvik-22.40o/texk/xdvik/psdps.c Tue Oct 15 21:15:02 2002 @@ -149,10 +149,7 @@ static char *linepos = line; static void -TextProc(ctxt, buf, count) - DPSContext ctxt; - char *buf; - unsigned long count; +TextProc(DPSContext ctxt, char *buf, unsigned long count) { int i; char *p; @@ -232,7 +229,7 @@ +----------------------------------------------------------------------------*/ static void -waitack() +waitack(void) { while (DPS_pending > 0) { (void)XEventsQueued(DISP, QueuedAfterFlush); @@ -257,8 +254,7 @@ +----------------------------------------------------------------------------*/ static int -get_shift(mask) - Pixel mask; +get_shift(Pixel mask) { int k; @@ -348,9 +344,9 @@ /*---------------------------------------------------------------------------* - toggleDPS() + toggleDPS(int flag) - Arguments: none + Arguments: flag for toggling PostScript Returns: (void) Side-Effects: psp.drawbegin is changed. @@ -360,10 +356,11 @@ +----------------------------------------------------------------------------*/ static void -toggleDPS() +toggleDPS(int flag) { if (debug & DBG_PS) Puts("Toggling DPS on or off"); + if (postscript) psp.drawbegin = drawbeginDPS; else { @@ -387,7 +384,7 @@ +----------------------------------------------------------------------------*/ static void -destroyDPS() +destroyDPS(void) { if (debug & DBG_PS) Puts("Calling destroyDPS()"); @@ -415,7 +412,7 @@ +----------------------------------------------------------------------------*/ static void -interruptDPS() +interruptDPS(void) { #ifdef SUNHACK static Boolean interrupting = False; @@ -476,7 +473,7 @@ +----------------------------------------------------------------------------*/ static void -endpageDPS() +endpageDPS(void) { if (DPS_active) { if (debug & DBG_PS) @@ -507,9 +504,7 @@ +----------------------------------------------------------------------------*/ static void -drawbeginDPS(xul, yul, cp) - int xul, yul; - _Xconst char *cp; +drawbeginDPS(int xul, int yul, _Xconst char *cp) { /* static char faulty_display_vs[] * ="DECWINDOWS DigitalEquipmentCorporation UWS4.2LA"; */ @@ -556,8 +551,7 @@ DPSPrintf(DPS_ctx, "%d %d moveto\n", xul, yul); DPSPrintf(DPS_ctx, "%s\n", cp); } - - + /*---------------------------------------------------------------------------* drawrawDPS() @@ -573,8 +567,7 @@ +----------------------------------------------------------------------------*/ static void -drawrawDPS(cp) - _Xconst char *cp; +drawrawDPS(_Xconst char *cp) { if (!DPS_active) return; @@ -601,9 +594,7 @@ +----------------------------------------------------------------------------*/ static void -drawfileDPS(cp, psfile) - _Xconst char *cp; - FILE *psfile; +drawfileDPS(_Xconst char *cp, FILE *psfile) { char buffer[1025]; int blen; @@ -647,8 +638,7 @@ +----------------------------------------------------------------------------*/ static void -drawendDPS(cp) - _Xconst char *cp; +drawendDPS(_Xconst char *cp) { if (!DPS_active) return; @@ -672,7 +662,7 @@ +----------------------------------------------------------------------------*/ static void -beginheaderDPS() +beginheaderDPS(void) { if (debug & DBG_PS) Puts("Running beginheaderDPS()"); @@ -707,7 +697,7 @@ +----------------------------------------------------------------------------*/ static void -endheaderDPS() +endheaderDPS(void) { if (debug & DBG_PS) Puts("Running endheaderDPS()"); @@ -734,7 +724,7 @@ +----------------------------------------------------------------------------*/ static void -newdocDPS() +newdocDPS(void) { if (debug & DBG_PS) Puts("Running newdocDPS()"); @@ -747,4 +737,6 @@ } } +#else /* avoid empty compilation unit warning */ +int ___ps_dps; #endif /* PS_DPS */ diff -Naur xdvik-22.40n/texk/xdvik/psgs.c xdvik-22.40o/texk/xdvik/psgs.c --- xdvik-22.40n/texk/xdvik/psgs.c Sat Aug 31 16:43:23 2002 +++ xdvik-22.40o/texk/xdvik/psgs.c Mon Oct 14 22:48:24 2002 @@ -26,7 +26,17 @@ #include "xdvi-config.h" #include "kpathsea/c-pathmx.h" #include -#include /* for timeval */ + +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif #include #include /* this defines FASYNC */ @@ -184,8 +194,7 @@ static char oldstr[] = "\347\310\375"; static void -showto(q) - char *q; +showto(char *q) { char *p = line; char *p1; @@ -201,7 +210,7 @@ } static void -read_from_gs() +read_from_gs(void) { int bytes; char *line_end; @@ -272,12 +281,10 @@ /* ARGSUSED */ static RETSIGTYPE -gs_sigpipe_handler(sig, code, scp, addr) - int sig; - int code; - struct sigcontext *scp; - char *addr; +gs_sigpipe_handler(int sig) { + UNUSED(sig); + sigpipe_error = True; } @@ -291,7 +298,7 @@ */ static void -post_send() +post_send(void) { if (sigpipe_error) { Fputs("ghostscript died unexpectedly.\n", stderr); @@ -313,9 +320,7 @@ #define waitack() gs_io(NULL, 0) static void -gs_io(cp, len) - _Xconst char *cp; - int len; +gs_io(_Xconst char *cp, int len) { int bytes; #if HAVE_SIGACTION @@ -670,7 +675,7 @@ } static void -toggle_gs() +toggle_gs(void) { if (debug & DBG_PS) Puts("Toggling GS on or off"); @@ -683,7 +688,7 @@ } static void -destroy_gs() +destroy_gs(void) { if (debug & DBG_PS) Puts("Destroying GS process"); @@ -706,7 +711,7 @@ } static void -interrupt_gs() +interrupt_gs(void) { static _Xconst char str[] = " stop\n%%xdvimark\n"; @@ -739,7 +744,7 @@ } static void -endpage_gs() +endpage_gs(void) { static _Xconst char str[] = "stop\n%%xdvimark\n"; @@ -759,8 +764,7 @@ */ static void -checkgs(in_header) - Boolean in_header; +checkgs(Boolean in_header) { char buf[150]; @@ -786,7 +790,7 @@ } } - if (magnification != GS_mag) { + if ((int)magnification != GS_mag) { ++GS_pending; Sprintf(buf, "H TeXDict begin /DVImag %d 1000 div def \ end stop\n%%%%xdvimark\n", GS_mag = magnification); @@ -804,9 +808,7 @@ } static void -drawbegin_gs(xul, yul, cp) - int xul, yul; - _Xconst char *cp; +drawbegin_gs(int xul, int yul, _Xconst char *cp) { char buf[32]; static _Xconst char str[] = " TeXDict begin\n"; @@ -836,15 +838,14 @@ || strstr(cp, "RotBegin") != NULL /* used by pstricks */ ) { print_statusline(STATUS_SHORT, - "Warning: PS code on this page may contain rotation, currently not supported by xdvi"); + "Warning: PS code on this page may contain rotation, which is not supported by xdvi"); } gs_io(cp, strlen(cp)); } static void -drawraw_gs(cp) - _Xconst char *cp; +drawraw_gs(_Xconst char *cp) { if (!GS_active) return; @@ -855,9 +856,7 @@ } static void -drawfile_gs(cp, f) - _Xconst char *cp; - FILE *f; +drawfile_gs(_Xconst char *cp, FILE *f) { char canonical_path[MAXPATHLEN + 1]; char *ret; @@ -891,8 +890,7 @@ } static void -drawend_gs(cp) - _Xconst char *cp; +drawend_gs(_Xconst char *cp) { if (!GS_active) return; @@ -903,7 +901,7 @@ } static void -beginheader_gs() +beginheader_gs(void) { static _Xconst char str[] = "Hsave /xdvi$doc exch def\n"; @@ -930,7 +928,7 @@ } static void -endheader_gs() +endheader_gs(void) { static _Xconst char str[] = "stop\n%%xdvimark\n"; @@ -947,7 +945,7 @@ } static void -newdoc_gs() +newdoc_gs(void) { static _Xconst char str[] = "Hxdvi$doc restore stop\n%%xdvimark\n"; diff -Naur xdvik-22.40n/texk/xdvik/psnews.c xdvik-22.40o/texk/xdvik/psnews.c --- xdvik-22.40n/texk/xdvik/psnews.c Mon Mar 4 17:35:11 2002 +++ xdvik-22.40o/texk/xdvik/psnews.c Tue Oct 15 21:15:02 2002 @@ -231,11 +231,7 @@ /* ARGSUSED */ static RETSIGTYPE -psio_sigpipe_handler(sig, code, scp, addr) - int sig; - int code; - struct sigcontext *scp; - char *addr; +psio_sigpipe_handler(int sig, int code, struct sigcontext *scp, char *addr) { sigpipe_error = True; } @@ -247,7 +243,7 @@ */ static void -read_from_NeWS() +read_from_NeWS(void) { for (;;) { int retval; @@ -272,7 +268,7 @@ */ static void -post_send() +post_send(void) { if (sigpipe_error) { Fputs("NeWS died unexpectedly.\n", stderr); @@ -292,9 +288,7 @@ */ static void -send(cp, len) - _Xconst char *cp; - int len; +send(_Xconst char *cp, int len) { struct sigaction orig; #if HAVE_POLL @@ -407,7 +401,7 @@ */ static void -waitack() +waitack(void) { #if HAVE_POLL int retval; @@ -540,9 +534,8 @@ /*---------------------------------------------------------------------------* - toggleNeWS() + toggleNeWS(void) - Arguments: none Returns: (void) Side-Effects: psp.drawbegin is changed @@ -552,7 +545,7 @@ +----------------------------------------------------------------------------*/ static void -toggleNeWS() +toggleNeWS(void) { if (postscript) psp.drawbegin = drawbeginNeWS; @@ -577,7 +570,7 @@ +----------------------------------------------------------------------------*/ static void -destroyNeWS() +destroyNeWS(void) { psp = no_ps_procs; NeWS_destroyed = True; @@ -601,7 +594,7 @@ +----------------------------------------------------------------------------*/ static void -interruptNeWS() +interruptNeWS(void) { if (debug & DBG_PS) Puts("Running interruptNeWS()"); @@ -632,7 +625,7 @@ +----------------------------------------------------------------------------*/ static void -endpageNeWS() +endpageNeWS(void) { if (debug & DBG_PS) Puts("endpage sent to NeWS Server"); @@ -661,9 +654,7 @@ +----------------------------------------------------------------------------*/ static void -drawbeginNeWS(xul, yul, cp) - int xul, yul; - _Xconst char *cp; +drawbeginNeWS(int xul, int yul, _Xconst char *cp) { char buf[100]; static _Xconst char str[] = " TeXDict begin\n"; @@ -723,8 +714,7 @@ +----------------------------------------------------------------------------*/ static void -drawrawNeWS(origcp) - _Xconst char *origcp; +drawrawNeWS(_Xconst char *origcp) { _Xconst char *pt, *ptm1, *ocp1; static char *cp; @@ -833,9 +823,7 @@ +----------------------------------------------------------------------------*/ static void -drawfileNeWS(cp, psfile) - _Xconst char *cp; - FILE *psfile; +drawfileNeWS(_Xconst char *cp, FILE *psfile) { char buffer[1025]; int blen; @@ -894,8 +882,7 @@ +----------------------------------------------------------------------------*/ static void -drawendNeWS(cp) - _Xconst char *cp; +drawendNeWS(_Xconst char *cp) { if (!NeWS_active) return; @@ -919,7 +906,7 @@ +----------------------------------------------------------------------------*/ static void -beginheaderNeWS() +beginheaderNeWS(void) { static _Xconst char str[] = "Hsave /xdvi$doc exch def\n"; @@ -956,7 +943,7 @@ +----------------------------------------------------------------------------*/ static void -endheaderNeWS() +endheaderNeWS(void) { static _Xconst char str[] = "stop\n%%xdvimark\n"; @@ -985,7 +972,7 @@ +----------------------------------------------------------------------------*/ static void -newdocNeWS() +newdocNeWS(void) { static _Xconst char str[] = "H xdvi$doc restore stop\n%%xdvimark\n"; @@ -1000,4 +987,6 @@ } } +#else /* avoid empty compilation unit warning */ +int ___ps_news; #endif /* PS_NEWS */ diff -Naur xdvik-22.40n/texk/xdvik/sfDir.c xdvik-22.40o/texk/xdvik/sfDir.c --- xdvik-22.40n/texk/xdvik/sfDir.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/xdvik/sfDir.c Thu Sep 19 23:10:04 2002 @@ -45,10 +45,10 @@ #ifdef SEL_FILE_IGNORE_CASE int -SFcompareEntries(p, q) - SFEntry *p; - SFEntry *q; +SFcompareEntries(const void *vp, const void *vq) { + SFEntry *p = vp; + SFEntry *q = vq; char *r, *s; char c1, c2; @@ -82,17 +82,16 @@ } #else /* def SEL_FILE_IGNORE_CASE */ int -SFcompareEntries(p, q) - SFEntry *p; - SFEntry *q; +SFcompareEntries(const void *vp, const void *vq) { + const SFEntry *p = vp; + const SFEntry *q = vq; return strcmp(p->real, q->real); } #endif /* def SEL_FILE_IGNORE_CASE */ int -SFgetDir(dir) - SFDir *dir; +SFgetDir(SFDir *dir) { SFEntry *result = NULL; int alloc = 0; diff -Naur xdvik-22.40n/texk/xdvik/sfDraw.c xdvik-22.40o/texk/xdvik/sfDraw.c --- xdvik-22.40n/texk/xdvik/sfDraw.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/xdvik/sfDraw.c Sun Oct 6 15:26:47 2002 @@ -69,7 +69,7 @@ static XtIntervalId SFscrollTimerId; void -SFinitFont() +SFinitFont(void) { TextData *data; @@ -97,7 +97,7 @@ } void -SFcreateGC() +SFcreateGC(void) { XGCValues gcValues; XRectangle rectangles[1]; @@ -132,9 +132,7 @@ } void -SFclearList(n, doScroll) - int n; - int doScroll; +SFclearList(int n, int doScroll) { SFDir *dir; @@ -171,9 +169,7 @@ } static void -SFdeleteEntry(dir, entry) - SFDir *dir; - SFEntry *entry; +SFdeleteEntry(SFDir *dir, SFEntry *entry) { SFEntry *e; SFEntry *end; @@ -221,18 +217,13 @@ } static void -SFwriteStatChar(name, last, statBuf) - char *name; - int last; - struct stat *statBuf; +SFwriteStatChar(char *name, int last, struct stat *statBuf) { name[last] = SFstatChar(statBuf); } static int -SFstatAndCheck(dir, entry) - SFDir *dir; - SFEntry *entry; +SFstatAndCheck(SFDir *dir, SFEntry *entry) { struct stat statBuf; char save; @@ -289,11 +280,7 @@ } static void -SFdrawStrings(w, dir, from, to) - Window w; - SFDir *dir; - int from; - int to; +SFdrawStrings(Window w, SFDir *dir, int from, int to) { int i; SFEntry *entry; @@ -352,9 +339,7 @@ } void -SFdrawList(n, doScroll) - int n; - int doScroll; +SFdrawList(int n, int doScroll) { SFDir *dir; Window w; @@ -376,8 +361,7 @@ } void -SFdrawLists(doScroll) - int doScroll; +SFdrawLists(int doScroll) { int i; @@ -387,8 +371,7 @@ } static void -SFinvertEntry(n) - int n; +SFinvertEntry(int n) { XFillRectangle(SFdisplay, XtWindow(selFileLists[n]), @@ -399,7 +382,7 @@ } static unsigned long -SFscrollTimerInterval() +SFscrollTimerInterval(void) { static int maxVal = 200; static int varyDist = 50; @@ -431,14 +414,13 @@ } static void -SFscrollTimer(p, id) - XtPointer p; - XtIntervalId *id; +SFscrollTimer(XtPointer p, XtIntervalId *id) { SFDir *dir; int save; int n; - + UNUSED(id); + n = (int)p; dir = &(SFdirs[SFdirPtr + n]); @@ -476,9 +458,7 @@ } static int -SFnewInvertEntry(n, event) - int n; - XMotionEvent *event; +SFnewInvertEntry(int n, XMotionEvent *event) { int x, y; int new; @@ -522,12 +502,10 @@ /* ARGSUSED */ void -SFenterList(w, n, event) - Widget w; - int n; - XEnterWindowEvent *event; +SFenterList(Widget w, int n, XEnterWindowEvent *event) { int new; + UNUSED(w); /* sanity */ if (SFcurrentInvert[n] != -1) { @@ -544,11 +522,11 @@ /* ARGSUSED */ void -SFleaveList(w, n, event) - Widget w; - int n; - XEvent *event; +SFleaveList(Widget w, int n, XEvent *event) { + UNUSED(w); + UNUSED(event); + if (SFcurrentInvert[n] != -1) { SFinvertEntry(n); SFcurrentInvert[n] = -1; @@ -557,12 +535,10 @@ /* ARGSUSED */ void -SFmotionList(w, n, event) - Widget w; - int n; - XMotionEvent *event; +SFmotionList(Widget w, int n, XMotionEvent *event) { int new; + UNUSED(w); new = SFnewInvertEntry(n, event); @@ -579,10 +555,7 @@ /* ARGSUSED */ void -SFvFloatSliderMovedCallback(w, n, fnew) - Widget w; - int n; - float *fnew; +SFvFloatSliderMovedCallback(Widget w, int n, float *fnew) { int new; @@ -593,14 +566,12 @@ /* ARGSUSED */ void -SFvSliderMovedCallback(w, n, new) - Widget w; - int n; - int new; +SFvSliderMovedCallback(Widget w, int n, int new) { int old; Window win; SFDir *dir; + UNUSED(w); dir = &(SFdirs[SFdirPtr + n]); @@ -665,10 +636,7 @@ /* ARGSUSED */ void -SFvAreaSelectedCallback(w, n, pnew) - Widget w; - int n; - int pnew; +SFvAreaSelectedCallback(Widget w, int n, int pnew) { SFDir *dir; int new; @@ -702,13 +670,11 @@ /* ARGSUSED */ void -SFhSliderMovedCallback(w, n, new) - Widget w; - int n; - float *new; +SFhSliderMovedCallback(Widget w, int n, float *new) { SFDir *dir; int save; + UNUSED(w); dir = &(SFdirs[SFdirPtr + n]); save = dir->hOrigin; @@ -722,10 +688,7 @@ /* ARGSUSED */ void -SFhAreaSelectedCallback(w, n, pnew) - Widget w; - int n; - int pnew; +SFhAreaSelectedCallback(Widget w, int n, int pnew) { SFDir *dir; int new; @@ -759,15 +722,14 @@ /* ARGSUSED */ void -SFpathSliderMovedCallback(w, client_data, new) - Widget w; - XtPointer client_data; - float *new; +SFpathSliderMovedCallback(Widget w, XtPointer client_data, float *new) { SFDir *dir; int n; XawTextPosition pos; int SFdirPtrSave; + UNUSED(w); + UNUSED(client_data); SFdirPtrSave = SFdirPtr; SFdirPtr = (*new) * SFdirEnd; @@ -799,14 +761,12 @@ /* ARGSUSED */ void -SFpathAreaSelectedCallback(w, client_data, pnew) - Widget w; - XtPointer client_data; - int pnew; +SFpathAreaSelectedCallback(Widget w, XtPointer client_data, int pnew) { int new; float f; - + UNUSED(client_data); + new = SFdirPtr + (((double)pnew) / SFpathScrollWidth) * SFdirEnd; if (new > SFdirEnd - 3) { diff -Naur xdvik-22.40n/texk/xdvik/sfPath.c xdvik-22.40o/texk/xdvik/sfPath.c --- xdvik-22.40n/texk/xdvik/sfPath.c Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/xdvik/sfPath.c Sun Oct 6 15:26:47 2002 @@ -84,8 +84,7 @@ static int SFtwiddle = 0; int -SFchdir(path) - char *path; +SFchdir(char *path) { int result; @@ -102,8 +101,7 @@ } static void -SFfree(i) - int i; +SFfree(int i) { SFDir *dir; int j; @@ -125,16 +123,13 @@ } static void -SFstrdup(s1, s2) - char **s1; - char *s2; +SFstrdup(char **s1, char *s2) { *s1 = strcpy(XtMalloc((unsigned)(strlen(s2) + 1)), s2); } static void -SFunreadableDir(dir) - SFDir *dir; +SFunreadableDir(SFDir *dir) { char *cannotOpen = " "; @@ -148,9 +143,7 @@ #ifdef SEL_FILE_IGNORE_CASE static -SFstrncmp(p, q, n) - char *p, *q; - int n; +SFstrncmp(char *p, char *q, int n) { char c1, c2; char *psave, *qsave; @@ -192,9 +185,7 @@ #endif /* def SEL_FILE_IGNORE_CASE */ static void -SFreplaceText(dir, str) - SFDir *dir; - char *str; +SFreplaceText(SFDir *dir, char *str) { int len; @@ -217,8 +208,7 @@ } static void -SFexpand(str) - char *str; +SFexpand(char *str) { int len; int cmp; @@ -269,9 +259,7 @@ } static int -SFfindFile(dir, str) - SFDir *dir; - char *str; +SFfindFile(SFDir *dir, char *str) { int i, last, max; char *name, save; @@ -378,7 +366,7 @@ } static void -SFunselect() +SFunselect(void) { SFDir *dir; @@ -391,14 +379,15 @@ } static int -SFcompareLogins(p, q) - SFLogin *p, *q; +SFcompareLogins(const void *vp, const void *vq) { + const SFLogin *p = vp; + const SFLogin *q = vq; return strcmp(p->name, q->name); } static void -SFgetHomeDirs() +SFgetHomeDirs(void) { struct passwd *pw; int alloc; @@ -475,8 +464,7 @@ } static int -SFfindHomeDir(begin, end) - char *begin, *end; +SFfindHomeDir(char *begin, char *end) { char save; char *theRest; @@ -504,7 +492,7 @@ } void -SFupdatePath() +SFupdatePath(void) { static int alloc; static int wasTwiddle = 0; @@ -693,8 +681,7 @@ } void -SFsetText(path) - char *path; +SFsetText(char *path) { XawTextBlock text; @@ -709,20 +696,18 @@ /* ARGSUSED */ void -SFbuttonPressList(w, n, event) - Widget w; - int n; - XButtonPressedEvent *event; +SFbuttonPressList(Widget w, int n, XButtonPressedEvent *event) { + UNUSED(w); + UNUSED(n); + UNUSED(event); + SFbuttonPressed = 1; } /* ARGSUSED */ void -SFbuttonReleaseList(w, n, event) - Widget w; - int n; - XButtonReleasedEvent *event; +SFbuttonReleaseList(Widget w, int n, XButtonReleasedEvent *event) { SFDir *dir; @@ -741,9 +726,7 @@ } static int -SFcheckDir(n, dir) - int n; - SFDir *dir; +SFcheckDir(int n, SFDir *dir) { struct stat statBuf; int i; @@ -805,8 +788,7 @@ } static int -SFcheckFiles(dir) - SFDir *dir; +SFcheckFiles(SFDir *dir) { int from, to; int result; @@ -845,14 +827,14 @@ } void -SFdirModTimer(cl, id) - XtPointer cl; - XtIntervalId *id; +SFdirModTimer(XtPointer cl, XtIntervalId *id) { static int n = -1; static int f = 0; char save; SFDir *dir; + UNUSED(cl); + UNUSED(id); if ((!SFtwiddle) && (SFdirPtr < SFdirEnd)) { n++; @@ -892,8 +874,7 @@ /* Return a single character describing what kind of file STATBUF is. */ char -SFstatChar(statBuf) - struct stat *statBuf; +SFstatChar(struct stat *statBuf) { if (S_ISDIR(statBuf->st_mode)) { return '/'; diff -Naur xdvik-22.40n/texk/xdvik/sfSelFile.c xdvik-22.40o/texk/xdvik/sfSelFile.c --- xdvik-22.40n/texk/xdvik/sfSelFile.c Wed Apr 10 01:14:49 2002 +++ xdvik-22.40o/texk/xdvik/sfSelFile.c Sun Oct 6 15:26:47 2002 @@ -139,8 +139,7 @@ "; #if !defined (HAVE_STRERROR) && !defined (strerror) static char * -strerror(errnum) - int errnum; +strerror(int errnum) { extern char *sys_errlist[]; extern int sys_nerr; @@ -152,13 +151,11 @@ /* ARGSUSED */ static void -SFexposeList(w, n, event, cont) - Widget w; - XtPointer n; - XEvent *event; - Boolean *cont; +SFexposeList(Widget w, XtPointer n, XEvent *event, Boolean *cont) { extern void SFdrawList(); + UNUSED(w); + UNUSED(cont); if ((event->type == NoExpose) || event->xexpose.count) { return; @@ -169,13 +166,12 @@ /* ARGSUSED */ static void -SFmodVerifyCallback(w, client_data, event, cont) - Widget w; - XtPointer client_data; - XEvent *event; - Boolean *cont; +SFmodVerifyCallback(Widget w, XtPointer client_data, XEvent *event, Boolean *cont) { char buf[2]; + UNUSED(w); + UNUSED(cont); + UNUSED(client_data); if ( (XLookupString(&(event->xkey), buf, 2, NULL, NULL) == 1) && @@ -189,10 +185,11 @@ /* ARGSUSED */ static void -SFokCallback(w, cl, cd) - Widget w; - XtPointer cl, cd; +SFokCallback(Widget w, XtPointer cl, XtPointer cd) { + UNUSED(w); + UNUSED(cl); + UNUSED(cd); SFstatus = SEL_FILE_OK; } @@ -203,10 +200,11 @@ /* ARGSUSED */ static void -SFcancelCallback(w, cl, cd) - Widget w; - XtPointer cl, cd; +SFcancelCallback(Widget w, XtPointer cl, XtPointer cd) { + UNUSED(w); + UNUSED(cl); + UNUSED(cd); SFstatus = SEL_FILE_CANCEL; } @@ -217,14 +215,14 @@ /* ARGSUSED */ static void -SFdismissAction(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; - Cardinal *num_params; +SFdismissAction(Widget w, XEvent *event, String *params, Cardinal *num_params) { + UNUSED(w); + UNUSED(params); + UNUSED(num_params); + if (event->type == ClientMessage && - event->xclient.data.l[0] != SFwmDeleteWindow) return; + event->xclient.data.l[0] != (int)SFwmDeleteWindow) return; SFstatus = SEL_FILE_CANCEL; } @@ -240,9 +238,8 @@ /* Don't show files that don't get through the filter. */ int -maskFile(mask, filename) - char *mask, *filename; /* return 1 if file is masked (mask does not match filename), 0 otherwise */ +maskFile(char *mask, char *filename) { int c, c1; @@ -278,10 +275,10 @@ int hideFlag = 1; int -showEntry(entryReal, entryShown, statBuf) - char *entryReal, **entryShown; - struct stat *statBuf; +showEntry(char *entryReal, char **entryShown, struct stat *statBuf) { + UNUSED(entryShown); + if (!(S_ISDIR(statBuf->st_mode))) { if (hideFlag) if (entryReal[0] == '.') @@ -295,15 +292,14 @@ /* ARGSUSED */ void -maskChanged(w, client_data, event) - Widget w; - XtPointer client_data; - XKeyPressedEvent *event; +maskChanged(Widget w, XtPointer client_data, XKeyPressedEvent *event) { char buf[2]; SFDir *dir; extern void SFupdatePath(); - + UNUSED(w); + UNUSED(client_data); + if ((XLookupString(event, buf, 2, NULL, NULL) == 1) && ((*buf) == '\r')) { for (dir = &(SFdirs[SFdirEnd - 1]); dir >= SFdirs; dir--) *(dir->dir) = 0; /* force a re-read */ @@ -313,14 +309,14 @@ /* ARGSUSED */ void -hideFiles(w, client_data, event) - Widget w; - XtPointer client_data; - XEvent *event; +hideFiles(Widget w, XtPointer client_data, XEvent *event) { SFDir *dir; SFEntry *entry; extern void SFupdatePath(), SFdrawLists(); + UNUSED(event); + UNUSED(client_data); + hideFlag = 1 - hideFlag; if (hideFlag) { @@ -345,11 +341,7 @@ static void -SFcreateWidgets(toplevel, prompt, ok, cancel) - Widget toplevel; - char *prompt; - char *ok; - char *cancel; +SFcreateWidgets(Widget toplevel, char *prompt, char *ok, char *cancel) { Cardinal i, n; int listWidth, listHeight; @@ -735,7 +727,7 @@ (oneLineTextEditTranslations)); XtAddEventHandler(selFileMask, KeyPressMask, False, - maskChanged, (XtPointer) NULL); + (XtEventHandler)maskChanged, (XtPointer) NULL); selFileLabel = XtVaCreateManagedWidget("selFileLabel", labelWidgetClass, selFileForm, @@ -763,7 +755,7 @@ XtNcursorName, "dot", #endif NULL); - XtAddCallback(selFileHide, XtNcallback, hideFiles, NULL); + XtAddCallback(selFileHide, XtNcallback, (XtCallbackProc)hideFiles, NULL); XtSetMappedWhenManaged(selFile, False); XtRealizeWidget(selFile); @@ -812,8 +804,7 @@ /* position widget under the cursor */ void -SFpositionWidget(w) - Widget w; +SFpositionWidget(Widget w) { Arg args[3]; Cardinal num_args; @@ -858,11 +849,7 @@ } FILE * -SFopenFile(name, mode, prompt, failed) - char *name; - char *mode; - char *prompt; - char *failed; +SFopenFile(char *name, char *mode, char *prompt, char *failed) { Arg args[1]; FILE *fp; @@ -887,7 +874,7 @@ } void -SFtextChanged() +SFtextChanged(void) { extern void SFupdatePath(); @@ -911,13 +898,13 @@ } static char * -SFgetText() +SFgetText(void) { return strcpy(XtMalloc((unsigned)(strlen(SFtextBuffer) + 1)), SFtextBuffer); } static void -SFprepareToReturn() +SFprepareToReturn(void) { SFstatus = SEL_FILE_NULL; XtRemoveGrab(selFile); @@ -929,17 +916,15 @@ } FILE * -XsraSelFile(toplevel, prompt, ok, cancel, failed, - init_path, mode, show_entry, name_return) - Widget toplevel; - char *prompt; - char *ok; - char *cancel; - char *failed; - char *init_path; - char *mode; - int (*show_entry) (); - char **name_return; +XsraSelFile(Widget toplevel, + char *prompt, + char *ok, + char *cancel, + char *failed, + char *init_path, + char *mode, + int (*show_entry) (), + char **name_return) { extern void SFsetText(); static int firstTime = 1; @@ -947,6 +932,8 @@ Arg arglist[20]; XEvent event; FILE *fp; + UNUSED(show_entry); + if (!prompt) { prompt = "Pathname:"; diff -Naur xdvik-22.40n/texk/xdvik/sfinternal.h xdvik-22.40o/texk/xdvik/sfinternal.h --- xdvik-22.40n/texk/xdvik/sfinternal.h Wed Apr 18 14:24:45 2001 +++ xdvik-22.40o/texk/xdvik/sfinternal.h Sun Oct 6 15:26:47 2002 @@ -39,6 +39,11 @@ #define SF_DO_SCROLL 1 #define SF_DO_NOT_SCROLL 0 +/* for unused parameters */ +#ifndef UNUSED +#define UNUSED(x) ((void)(x)) +#endif + typedef struct { int statDone; char *real; diff -Naur xdvik-22.40n/texk/xdvik/special.c xdvik-22.40o/texk/xdvik/special.c --- xdvik-22.40n/texk/xdvik/special.c Sat Sep 14 23:18:44 2002 +++ xdvik-22.40o/texk/xdvik/special.c Sun Oct 6 15:26:47 2002 @@ -107,8 +107,7 @@ */ static void -Warning(fmt, msg) - char *fmt, *msg; +Warning(char *fmt, char *msg) { Fprintf(stderr, "%s: ", prog); Fprintf(stderr, fmt, msg); @@ -129,8 +128,7 @@ * Right now, we ignore pen_size. */ static void -line_btw(fx, fy, tx, ty) - int fx, fy, tx, ty; +line_btw(int fx, int fy, int tx, int ty) { int fcx = xconv(fx); int tcx = xconv(tx); @@ -148,8 +146,7 @@ * Draw a dot at (x,y) */ static void -dot_at(x, y) - int x, y; +dot_at(int x, int y) { int cx = xconv(x); int cy = yconv(y); @@ -166,9 +163,12 @@ */ /* ARGSUSED */ static void -do_attribute_path(last_min_x, last_max_x, last_min_y, last_max_y) - int last_min_x, last_max_x, last_min_y, last_max_y; +do_attribute_path(int last_min_x, int last_max_x, int last_min_y, int last_max_y) { + UNUSED(last_min_x); + UNUSED(last_min_y); + UNUSED(last_max_x); + UNUSED(last_max_y); } /* @@ -177,8 +177,7 @@ /* ARGSUSED */ static void -set_pen_size(cp) - char *cp; +set_pen_size(char *cp) { int ps; @@ -199,7 +198,7 @@ */ static void -flush_path() +flush_path(void) { int i; int last_min_x, last_max_x, last_min_y, last_max_y; @@ -238,9 +237,7 @@ */ static void -flush_dashed(cp, dotted) - char *cp; - Boolean dotted; +flush_dashed(char *cp, Boolean dotted) { int i; int numdots; @@ -306,8 +303,7 @@ */ static void -add_path(cp) - char *cp; +add_path(char *cp) { int pathx, pathy; @@ -325,8 +321,7 @@ */ static void -im_fdraw(x, y) - double x, y; +im_fdraw(double x, double y) { if (++path_len >= MAXPOINTS) oops("Too many arc points"); @@ -340,8 +335,7 @@ */ static void -draw_ellipse(xc, yc, xr, yr) - int xc, yc, xr, yr; +draw_ellipse(int xc, int yc, int xr, int yr) { double angle, theta; int n; @@ -375,9 +369,7 @@ */ static void -arc(cp, invis) - char *cp; - Boolean invis; +arc(char *cp, Boolean invis) { int xc, yc, xrad, yrad, n; float start_angle, end_angle, angle, theta, r; @@ -439,7 +431,7 @@ */ static void -flush_spline() +flush_spline(void) { int xp, yp; int N; @@ -485,7 +477,7 @@ */ static void -shade_last() +shade_last(void) { blacken = whiten = False; shade = True; @@ -497,7 +489,7 @@ */ static void -whiten_last() +whiten_last(void) { whiten = True; blacken = shade = False; @@ -509,7 +501,7 @@ */ static void -blacken_last() +blacken_last(void) { blacken = True; whiten = shade = False; @@ -533,6 +525,7 @@ { } + /* ARGSUSED */ static void NullProc2 ARGS((_Xconst char *)); @@ -573,7 +566,7 @@ static int bbox_voffset; void -draw_bbox() +draw_bbox(void) { int xcorner, ycorner; @@ -584,16 +577,18 @@ if (bbox_angle == 0) { ycorner -= bbox_voffset; - XDrawLine(DISP, currwin.win, ruleGC, - xcorner, ycorner, xcorner + bbox_width, ycorner); - XDrawLine(DISP, currwin.win, ruleGC, - xcorner + bbox_width, ycorner, - xcorner + bbox_width, ycorner + bbox_height); - XDrawLine(DISP, currwin.win, ruleGC, - xcorner + bbox_width, ycorner + bbox_height, - xcorner, ycorner + bbox_height); - XDrawLine(DISP, currwin.win, ruleGC, - xcorner, ycorner + bbox_height, xcorner, ycorner); + XDrawRectangle(DISP, currwin.win, ruleGC, xcorner, ycorner, bbox_width, bbox_height); +/* XDrawRectangle(DISP, currwin.win, ruleGC, xcorner - 1, ycorner - 1, bbox_width + 2, bbox_height + 2); */ +/* XDrawLine(DISP, currwin.win, ruleGC, */ +/* xcorner, ycorner, xcorner + bbox_width, ycorner); */ +/* XDrawLine(DISP, currwin.win, ruleGC, */ +/* xcorner + bbox_width, ycorner, */ +/* xcorner + bbox_width, ycorner + bbox_height); */ +/* XDrawLine(DISP, currwin.win, ruleGC, */ +/* xcorner + bbox_width, ycorner + bbox_height, */ +/* xcorner, ycorner + bbox_height); */ +/* XDrawLine(DISP, currwin.win, ruleGC, */ +/* xcorner, ycorner + bbox_height, xcorner, ycorner); */ } else { float sin_a = sin(bbox_angle * (TWOPI / 360)); @@ -634,7 +629,7 @@ } static void -actual_startup() +actual_startup(void) { oldhandler = XSetIOErrorHandler(XDviIOErrorHandler); @@ -667,9 +662,7 @@ } static void -ps_startup(xul, yul, cp) - int xul, yul; - _Xconst char *cp; +ps_startup(int xul, int yul, _Xconst char *cp) { if (!resource._postscript) { psp.toggle = actual_startup; @@ -681,7 +674,7 @@ } static void -ps_startup2() +ps_startup2(void) { actual_startup(); psp.beginheader(); @@ -689,14 +682,13 @@ /* ARGSUSED */ static void -NullProc2(cp) - _Xconst char *cp; +NullProc2(_Xconst char *cp) { + UNUSED(cp); } static void -ps_parseraw(PostScript_cmd) - _Xconst char *PostScript_cmd; +ps_parseraw(_Xconst char *PostScript_cmd) { _Xconst char *p; @@ -717,14 +709,12 @@ /* ARGSUSED */ void -#if NeedFunctionPrototypes drawbegin_none(int xul, int yul, _Xconst char *cp) -#else /* !NeedFunctionPrototypes */ -drawbegin_none(xul, yul, cp) - int xul, yul; - _Xconst char *cp; -#endif /* NeedFunctionPrototypes */ { + UNUSED(xul); + UNUSED(yul); + UNUSED(cp); + draw_bbox(); } @@ -756,11 +746,7 @@ */ static struct tickrec * -cachetick(filename, pathinfo, fp, fdp) - _Xconst char *filename; - kpse_file_format_type pathinfo; - FILE **fp; - int *fdp; +cachetick(_Xconst char *filename, kpse_file_format_type pathinfo, FILE **fp, int *fdp) { struct tickrec **linkp; struct tickrec *tikp; @@ -820,7 +806,7 @@ } void -ps_clear_cache() +ps_clear_cache(void) { struct tickrec *tikp; @@ -848,16 +834,14 @@ #endif static void -send_ps_file(filename, pathinfo) - _Xconst char *filename; - kpse_file_format_type pathinfo; +send_ps_file(_Xconst char *filename, kpse_file_format_type pathinfo) { FILE *f; int fd; static _Xconst char *argv[] = { NULL, "-c", NULL, NULL }; char *bufp = NULL; - struct tickrec *tikp; - int len; + struct tickrec *volatile tikp; + size_t len; char magic1, magic2, magic3; static Boolean warned_about_shellescape = False; @@ -1036,7 +1020,7 @@ void -ps_newdoc() +ps_newdoc(void) { struct tickrec *tikp; @@ -1049,7 +1033,7 @@ void -ps_destroy() +ps_destroy(void) { struct tickrec *tikp; @@ -1064,8 +1048,7 @@ static void -psfig_special(cp) - char *cp; +psfig_special(char *cp) { char *filename; int raww, rawh; @@ -1171,8 +1154,7 @@ #define N_ARGLESS_KEYS 1 static void -epsf_special(cp) - char *cp; +epsf_special(char *cp) { char *filename; static char *buffer; @@ -1207,7 +1189,7 @@ q = buffer + strlen(buffer); while (*cp != '\0') { char *p1 = cp; - int keyno; + size_t keyno; while (*p1 != '=' && !isspace(*p1) && *p1 != '\0') ++p1; @@ -1279,8 +1261,7 @@ static void -quote_special(cp) - char *cp; +quote_special(char *cp) { bbox_valid = False; @@ -1300,8 +1281,7 @@ #if PS static void -scan_header(cp) - char *cp; +scan_header(char *cp) { char *filename; @@ -1319,8 +1299,7 @@ } static void -scan_bang(cp) - char *cp; +scan_bang(char *cp) { psp.beginheader(); psp.drawraw(cp + 1); @@ -1354,8 +1333,7 @@ */ static char * -endofcommand(cp) - char *cp; +endofcommand(char *cp) { while (isspace(*cp)) ++cp; @@ -1370,8 +1348,7 @@ #define CMD(x, y) ((x) << 8 | (y)) void -applicationDoSpecial(cp) - char *cp; +applicationDoSpecial(char *cp) { char *p; @@ -1467,8 +1444,7 @@ #if PS void -scan_special(cp) - char *cp; +scan_special(char *cp) { char *p; @@ -1493,13 +1469,11 @@ /* ARGSUSED */ void -geom_do_special(g_info, cp, current_dimconv) - struct geom_info *g_info; - _Xconst char *cp; - double current_dimconv; +geom_do_special(struct geom_info *g_info, char *cp, double current_dimconv) { _Xconst char *p; - + UNUSED(current_dimconv); + if (memicmp(cp, "psfile", 6) == 0 && (p = endofcommand(cp + 6)) != NULL) { /* compute epsf bounding box */ char c; @@ -1519,7 +1493,7 @@ ++p; while (*p != '\0') { _Xconst char *p1 = p; - int keyno; + size_t keyno; while (*p1 != '=' && !isspace(*p1) && *p1 != '\0') ++p1; diff -Naur xdvik-22.40n/texk/xdvik/stamp-auto.in xdvik-22.40o/texk/xdvik/stamp-auto.in --- xdvik-22.40n/texk/xdvik/stamp-auto.in Sun May 20 22:19:03 2001 +++ xdvik-22.40o/texk/xdvik/stamp-auto.in Wed Oct 16 22:26:23 2002 @@ -1 +1 @@ -Sun May 20 23:51:29 MET DST 2001 +Wed Oct 16 23:17:22 BST 2002 diff -Naur xdvik-22.40n/texk/xdvik/statusline.c xdvik-22.40o/texk/xdvik/statusline.c --- xdvik-22.40n/texk/xdvik/statusline.c Tue Aug 27 17:56:52 2002 +++ xdvik-22.40o/texk/xdvik/statusline.c Tue Oct 15 21:15:02 2002 @@ -121,7 +121,7 @@ *------------------------------------------------------------*/ void -create_statusline() +create_statusline(void) { Position vport_h, clip_x, clip_w; static Position my_h = 0; @@ -189,7 +189,7 @@ *------------------------------------------------------------*/ void -handle_statusline_resize() +handle_statusline_resize(void) { if (!resource.statusline) { return; @@ -247,9 +247,11 @@ /* ARGSUSED */ static void -clear_statusline(data) - XtPointer data; +clear_statusline(XtPointer client_data, XtIntervalId *id) { + UNUSED(client_data); + UNUSED(id); + if (resource.statusline) { XtVaSetValues(statusline, XtNlabel, "", NULL); XFlush(DISP); @@ -296,9 +298,12 @@ *------------------------------------------------------------*/ void -print_statusline PVAR2C(STATUS_TIMER, timeout, _Xconst char *, fmt, argp) +print_statusline(STATUS_TIMER timeout, const char *fmt, ...) { + va_list argp; char buf[MAX_LEN + 1]; + + va_start(argp, fmt); #ifdef STATUSLINE if (!XtIsRealized(top_level) || !initialized || !resource.statusline) { @@ -331,4 +336,4 @@ } #endif /* STATUSLINE */ va_end(argp); -}} +} diff -Naur xdvik-22.40n/texk/xdvik/string-utils.c xdvik-22.40o/texk/xdvik/string-utils.c --- xdvik-22.40n/texk/xdvik/string-utils.c Thu May 30 12:02:01 2002 +++ xdvik-22.40o/texk/xdvik/string-utils.c Thu Sep 19 23:10:05 2002 @@ -113,8 +113,7 @@ *------------------------------------------------------------*/ int -length_of_int(n) - int n; +length_of_int(int n) { int ret = 0; if (n < 0) { @@ -133,8 +132,7 @@ int -length_of_ulong(n) - unsigned long n; +length_of_ulong(unsigned long n) { int ret = 0; @@ -152,8 +150,7 @@ returns malloc()ed string (caller is responsible for free()ing). */ char * -normalize_and_expand_filename(filename) - char *filename; +normalize_and_expand_filename(char *filename) { char *expanded_filename = NULL; char *save_ptr = NULL; diff -Naur xdvik-22.40n/texk/xdvik/texmf/CVS/Entries xdvik-22.40o/texk/xdvik/texmf/CVS/Entries --- xdvik-22.40n/texk/xdvik/texmf/CVS/Entries Mon Sep 16 17:45:07 2002 +++ xdvik-22.40o/texk/xdvik/texmf/CVS/Entries Wed Oct 16 23:45:11 2002 @@ -3,8 +3,8 @@ /lucida.map/1.1.1.1.6.1/Sat Apr 13 15:28:14 2002//Txdvik_22_40_STABLE /marvosym.map/1.1.1.1/Wed Apr 18 14:24:49 2001//Txdvik_22_40_STABLE /testfont.log/1.1.1.1/Wed Apr 18 14:24:49 2001//Txdvik_22_40_STABLE -/xdvi-teTeX.cfg/1.1.2.1/Tue Aug 20 22:32:32 2002//Txdvik_22_40_STABLE -/xdvi.cfg/1.2.4.1/Wed Aug 14 22:50:20 2002//Txdvik_22_40_STABLE +/xdvi-teTeX.cfg/1.1.2.2/Mon Oct 14 23:42:31 2002//Txdvik_22_40_STABLE +/xdvi.cfg/1.2.4.3/Mon Oct 14 23:44:55 2002//Txdvik_22_40_STABLE /xdvifont.map/1.1.1.1/Wed Apr 18 14:24:49 2001//Txdvik_22_40_STABLE /xypic.map/1.1.1.1/Wed Apr 18 14:24:49 2001//Txdvik_22_40_STABLE D diff -Naur xdvik-22.40n/texk/xdvik/texmf/xdvi-teTeX.cfg xdvik-22.40o/texk/xdvik/texmf/xdvi-teTeX.cfg --- xdvik-22.40n/texk/xdvik/texmf/xdvi-teTeX.cfg Tue Aug 20 22:32:32 2002 +++ xdvik-22.40o/texk/xdvik/texmf/xdvi-teTeX.cfg Mon Oct 14 23:42:31 2002 @@ -1,4 +1,4 @@ -% Comments may only start in the first column in xdvi cfg files. +% Lines starting with percent chars are comment lines. % % Nicolai Langfeldt 2001.6.5 % Changes by Thomas Esser for teTeX, Sat Nov 3 23:33:54 CET 2001. diff -Naur xdvik-22.40n/texk/xdvik/texmf/xdvi.cfg xdvik-22.40o/texk/xdvik/texmf/xdvi.cfg --- xdvik-22.40n/texk/xdvik/texmf/xdvi.cfg Wed Aug 14 22:50:20 2002 +++ xdvik-22.40o/texk/xdvik/texmf/xdvi.cfg Mon Oct 14 23:44:55 2002 @@ -1,4 +1,4 @@ -% Comments may only start in the first column in xdvi cfg files. +% Lines starting with percent chars are comment lines. % % Nicolai Langfeldt 2001.6.5 % diff -Naur xdvik-22.40n/texk/xdvik/util.c xdvik-22.40o/texk/xdvik/util.c --- xdvik-22.40n/texk/xdvik/util.c Sat Sep 14 23:18:44 2002 +++ xdvik-22.40o/texk/xdvik/util.c Thu Sep 19 23:10:05 2002 @@ -82,7 +82,7 @@ */ static void -exit_clean_windows() +exit_clean_windows(void) { unsigned char *window_list; size_t window_list_len; @@ -165,8 +165,7 @@ */ NORETURN void -xdvi_exit(status) - int status; +xdvi_exit(int status) { /* Clean up the "xdvi windows" property in the root window. */ if (top_level) @@ -188,7 +187,7 @@ */ NORETURN void -xdvi_abort() +xdvi_abort(void) { /* Clean up the "xdvi windows" property in the root window. */ if (top_level) @@ -208,16 +207,20 @@ int lastwwwopen; + NORETURN void -oops PVAR1C(_Xconst char *, message, args) +oops(_Xconst char *fmt, ...) { - Fprintf(stderr, "%s: ", prog); + va_list argp; + va_start(argp, fmt); + + fprintf(stderr, "%s: ", prog); - (void)vfprintf(stderr, message, args); - va_end(args); - Putc('\n', stderr); + (void)vfprintf(stderr, fmt, argp); + va_end(argp); + putc('\n', stderr); xdvi_exit(1); -}} +} /* realpath implementation if no implementation available. Try to canonicalize path, removing `.' and `..' and expanding symlinks. @@ -376,8 +379,7 @@ */ void * -xmalloc(size) - unsigned size; +xmalloc(unsigned size) { /* Avoid malloc(0), though it's not clear if it ever actually happens any more. */ @@ -389,9 +391,7 @@ } void * -xrealloc(where, size) - void *where; - unsigned size; +xrealloc(void *where, unsigned size) { void *mem = realloc(where, size); @@ -406,8 +406,7 @@ */ char * -xstrdup(str) - _Xconst char *str; +xstrdup(_Xconst char *str) { size_t len; char *new; @@ -424,9 +423,7 @@ */ char * -xmemdup(str, len) - _Xconst char *str; - size_t len; +xmemdup(_Xconst char *str, size_t len) { char *new; @@ -442,8 +439,7 @@ */ void -expandline(n) - size_t n; +expandline(size_t n) { size_t newlen = n + 128; @@ -457,8 +453,7 @@ */ void -alloc_bitmap(bitmap) - struct bitmap *bitmap; +alloc_bitmap(struct bitmap *bitmap) { unsigned int size; @@ -478,9 +473,7 @@ extern char **environ; void -xputenv(var, value) - _Xconst char *var; - _Xconst char *value; +xputenv(_Xconst char *var, _Xconst char *value) { #if HAVE_PUTENV @@ -548,10 +541,7 @@ */ int -memicmp(s1, s2, n) - _Xconst char *s1; - _Xconst char *s2; - size_t n; +memicmp(_Xconst char *s1, _Xconst char *s2, size_t n) { while (n > 0) { int i = tolower(*s1) - *s2; @@ -570,7 +560,7 @@ */ static void -close_a_file() +close_a_file(void) { struct font *fontp; unsigned short oldest = ~0; @@ -597,7 +587,7 @@ #if SUNOS4 static void -close_small_file() +close_small_file(void) { struct font *fontp; unsigned short oldest = ~0; @@ -750,8 +740,7 @@ */ int -xpipe(fd) - int *fd; +xpipe(int *fd) { int retval; @@ -771,9 +760,7 @@ */ _Xconst struct passwd * -ff_getpw(pp, p_end) - _Xconst char **pp; - _Xconst char *p_end; +ff_getpw(_Xconst char **pp, _Xconst char *p_end) { _Xconst char *p = *pp; _Xconst char *p1; @@ -825,9 +812,7 @@ */ unsigned long -num(fp, size) - FILE *fp; - int size; +num(FILE *fp, int size) { long x = 0; @@ -837,9 +822,7 @@ } long -snum(fp, size) - FILE *fp; - int size; +snum(FILE *fp, int size) { long x; @@ -857,13 +840,13 @@ size_t -property_get_data(w, a, ret_buf, x_get_property) - Window w; - Atom a; - unsigned char **ret_buf; - int (*x_get_property) ARGS((Display *, Window, Atom, long, - long, Bool, Atom, Atom *, int *, unsigned long *, - unsigned long *, unsigned char **)); +property_get_data(Window w, + Atom a, + unsigned char **ret_buf, + int (*x_get_property)(Display *, Window, Atom, long, + long, Bool, Atom, Atom *, + int *, unsigned long *, + unsigned long *, unsigned char **)) { /* all of these are in 8-bit units */ long byte_offset = 0; @@ -933,8 +916,7 @@ static _Xconst char tmp_suffix[] = "/xdvi-XXXXXX"; int -xdvi_temp_fd(str) - char **str; +xdvi_temp_fd(char **str) { int fd; char *p; @@ -1039,9 +1021,7 @@ */ void -fork_process(proc_name, argv) - _Xconst char *proc_name; - char *_Xconst argv[]; +fork_process(_Xconst char *proc_name, char *_Xconst argv[]) { int i; int fork_cmd_len = 0; @@ -1098,7 +1078,7 @@ /* print error messages of forked childs */ void -print_child_error() +print_child_error(void) { int bytes; int buf_old_size = 0, buf_new_size = 0; diff -Naur xdvik-22.40n/texk/xdvik/version.h xdvik-22.40o/texk/xdvik/version.h --- xdvik-22.40n/texk/xdvik/version.h Mon Sep 16 17:08:18 2002 +++ xdvik-22.40o/texk/xdvik/version.h Wed Oct 16 23:22:32 2002 @@ -1,4 +1,4 @@ -#define XDVERSION "22.40n" +#define XDVERSION "22.40o" #ifdef Omega #define TVERSION XDVERSION" for Omega" #else diff -Naur xdvik-22.40n/texk/xdvik/vf.c xdvik-22.40o/texk/xdvik/vf.c --- xdvik-22.40n/texk/xdvik/vf.c Wed Apr 18 14:24:47 2001 +++ xdvik-22.40o/texk/xdvik/vf.c Thu Oct 10 18:38:22 2002 @@ -55,9 +55,7 @@ #else void #endif -read_VF_index(fontp, hushcs) - struct font *fontp; - wide_bool hushcs; +read_VF_index(struct font *fontp, wide_bool hushcs) { FILE *VF_file = fontp->file; ubyte cmnd; @@ -68,7 +66,8 @@ unsigned long maxcc = 0; int i; #endif - + Boolean dummy = False; + fontp->read_char = NULL; fontp->flags |= FONT_VIRTUAL; fontp->set_char_p = set_vf_char; @@ -92,10 +91,12 @@ bzero((char *)fontp->vf_table, VFTABLELEN * sizeof(struct font *)); fontp->vf_chain = NULL; fontp->first_font = NULL; + while ((cmnd = one(VF_file)) >= FNTDEF1 && cmnd <= FNTDEF4) { struct font *newfontp = define_font(VF_file, cmnd, fontp, fontp->vf_table, VFTABLELEN, - &fontp->vf_chain); + &fontp->vf_chain, + &dummy); if (fontp->first_font == NULL) fontp->first_font = newfontp; } diff -Naur xdvik-22.40n/texk/xdvik/wwwfetch.c xdvik-22.40o/texk/xdvik/wwwfetch.c --- xdvik-22.40n/texk/xdvik/wwwfetch.c Fri Sep 13 00:59:29 2002 +++ xdvik-22.40o/texk/xdvik/wwwfetch.c Sat Oct 12 23:59:36 2002 @@ -51,15 +51,13 @@ /* access methods to filelist for external modules */ char * -htex_file_at_index(idx) - int idx; +htex_file_at_index(int idx) { return filelist[idx].file; } char * -htex_url_at_index(idx) - int idx; +htex_url_at_index(int idx) { return filelist[idx].url; } @@ -67,17 +65,18 @@ /* print errors from libwww calls */ static Boolean -www_error_print (request, op, msgnum, dfault, input, reply) - HTRequest *request; - HTAlertOpcode op; - int msgnum; - const char *dfault; - void *input; - HTAlertPar *reply; +www_error_print(HTRequest *request, + HTAlertOpcode op, + int msgnum, + const char *dfault, + void *input, + HTAlertPar *reply) { HTParentAnchor *anchor = HTRequest_anchor(request); char *uri = HTAnchor_address((HTAnchor*) anchor); char *msg = HTDialog_errorMessage(request, op, msgnum, dfault, input); + UNUSED(reply); + if (msg) { do_popup_message(MSG_ERR, NULL, "Couldn't fetch `%s':\nlibwww: %s\n", uri, msg); free(msg); @@ -88,12 +87,14 @@ /* call after libwww calls to treat error messages */ static int -www_info_filter (request, response, param, status) - HTRequest *request; - HTResponse *response; - void *param; - int status; +www_info_filter(HTRequest *request, + HTResponse *response, + void *param, + int status) { + UNUSED(param); + UNUSED(response); + switch (status) { case HT_LOADED: /* success */ break; @@ -115,9 +116,16 @@ HTAlertPar *reply) { const char *msg = HTDialogs[msgnum]; /* it seems there is no public function for this one ??? */ + UNUSED(request); + UNUSED(op); + UNUSED(dfault); + UNUSED(input); + UNUSED(reply); + fprintf(stderr, "LOGIN =========\n"); fprintf(stderr, "%s\n", msg); do_popup_message(MSG_INFO, "Sorry, login functionality is not implemented yet", "Not implemented yet: %s", msg); + return False; } static Boolean @@ -127,14 +135,17 @@ HTAlertPar *reply) { char *msg = HTDialog_errorMessage(request, op, msgnum, dfault, input); + UNUSED(reply); + fprintf(stderr, "PASSWD =========\n"); if (msg == NULL) - return; + return False; fprintf(stderr, "%s\n", msg); do_popup_message(MSG_INFO, "Sorry, this URI requires authentication, but " "password functionality is not implemented yet", "Not implemented yet: %s", msg); free(msg); + return False; } static Boolean @@ -144,11 +155,9 @@ HTAlertPar *reply) { char *msg = HTDialog_errorMessage(request, op, msgnum, dfault, input); - fprintf(stderr, "ERROR =========\n"); if (msg == NULL) - return; - fprintf(stderr, "%s\n", msg); - do_popup_message(MSG_ERR, NULL, "error: %s", msg); + return False; + do_popup_message(MSG_ERR, NULL, "Libwww error: %s", msg); free(msg); return HTAlert_setReplyMessage(reply, "anonymous"); } @@ -164,9 +173,11 @@ char *uri = HTAnchor_address((HTAnchor*) anchor); XEvent event; char buf[2048]; - size_t offset; +/* size_t offset; */ char *msg = HTDialog_progressMessage(request, op, msgnum, dfault, input); + UNUSED(reply); + /* TODO: add some fancy animation here ... */ snprintf(buf, 2048, "Retrieving \"%s\": %s", uri, msg); @@ -182,6 +193,7 @@ while (XCheckMaskEvent(DISP, ExposureMask, &event)) XtDispatchEvent(&event); #endif + return True; } /* wrapper for HTLoadToFile to work around a bug in that function */ @@ -221,9 +233,7 @@ /* Given absolute URL, open a temporary filename, and do the transfer */ int -www_fetch(url, savefile) - char *url; - char *savefile; +www_fetch(char *url, char *savefile) { int status; XEvent event; @@ -319,9 +329,7 @@ /* Turn a relative URL into an absolute one: */ void -make_absolute(rel, base, len) - char *rel, *base; - int len; +make_absolute(char *rel, char *base, int len) { char *cp, *parsed; @@ -337,7 +345,7 @@ } void -wait_for_urls() +wait_for_urls(void) { /* Wait for all the children to finish... */ int i; #ifdef DOFORKS @@ -394,9 +402,7 @@ /* Start a fetch of a relative URL */ int -fetch_relative_url(base_url, rel_url) - char *base_url; - _Xconst char *rel_url; +fetch_relative_url(char *base_url, _Xconst char *rel_url) { int resp; char *tmpfile = NULL; diff -Naur xdvik-22.40n/texk/xdvik/xdvi-config.h xdvik-22.40o/texk/xdvik/xdvi-config.h --- xdvik-22.40n/texk/xdvik/xdvi-config.h Mon May 21 14:19:25 2001 +++ xdvik-22.40o/texk/xdvik/xdvi-config.h Tue Oct 15 21:15:02 2002 @@ -6,12 +6,6 @@ #define KPATHSEA 1 -/* The stuff from the path searching library. */ -#include "kpathsea/c-auto.h" -#include "kpathsea/config.h" - -#include - #ifndef HAVE_VPRINTF #ifdef HAVE_DOPRNT #define vfprintf(stream, message, args) _doprnt(message, args, stream) diff -Naur xdvik-22.40n/texk/xdvik/xdvi.c xdvik-22.40o/texk/xdvik/xdvi.c --- xdvik-22.40n/texk/xdvik/xdvi.c Sat Sep 14 23:18:44 2002 +++ xdvik-22.40o/texk/xdvik/xdvi.c Tue Oct 15 21:15:02 2002 @@ -613,8 +613,8 @@ "s:drag(|)\n" "s:drag(-)\n" "^:source-special()\n" - ":magnifier(*1)\n" - ":magnifier(*2)\n" + ":do-href()magnifier(*1)\n" + ":do-href-newwindow()magnifier(*2)\n" ":magnifier(*3)\n" ":magnifier(*4)\n" ":magnifier(*5)\n" @@ -974,10 +974,10 @@ /* ARGSUSED */ static XtGeometryResult -QueryGeometry(w, constraints, reply) - Widget w; - XtWidgetGeometry *constraints, *reply; +QueryGeometry(Widget w, XtWidgetGeometry *constraints, XtWidgetGeometry *reply) { + UNUSED(w); + UNUSED(constraints); reply->request_mode = CWWidth | CWHeight; reply->width = page_w; reply->height = page_h; @@ -1226,7 +1226,7 @@ #endif /* TOOLKIT */ static NORETURN void -usage() +usage(void) { #ifdef TOOLKIT XrmOptionDescRec *opt; @@ -1319,9 +1319,7 @@ } static int -atopix(arg, allow_minus) - _Xconst char *arg; - Boolean allow_minus; +atopix(_Xconst char *arg, Boolean allow_minus) { int len = strlen(arg); _Xconst char *arg_end = arg; @@ -1384,8 +1382,7 @@ /* extract the unit used in paper size specification */ /* the information is used to decide the initial grid separation */ static int -atopixunit(arg) - _Xconst char *arg; +atopixunit(_Xconst char *arg) { int len = strlen(arg); @@ -1441,14 +1438,13 @@ #if XtSpecificationRelease >= 5 - /*ARGSUSED*/ static Boolean -XdviCvtStringToPixel(dpy, args, num_args, fromVal, toVal, closure_ret) - Display *dpy; - XrmValuePtr args; - Cardinal *num_args; - XrmValuePtr fromVal; - XrmValuePtr toVal; - XtPointer *closure_ret; +/*ARGSUSED*/ static Boolean +XdviCvtStringToPixel(Display *dpy, + XrmValuePtr args, + Cardinal *num_args, + XrmValuePtr fromVal, + XrmValuePtr toVal, + XtPointer *closure_ret) { XrmValue replacement_val; Boolean default_is_fg; @@ -1491,13 +1487,12 @@ } static Boolean -XdviCvtStringToPixel(dpy, args, num_args, fromVal, toVal, closure_ret) - Display *dpy; - XrmValuePtr args; - Cardinal *num_args; - XrmValuePtr fromVal; - XrmValuePtr toVal; - XtPointer *closure_ret; +XdviCvtStringToPixel(Display *dpy, + XrmValuePtr args, + Cardinal *num_args, + XrmValuePtr fromVal, + XrmValuePtr toVal, + XtPointer *closure_ret) { String str = (String) fromVal->addr; XColor screenColor; @@ -1561,17 +1556,19 @@ * Convert string to yes/no/maybe. Adapted from the X toolkit. */ - /*ARGSUSED*/ static Boolean -XdviCvtStringToBool3(dpy, args, num_args, fromVal, toVal, closure_ret) - Display *dpy; - XrmValuePtr args; - Cardinal *num_args; - XrmValuePtr fromVal; - XrmValuePtr toVal; - XtPointer *closure_ret; +/*ARGSUSED*/ static Boolean +XdviCvtStringToBool3(Display *dpy, + XrmValuePtr args, + Cardinal *num_args, + XrmValuePtr fromVal, + XrmValuePtr toVal, + XtPointer *closure_ret) { String str = (String) fromVal->addr; static Bool3 value; + UNUSED(closure_ret); + UNUSED(num_args); + UNUSED(args); if (memicmp(str, "true", 5) == 0 || memicmp(str, "yes", 4) == 0 @@ -1682,8 +1679,7 @@ }; static Pixel -string_to_pixel(strp) /* adapted from the toolkit */ - char **strp; +string_to_pixel(char **strp) /* adapted from the toolkit */ { char *str = *strp; Status status; @@ -1714,9 +1710,7 @@ */ static void -parse_options(argc, argv) - int argc; - char **argv; +parse_options(int argc, char **argv) { char **arg; char **argvend = argv + argc; @@ -1895,9 +1889,7 @@ static int (*XdviOldErrorHandler) ARGS((Display *, XErrorEvent *)); static int -XdviErrorHandler(d, event) - Display *d; - XErrorEvent *event; +XdviErrorHandler(Display *d, XErrorEvent *event) { if (event->serial != xdvi_next_request || event->error_code != BadWindow) return XdviOldErrorHandler(d, event); @@ -1942,7 +1934,7 @@ */ static Boolean -src_client_check() +src_client_check(void) { unsigned char *window_list; size_t window_list_len; @@ -2037,7 +2029,7 @@ && memcmp(buf_ret, dvi_property, len) == 0) { XChangeProperty(DISP, w, ATOM_SRC_GOTO, ATOM_SRC_GOTO, 8, PropModeReplace, - resource.src_pos, strlen(resource.src_pos)); + (unsigned char *)resource.src_pos, strlen(resource.src_pos)); retval = True; break; } @@ -2054,12 +2046,18 @@ return retval; } - +/* Translation of valid paper types to dimensions, + which are used internally. The newline characters are a hack + to format the list neatly for error messages. +*/ static _Xconst char *paper_types[] = { "us", "8.5x11in", "usr", "11x8.5in", "legal", "8.5x14in", + "legalr", "14x8.5in", "foolscap", "13.5x17.0in", /* ??? */ + "foolscapr", "17.0x13.5in", + "\n", "0", /* ISO `A' formats, Portrait */ "a1", "59.4x84.0cm", @@ -2069,6 +2067,7 @@ "a5", "14.85x21.0cm", "a6", "10.5x14.85cm", "a7", "7.42x10.5cm", + "\n", "0", /* ISO `A' formats, Landscape */ "a1r", "84.0x59.4cm", @@ -2078,6 +2077,7 @@ "a5r", "21.0x14.85cm", "a6r", "14.85x10.5cm", "a7r", "10.5x7.42cm", + "\n", "0", /* ISO `B' formats, Portrait */ "b1", "70.6x100.0cm", @@ -2087,6 +2087,7 @@ "b5", "17.6x25.0cm", "b6", "13.5x17.6cm", "b7", "8.8x13.5cm", + "\n", "0", /* ISO `B' formats, Landscape */ "b1r", "100.0x70.6cm", @@ -2096,6 +2097,7 @@ "b5r", "25.0x17.6cm", "b6r", "17.6x13.5cm", "b7r", "13.5x8.8cm", + "\n", "0", /* ISO `C' formats, Portrait */ "c1", "64.8x91.6cm", @@ -2105,6 +2107,7 @@ "c5", "16.2x22.9cm", "c6", "11.46x16.2cm", "c7", "8.1x11.46cm", + "\n", "0", /* ISO `C' formats, Landscape */ "c1r", "91.6x64.8cm", @@ -2117,7 +2120,7 @@ }; static Boolean -set_paper_type() +set_paper_type(void) { _Xconst char *arg, *arg1; char temp[21]; @@ -2161,11 +2164,7 @@ do not use up too much real estate. */ void -set_icon_and_title(dvi_name, icon_ret, title_ret, set_std) - char *dvi_name; - char **icon_ret; - char **title_ret; - int set_std; +set_icon_and_title(char *dvi_name, char **icon_ret, char **title_ret, int set_std) { /* Use basename of DVI file for name in icon and title. */ unsigned baselen; @@ -2234,9 +2233,7 @@ */ int -main(argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { #ifndef TOOLKIT @@ -2460,8 +2457,9 @@ } if (debug & DBG_CLIENT) { - for (i = 0; i < XtNumber(atom_names); ++i) - TRACE_CLIENT((stderr, "Atom(%s) = %lu", atom_names[i], atoms[i])); + unsigned k; + for (k = 0; k < XtNumber(atom_names); ++k) + TRACE_CLIENT((stderr, "Atom(%s) = %lu", atom_names[k], atoms[k])); } if (dvi_name == NULL) { @@ -2548,8 +2546,17 @@ : pixels_per_inch; offset_y = resource.yoffset ? atopix(resource.yoffset, True) : pixels_per_inch; - if (!set_paper_type()) - oops("Don't recognize paper type %s", resource.paper); + if (!set_paper_type()) { + _Xconst char **p; + fprintf(stderr, "%s: Unrecognized paper type \"%s\". Legal values are:\n ", prog, resource.paper); + for (p = paper_types; p < paper_types + XtNumber(paper_types); p += 2) + fprintf(stderr, "%s ", *p); + fprintf(stderr, + "\n(the names ending with `r' are `rotated' or `landscape' variants),\n" + "or a specification `WIDTHxHEIGHT' followed by a dimension unit\n" + "(pt, pc, in, bp, cm, mm, dd, cc, or sp).\n\n"); + xdvi_exit(1); + } for (i = 0; i < 5; ++i) if (resource.mg_arg[i] != NULL) { char *s; @@ -2590,9 +2597,10 @@ kpse_init_prog("XDVI", pixels_per_inch, resource.mfmode, alt_font); if (debug) { - fprintf(stderr, "XDVI %d/%d/%s/%s\n", pixels_per_inch, shrink_factor, - resource.mfmode, alt_font); - fprintf(stderr, "Paper %s\n", resource.paper); + fprintf(stderr, "Xdvi(k) %s, ", TVERSION); + fprintf(stderr, + "configured with: ppi=%d shrink=%d mfmode=%s alt_font=%s paper=%s\n", + pixels_per_inch, shrink_factor, resource.mfmode, alt_font, resource.paper); } kpse_set_program_enabled(kpse_any_glyph_format, @@ -2643,7 +2651,7 @@ XVisualInfo *best = NULL; for (list1 = list; list1 < list + nitems_return; ++list1) - if (list1->depth > our_depth + if ((unsigned int)list1->depth > our_depth # if PS_GS /* patch by Toni Ronkko , fixes bug #458057: * Not all depths are supported by ghostscript; see @@ -3404,10 +3412,10 @@ XRecolorCursor(DISP, redraw_cursor, &cr_Color, &bg_Color); arrow_pixmap = XCreateBitmapFromData(DISP, RootWindowOfScreen(SCRN), - drag_vert_bits, drag_vert_width, + (char *)drag_vert_bits, drag_vert_width, drag_vert_height); arrow_mask = XCreateBitmapFromData(DISP, RootWindowOfScreen(SCRN), - drag_vert_mask, drag_vert_width, + (char *)drag_vert_mask, drag_vert_width, drag_vert_height); drag_cursor[0] = XCreatePixmapCursor(DISP, arrow_pixmap, arrow_mask, &cr_Color, &bg_Color, drag_vert_x_hot, drag_vert_y_hot); @@ -3415,10 +3423,10 @@ XFreePixmap(DISP, arrow_mask); arrow_pixmap = XCreateBitmapFromData(DISP, RootWindowOfScreen(SCRN), - drag_horiz_bits, drag_horiz_width, + (char *)drag_horiz_bits, drag_horiz_width, drag_horiz_height); arrow_mask = XCreateBitmapFromData(DISP, RootWindowOfScreen(SCRN), - drag_horiz_mask, drag_horiz_width, + (char *)drag_horiz_mask, drag_horiz_width, drag_horiz_height); drag_cursor[1] = XCreatePixmapCursor(DISP, arrow_pixmap, arrow_mask, &cr_Color, &bg_Color, drag_horiz_x_hot, drag_horiz_y_hot); @@ -3426,10 +3434,10 @@ XFreePixmap(DISP, arrow_mask); arrow_pixmap = XCreateBitmapFromData(DISP, RootWindowOfScreen(SCRN), - drag_omni_bits, drag_omni_width, + (char *)drag_omni_bits, drag_omni_width, drag_omni_height); arrow_mask = XCreateBitmapFromData(DISP, RootWindowOfScreen(SCRN), - drag_omni_mask, drag_omni_width, + (char *)drag_omni_mask, drag_omni_width, drag_omni_height); drag_cursor[2] = XCreatePixmapCursor(DISP, arrow_pixmap, arrow_mask, &cr_Color, &bg_Color, drag_omni_x_hot, drag_omni_y_hot); @@ -3449,7 +3457,9 @@ source_forward_search(resource.src_pos); } +#ifdef PS_GS FIXME_ps_lock = False; +#endif do_pages(); xdvi_exit(0); /* do_pages() returns if DBG_BATCH is specified */ /* make gcc happy */ diff -Naur xdvik-22.40n/texk/xdvik/xdvi.h xdvik-22.40o/texk/xdvik/xdvi.h --- xdvik-22.40n/texk/xdvik/xdvi.h Sat Sep 14 23:18:44 2002 +++ xdvik-22.40o/texk/xdvik/xdvi.h Tue Oct 15 22:48:32 2002 @@ -37,13 +37,24 @@ * The C environment * *******************************/ +/* The stuff from the path searching library. */ +/* NOTE SU: This makes the following #ifdefs partly redundant, + but I didn't dare to touch too much of them; and we *need* + the kpathsea settings for header compatiblility. */ +#include "kpathsea/c-auto.h" +#include "kpathsea/config.h" + #ifdef __hpux /* On HP-UX 10.10 B and 20.10, compiling with _XOPEN_SOURCE + ..._EXTENDED * leads to poll() not realizing that a file descriptor is writable in psgs.c. */ #define _HPUX_SOURCE 1 #else -#define _XOPEN_SOURCE 600 +/* SU: Don't define _XOPEN_SOURCE unconditionally, as in non-k xdvi - this + will give problems with kpathsearch e.g. on Tru64 */ +#ifndef _XOPEN_SOURCE +#define _XOPEN_SOURCE 600 +#endif #define _XOPEN_SOURCE_EXTENDED 1 #define __EXTENSIONS__ 1 /* needed to get struct timeval on SunOS 5.5 */ #define _SVID_SOURCE 1 /* needed to get S_IFLNK in glibc */ @@ -152,6 +163,11 @@ #define False 0 #define Maybe 2 +/* for unused parameters */ +#ifndef UNUSED +#define UNUSED(x) ((void)(x)) +#endif + #ifdef VMS #include #define index strchr @@ -212,6 +228,13 @@ #endif /* STDC */ #endif /* _Xconst */ +#if __STDC__ && !defined(FUNCPROTO) +/* FUNCPROTO is a bitmask specifying ANSI conformance (see Xfuncproto.h). + The single bits specify varargs, const availability, prototypes etc.; + we enable everything here. */ +# define FUNCPROTO (-1) +#endif + #ifndef VOLATILE #if __STDC__ || (defined(__stdc__) && defined(__convex__)) #define VOLATILE volatile @@ -343,7 +366,7 @@ struct framedata data; struct font *fontp; set_char_proc set_char_p; - int tn_table_len; + unsigned int tn_table_len; struct font **tn_table; struct tn *tn_head; ubyte *pos, *end; @@ -375,7 +398,7 @@ EXTERN int current_page; EXTERN int total_pages; EXTERN int pageno_correct INIT(1); -EXTERN long magnification; +EXTERN unsigned long magnification; EXTERN double dimconv; EXTERN double tpic_conv; EXTERN int n_files_left INIT(32767); /* for LRU closing of fonts */ @@ -524,7 +547,7 @@ struct tn { struct tn *next; /* link to next TeXnumber info block */ - int TeXnumber; /* font number (in DVI file) */ + unsigned int TeXnumber; /* font number (in DVI file) */ struct font *fontp; /* pointer to the rest of the info */ }; @@ -553,7 +576,7 @@ _Xconst char *wheel_translations; #endif int wheel_unit; - int _density; + unsigned int _density; #ifdef GREY float _gamma; #endif @@ -864,7 +887,7 @@ int shrinkfactor; int base_x, base_y; unsigned int width, height; - int min_x, max_x, min_y, max_y; /* for pending expose events */ + int min_x, max_x, min_y, max_y; /* for pending expose events */ }; extern struct WindowRec mane, alt, currwin; @@ -976,7 +999,7 @@ * Procedures * *******************************/ -_XFUNCPROTOBEGIN +_XFUNCPROTOBEGIN /* expands to `extern "C" {' in C++ mode */ extern void fork_process ARGS((_Xconst char *file, char *_Xconst argv[])); extern void print_child_error ARGS((void)); @@ -999,7 +1022,7 @@ STATUS_LONG = 90 } STATUS_TIMER; -extern void print_statusline PVAR2H(STATUS_TIMER, _Xconst char *); +extern void print_statusline(STATUS_TIMER, _Xconst char *fmt, ...); extern void force_statusline_update ARGS((void)); #ifdef STATUSLINE @@ -1045,7 +1068,7 @@ extern Boolean load_font ARGS((struct font *)); extern struct font *define_font ARGS((FILE *, wide_ubyte, struct font *, struct font **, unsigned int, - struct tn **)); + struct tn **, Boolean *not_found_flag)); extern void init_page ARGS((void)); extern void open_dvi_file ARGS((void)); extern void form_dvi_property ARGS((void)); @@ -1070,7 +1093,8 @@ #ifdef T1LIB extern int tfmload ARGS((char *, long *, long *)); extern void read_T1_char ARGS((struct font *, wide_ubyte)); -extern int find_T1_font ARGS((char *)); +extern void add_T1_mapentry ARGS((int, char *, const char *, char *, char *, char *)); +extern int find_T1_font ARGS((const char *)); #endif /* T1LIB */ extern int getpsinfo ARGS((char *)); extern void draw_page ARGS((void)); @@ -1120,9 +1144,9 @@ extern NORETURN void xdvi_exit ARGS((int)); extern NORETURN void xdvi_abort ARGS((void)); -extern void geom_do_special ARGS((struct geom_info *, _Xconst char *, double)); +extern void geom_do_special ARGS((struct geom_info *, char *, double)); -extern NORETURN void oops PVAR1H(_Xconst char *); +extern NORETURN void oops(_Xconst char *fmt, ...); extern char *my_realpath(const char *path, char *real); @@ -1218,7 +1242,7 @@ #ifdef TOOLKIT extern void show_help ARGS((Widget)); -extern void do_popup_message PVAR3H(int type, char *helptext, char *format); +extern void do_popup_message(int type, char *helptext, char *msg, ...); #define MSG_HELP 0 #define MSG_INFO 1 #define MSG_WARN 2 diff -Naur xdvik-22.40n/texk/xdvik/xdvi.man xdvik-22.40o/texk/xdvik/xdvi.man --- xdvik-22.40n/texk/xdvik/xdvi.man Sat Aug 31 17:11:40 2002 +++ xdvik-22.40o/texk/xdvik/xdvi.man Sun Oct 13 21:03:11 2002 @@ -147,13 +147,15 @@ .PP This program has the capability of showing the file shrunken by various (integer) factors, and also has a ``magnifying glass'' which allows one -to see a small part of the unshrunk image momentarily. Other new features: +to see a small part of the unshrunk image momentarily. It has also support +for +#ifhyper +hyperlinks in DVI files (see section HYPERLINKS below), +#endif #ift1 -it can display Postscript Type1 fonts directly without converting -them to pixel fonts (see the section T1LIB below), and +direct rendering of Postscript Type1 fonts (see section T1LIB below), and #endif -it has support for source -specials in the .dvi file (see section SOURCE SPECIALS below). +source specials in the .dvi file (see section SOURCE SPECIALS below). .PP Before displaying any page or part thereof, it checks to see if the .I dvi @@ -968,8 +970,6 @@ There are also synonyms which may be used: .B us (8.5x11in), -.B usr -(11x8.5in), .B legal (8.5x14in), .B foolscap @@ -977,10 +977,13 @@ as well as the ISO sizes .BR a1 - a7 , .BR b1 - b7 , -.BR c1 - c7 , -.BR a1r - a7r -.RB ( a1 - a7 -rotated), etc. The default size is @DEFAULT_PAGE_SIZE@. +.BR c1 - c7 . +For each of these there also exists a landscape or `rotated' +variant: +.B usr +(11x8.5in), +.BR a1r - a7r , +etc. The default size is @DEFAULT_PAGE_SIZE@. .TP .B \-rv .RB ( .reverseVideo ) @@ -1137,6 +1140,7 @@ recognizes the following keystrokes when typed in its window. Each may optionally be preceded by a (positive or negative) number, whose interpretation will depend on the particular keystroke. +The number can be discarded by pressing the ``Escape'' key. Also, the ``Help'', ``Home'', ``Prior'' and ``Next'' keys are synonyms for .RB ` ? ', @@ -1314,6 +1318,11 @@ clear and set this flag, respectively. See also the .B \-keep option. +.TP +.B ESC +.RB [ discard-number() ] +The escape key discards the numerical prefix for all actions +(useful when you mistyped a number). #ifbuttons .TP .B x @@ -1358,6 +1367,15 @@ .RB ` 150G ' turns on greyscale and sets gamma to 1.5. #endif +#ifhyper +.TP +.B B +.RB [ htex-back() ] +This key jumps back to the previous hyperlink anchor. See the +section +.B HYPERLINKS +for more information on navigating the links. +#endif #ifgrid .TP .B D @@ -1488,38 +1506,6 @@ .I CTRL key and clicking on mouse button 1 starts a ``reverse search'' (action \fB source-special()\fR; see the section on SOURCE SPECIALS for details). -#ifhyper -.PP -If the mouse cursor is on a hypertext link (underlined by default), then -that link overrides the magnifying glass for Buttons 1 and 2. -If Button 1 is clicked over a link, then -.B xdvi -jumps to the target in the current window. If Button 2 is clicked over a link, -then -.B xdvi -opens a new window on the target. -.PP -More precisely, for internal links, Button 1 jumps in the same window to -the link, while Button 2 starts up a new -.B xdvi -on the link. For external links to -.I dvi -files, Button 1 changes the current -.B xdvi -to be reading that file, while Button 2 starts a new -.B xdvi -on that file. For other file types, -.B mime.types -and -.B mailcap -are parsed to determine the viewer; finally, if no suitable -.B mailcap -entry was found, if the -.SB WWWBROWSER -environment variable is set, or -.B \-browser -was specified on the command line, it is started up on the file. -#endif .PP The scrollbars (if present) behave in the standard way: pushing Button 2 in a scrollbar moves the top or left edge of the scrollbar to that point @@ -1529,9 +1515,9 @@ Button 3 moves the image down or left by the same amount. .PP The image can also be dragged around, by holding down the shift key -and a mouse button. Shift-button 1 will allow vertical dragging only; -Shift-button 3, horizontal dragging; and Shift-button 2 allows dragging -in either direction. To access these actions via customization, use the +and a mouse button. Shift-button 1 allows dragging in all directions, +Shift-button 2 allows vertical dragging only, and Shift-button 3 +horizontal dragging only. To access these actions via customization, use the .B drag action. This action should have one parameter, the character .RB `` | '', @@ -1549,6 +1535,55 @@ action. This action takes one parameter, giving the distance to scroll the image. If the parameter contains a decimal point, the distance is given in wheel units; otherwise, pixels. +#ifhyper +.SH HYPERLINKS +The mouse actions +.B do-href() +and +.BR do-href-newwindow() +are special in that they override other actions specified for the same +button if the mouse is located over a hyperlink. Hyperlinks are underlined +by default. When the cursor is over a hyperlink, it changes to a hand +shape, and the link target is displayed in the statusline at the bottom of the window. +.pp +The default setting is to override the +magnifier for buttons 1 and 2: +.RS 5 +.nf +.ft 3 +.sp 1n +xdvi.mainTranslations: #override \\ +: do-href()magnifier(*1)\\n\\ +: do-href-newwindow()magnifier(*2)\\n\\ +: magnifier(*3)\\n +.sp 1n +.ft +.fi +.RE +.PP +.B do-href() +jumps to the link target in the current xdvi +window (possibly changing the page), +.B do-href-newwindow() +opens a new instance of xdvi +with the link target. In both cases, the location of the target is +indicated by a small arrow drawn in +.highlight +color +in the left corner of the window. +.PP +For links to files other than DVI (e.g. HTML, or PostScript), the files +.B mime.types +and +.B mailcap +are parsed to determine a suitable viewer; if no suitable +.B mailcap +entry was found, if the +.SB WWWBROWSER +environment variable is set, or +.B \-browser +was specified on the command line, the browser is launched to load the file. +#endif #iftool .SH UNBOUND ACTIONS The following actions have not been assigned any keystroke, but are available diff -Naur xdvik-22.40n/texk/xdvik/xdvizilla xdvik-22.40o/texk/xdvik/xdvizilla --- xdvik-22.40n/texk/xdvik/xdvizilla Thu Jan 1 00:00:00 1970 +++ xdvik-22.40o/texk/xdvik/xdvizilla Sat Oct 12 13:28:50 2002 @@ -0,0 +1,81 @@ +#! /bin/sh + +# This is a kludge to fix helper apps in mozilla. See mozilla bugs #57420 +# and also #78919. + +# It's also useful for tar files with Netscape 4.x + +NO_RM= + +if [ $# -gt 1 -a "x$1" = "x-no-rm" ]; then + NO_RM=y + shift +fi + +if [ $# -ne 1 ]; then + xmessage -nearmouse 'Usage: xdvizilla [-no-rm] ' + exit 1 +fi + +DIR=`dirname "$0"` + +if [ "$DIR" = . ]; then + DIR= +elif [ -f "$DIR"/xdvi -a -x "$DIR"/xdvi ]; then + DIR="$DIR"/ +else + DIR= +fi + +FILE=$1 +FILETYPE=`file "$FILE"` + +case "$FILETYPE" in + + *"gzip compressed data"*) + FILE=/tmp/xdvizilla$$ + gunzip -c "$1" > $FILE + [ -n "$NO_RM" ] || rm -f -- "$1" + NO_RM= + FILETYPE=`file "$FILE"` + ;; + + *"compressed data"* | *"compress'd data"*) + FILE=/tmp/xdvizilla$$ + uncompress -c "$1" > $FILE + [ -n "$NO_RM" ] || rm -f -- "$1" + NO_RM= + FILETYPE=`file "$FILE"` + ;; + + "$1: empty") + xmessage -nearmouse "$1 is an empty file +(this is a bug in Mozilla)" + [ -n "$NO_RM" ] || rm -f -- "$1" + exit 1 + ;; + +esac + +case "$FILETYPE" in + + *" tar archive") + TARDIR=/tmp/xdvitar$$ + mkdir $TARDIR + cat "$FILE" | (cd $TARDIR; tar xf -) + DVINAME=`tar tf "$FILE" | grep '\.dvi$' | head -1` + [ -n "$NO_RM" ] || rm -f -- "$FILE" + if [ -z "$DVINAME" ]; then + xmessage -nearmouse "Tar file does not contain a dvi file" + else + (cd $TARDIR; "$DIR"xdvi -safer "$DVINAME") + fi + rm -rf $TARDIR + ;; + + *) + "$DIR"xdvi -safer "$FILE" + [ -n "$NO_RM" ] || rm -f -- "$FILE" + ;; + +esac diff -Naur xdvik-22.40n/texk/xdvik/xdvizilla.1 xdvik-22.40o/texk/xdvik/xdvizilla.1 --- xdvik-22.40n/texk/xdvik/xdvizilla.1 Thu Jan 1 00:00:00 1970 +++ xdvik-22.40o/texk/xdvik/xdvizilla.1 Sat Oct 12 13:28:50 2002 @@ -0,0 +1,115 @@ +.\" Copyright (c) 1990-2002 Paul Vojta +.\" +.\" 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 +.\" PAUL VOJTA 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. +.\" +.TH XDVIZILLA 1 "11 October 2002" "X Version 11" +.SH NAME +xdvizilla \- Helper application for running xdvi +.SH SYNOPSIS +.B xdvizilla +[\fB\-no\-rm\fP] +.I file +.SH DESCRIPTION +Presently (October 2002), Mozilla has some bugs with helper applications: +it passes gzipped +.RB ( .gz ) +files directly to the helper application without uncompressing, and it +passes compressed +.RB ( .Z ) +files as empty files. +.PP +To work around these problems, +.B xdvizilla +was written to look at files and decompress them correctly (depending on +their file types). +.PP +In addition, some sites produced tarred +.I dvi +files (including the +.I dvi +file as well as some included figures), and +.B xdvizilla +correctly handles those files as well. +.SH OPTIONS +Only one option is supported: +.TP +.B \-no\-rm +Normally +.B xdvizilla +will remove +.I file +before finishing. This option inhibits this behavior. +.SH INSTALLATION +In addition to installing +.B xdvizilla +in a directory on the default search path, it is necessary to set it up +as a helper application within the browser. +.PP +For +.BR "Netscape 4.x" , +add the following lines to the +.B mailcap +file: +.RS 5 +.nf +.ft 3 +.sp 1n +application/x-dvi; xdvi -safer %s +application/x-dvi-tar; xdvizilla -no-rm %s +.sp 1n +.ft +.fi +.RE +.PP +For +.BR "Netscape 6.x" , +.BR "Netscape 7.x" , +or +.BR "Mozilla 1.x" , +add the following lines to the +.B mailcap +file: +.RS 5 +.nf +.ft 3 +.sp 1n +application/x-dvi; xdvizilla %s +application/x-dvi-tar; xdvizilla %s +.sp 1n +.ft +.fi +.RE +.PP +In addition, it would be useful to check that the following line is included +in the +.B mime.types +file: +.RS 5 +.nf +.ft 3 +.sp 1n +type=application/x-dvi exts="dvi" desc="TeX dvi file" +.sp 1n +.ft +.fi +.RE +.SH SEE ALSO +.BR X (1), +.BR xdvi (1). +.SH AUTHOR +Paul Vojta, U.C. Berkeley.