changeset 2998:692ba9d441ec

[project @ 1997-05-23 02:58:08 by jwe]
author jwe
date Fri, 23 May 1997 03:00:29 +0000
parents e67089e1f2c8
children faa5d0421460
files kpathsea/AUTHORS kpathsea/ChangeLog kpathsea/HIER kpathsea/INSTALL kpathsea/MakeTeXPK.in kpathsea/Makefile.in kpathsea/NEWS kpathsea/README kpathsea/README.CONFIGURE kpathsea/absolute.c kpathsea/absolute.h kpathsea/acconfig.h kpathsea/aclocal.m4 kpathsea/basename.c kpathsea/c-auto.h.in kpathsea/c-ctype.h kpathsea/c-dir.h kpathsea/c-errno.h kpathsea/c-fopen.h kpathsea/c-limits.h kpathsea/c-memstr.h kpathsea/c-minmax.h kpathsea/c-namemx.h kpathsea/c-pathch.h kpathsea/c-pathmx.h kpathsea/c-proto.h kpathsea/c-stat.h kpathsea/c-std.h kpathsea/c-unistd.h kpathsea/c-vararg.h kpathsea/cnf.c kpathsea/cnf.h kpathsea/common.ac kpathsea/concat.c kpathsea/concat3.c kpathsea/concatn.c kpathsea/concatn.h kpathsea/config.guess kpathsea/config.h kpathsea/config.sub kpathsea/configure.in kpathsea/copying.texi kpathsea/db.c kpathsea/db.h kpathsea/debug.c kpathsea/debug.h kpathsea/default.h kpathsea/dir.c kpathsea/elt-dirs.c kpathsea/expand.c kpathsea/expand.h kpathsea/extend-fname.c kpathsea/file-p.c kpathsea/find-suffix.c kpathsea/fn.c kpathsea/fn.h kpathsea/fontmap.c kpathsea/fontmap.h kpathsea/freedom.texi kpathsea/getopt.c kpathsea/getopt.h kpathsea/getopt1.c kpathsea/getpagesize.h kpathsea/hash.c kpathsea/hash.h kpathsea/install.texi kpathsea/itoa.c kpathsea/kdefault.c kpathsea/kpathsea.texi kpathsea/kpsewhich.c kpathsea/kpsexpand.c kpathsea/lib.h kpathsea/line.c kpathsea/line.h kpathsea/magstep.c kpathsea/magstep.h kpathsea/maintain.texi kpathsea/make-stds.texi kpathsea/make-suffix.c kpathsea/path-elt.c kpathsea/pathsearch.c kpathsea/pathsearch.h kpathsea/proginit.c kpathsea/proginit.h kpathsea/progname.c kpathsea/progname.h kpathsea/putenv.c kpathsea/readable.c kpathsea/readable.h kpathsea/rm-suffix.c kpathsea/stamp-auto.in kpathsea/standards.texi kpathsea/str-list.c kpathsea/str-list.h kpathsea/str-llist.c kpathsea/str-llist.h kpathsea/systypes.h kpathsea/tex-file.c kpathsea/tex-file.h kpathsea/tex-glyph.c kpathsea/tex-glyph.h kpathsea/tex-make.c kpathsea/tex-make.h kpathsea/texmf.cnf.in kpathsea/tilde.c kpathsea/tilde.h kpathsea/truncate.c kpathsea/truncate.h kpathsea/types.h kpathsea/uppercasify.c kpathsea/variable.c kpathsea/variable.h kpathsea/version.c kpathsea/xcalloc.c kpathsea/xfopen.c kpathsea/xmalloc.c kpathsea/xopendir.c kpathsea/xopendir.h kpathsea/xputenv.c kpathsea/xrealloc.c kpathsea/xstat.c kpathsea/xstat.h kpathsea/xstrdup.c make/ChangeLog make/README make/common.make make/config.make make/dist.make make/library.make make/makevars.make make/misc.make make/paths.make make/programs.make make/rdepend.make make/texi.make make/tkpathsea.make
diffstat 136 files changed, 0 insertions(+), 21541 deletions(-) [+]
line wrap: on
line diff
deleted file mode 100644
--- a/kpathsea/AUTHORS
+++ /dev/null
@@ -1,7 +0,0 @@
-Karl Berry wrote all files not otherwise marked, with help from Kathryn
-Hargreaves on some of the original versions.
-
-The implementation of the link trick in pathsrch.c is taken from GNU
-find, implemented by David MacKenzie from Matthew Farwell's suggestion.
-
-Mike Haertel wrote the GNU malloc source.
deleted file mode 100644
--- a/kpathsea/ChangeLog
+++ /dev/null
@@ -1,1540 +0,0 @@
-Tue May 20 14:34:34 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* Makefile.in: Turn off optimization for hash.c.
-
-Thu Mar 13 13:08:05 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* configure.in: Don't set special PIC options on SGI systems,
-	since PIC is apparently the default.
-
-Wed Mar 12 17:00:16 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* Makefile.in (install-strip): New target.
-
-Thu Feb 20 02:41:36 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* configure.in (SH_LDFLAGS): Add -fPIC for HP-UX.
-	(SH_LDFLAGS): Add -shared for alpha OSF/1.
-
-Tue Feb 18 17:36:03 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* Makefile.in (pic/tex-file.o): Delete extra pic/ in commands.
-
-	* configure.in (SH_LDFLAGS): Fix typo in last change.
-
-Thu Feb 13 17:35:20 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* configure.in: Update config for shared libraries.
-	* Makefile.in (stamp-shared): Use $(SH_LD) $(SH_LDFLAGS) instead
-	of $(CXX) -shared.
-	(tex-file.o, pic/tex-file.o, gmalloc.o, pic/gmalloc.o): Update rules.
-
-	* Makefile.in (stamp-picdir): Silence noise about making pic.
-
-Sat Jan 25 22:33:56 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* Makefile.in (bin-dist): New target.
-
-Thu Dec  5 18:59:44 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* config.sub: Update to current version from FSF.
-
-Sun Nov  3 15:35:46 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* c-std.h: Use #ifdef, not #if to checm HAVE_STDLIB_H
-	* c-unistd.h: Likewise, for HAVE_UNISTD_H
-
-Tue Oct 29 17:27:06 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* Makefile.in (SH_LIBS_TO_INSTALL): Use .$(SHLEXT), not .so.
-
-Thu Oct 24 21:31:42 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* config.guess: Update to same version as used in Octave.
-	* config.sub: Likewise.
-
-Mon Oct 14 11:10:41 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* Makefile.in (distclean): Also remove libkpathsea.a and
-	libkpathsea.$(SHLEXT).
-
-Mon Jun 24 02:33:27 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* Makefile.in (install): Use INSTALL_PROGRAM instead of
-	INSTALL_DATA to install shared libs.
-
-Fri Mar 29 13:35:09 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* Makefile.in (distclean): Remove so_locations, which is generated
-	on DEC Alpha systems.
-
-Fri Feb  2 22:57:45 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* Makefile.in (tex-file.o): Use correct rule for making shared
-	version.
-
-Fri Dec 29 21:41:08 1995  John W. Eaton  <jwe@bevo.che.wisc.edu>
-
-	* config.guess, config.sub: New files.
-	* configure.in, Makefile.in:
-	Handle shared libraries for Octave.
-
-Wed Oct  4 02:26:09 1995  John Eaton  <jwe@bevo.che.wisc.edu>
-
-	* Makefile.in (uninstall): For use with Octave, don't do anything.
-
-Fri Sep 29 00:43:05 1995  John Eaton  <jwe@bevo.che.wisc.edu>
-
-	* elt-dirs.c (kpse_element_dirs): Do call kpse_expand on elt.
-
-Sun Feb 26 16:46:32 1995  John Eaton  <jwe@schoch.che.utexas.edu>
-
-	* Makefile.in: Depend on ./c-auto.h, not
-	$(kpathsea_srcdir)/c-auto.h.
-
-Sun Jan  8 12:14:47 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * Version 2.6.
-
-Wed Jan  4 14:44:34 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * Makefile.in (mostlyclean): Remove kpsewhich.
-
-Tue Jan  3 11:48:40 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * kpsewhich.c (long_options): Can't make this automatic.
-
-        * basename.c: Include <kpathsea/config.h> before testing
-        HAVE_BASENAME.
-
-        * Makefile.in (kpsewhich): Make the library before kpsewhich.o.
-        (paths.h): No need for the $(kpathsea_dir)/ any more, now make
-        depend gets rid of it.
-
-        * rm-suffix.c: Doc fix.
-        
-        * kpsewhich.c: Extract the dpi from the filename if possible.
-
-Mon Jan  2 09:45:17 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * Makefile.in (kpsexpand): Replace with kpsewhich.
-
-        * proginit.h: Doc fix.
-
-        * texmf.cnf.in (TEXMFCNF): Rename from TEXMF_CNF.
-        * tex-file.c (kpse_init_format): Likewise.
-
-Sun Jan  1 14:04:41 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * Makefile.in (MakeTeXPK): Substitute for web2cdir.
-        * MakeTeXPK.in: Use it for MakeTeXPK.site.
-        (install-data): Install texmf.cnf in web2cdir instead of texmf.
-        * texmf.cnf.in (TEXMF_CNF): Default path includes web2cdir.
-
-Sat Dec 31 14:26:48 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * Makefile.in (objects): No more @LIBOBJS@.
-        * common.ac: Use AC_CHECK_FUNCS for basename, not REPLACE_FUNCS.
-        The latter doesn't define HAVE_BASENAME.
-        * basename.c [!HAVE_BASENAME]: Conditionalize whole file.
-
-        * Makefile.in (uninstall-exec): Remove kpsexpand.
-        (MakeTeXPK): New target.
-        (install-exec): Install MTPK.
-        (install-library): New target to replace install-headers.
-        (install): Don't install-library by default.
-
-Fri Dec 30 15:53:04 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * Makefile.in (objects): Don't put @LIBOBJS@ on a line by itself.
-        From Joachim.
-
-Mon Dec 26 07:55:40 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * common.ac (AC_FUNC_CLOSEDIR_VOID): Call this. Reported by
-        Timothy Murphy <tim@maths.tcd.ie>.
-
-        * tex-file.c (init_path): If a variable is set to an empty value,
-        ignore it.  Suggested by Stephen Gildea <gildea@x.org>.
-
-        * proginit.c: If passed a NULL mode, put / in the environment here.
-        * tex-make.c (kpse_make_tex): Don't do STREQ on NULL (though it
-        should never be NULL in the first place), and properly restore
-        MAKETEX_MODE if it was /.
-
-Tue Dec 20 09:57:21 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * install.texi: Mention how to do optimization.
-
-Mon Dec 19 13:18:04 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * tex-file.h: Doc fix.
-
-Wed Dec 14 14:46:47 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * Version 2.5.
-
-        * pathsearch.c (log_search): Don't prepend the `kdebug:' to the
-        search result.
-
-Sat Dec 10 16:49:12 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * tex-make.c (set_maketex_mag): Make case of magstep -1 work
-        properly.  From a bug report by
-        heiko@lotte.sax.de (Heiko Schlittermann).
-
-Mon Dec  5 11:58:08 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * Makefile.in (objects): Add @LIBOBJS@.
-        * common.ac: Check for basename.
-
-        * db.c (db_insert): Include trailing / in directory part, and pass
-        the key and the value in the right order.  From
-        te@informatik.uni-hannover.de.
-
-Sun Dec  4 14:26:44 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * kpsexpand.c: Add extra filename argument. From
-        ware@cis.ohio-state.edu.
-
-        * common.ac: Use AC_TRY_RUN to test for SMART_PUTENV, not
-        AC_TRY_LINK. From parkes@sierravista.com.
-
-        * acconfig.h: Use #undef instead of commented-out `/* #define'.
-
-Sun Nov 27 13:47:06 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * db.c (db_insert): Don't try to insert into an empty hash table.
-        From dc@cobi.gsfc.nasa.gov (and others).
-
-        * pathsearch.c (log_search): Call DEBUGF, not printf, for the
-        filenames.  From John I.
-
-        * tex-make.c (kpse_make_tex): If MAKETEX_MODE is /, unset it and
-        reset it around the command expansion.
-        (maketex): Back to calling db_insert.
-
-Sat Nov 26 11:44:09 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * cnf.c (read_file): If expansion of $TEXMF (KPSE_DB_DIR) fails,
-        expand DEFAULT_TEXMF.  From te@informatik.uni-hannover.de.
-
-Thu Nov 24 13:41:15 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * tex-file.c (KPSE_BST_ENVS): Do not look at TEXINPUTS.
-
-        * tex-file.h: Doc fix.
-
-Tue Nov 15 14:06:56 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * progname.c (kpse_set_progname): Use basename.
-
-Fri Nov 11 19:12:23 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * acconfig.h (HAVE_SIGIO): Add this.
-
-Tue Nov  8 19:14:12 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * tex-make.c (kpse_make_tex): Change argument name from
-        `basename', since now we have a fn by that name.
-        * magstep.c (kpse_magstep_fix): Initialize mdpi.
-        * basename.c (basename): Initalize base.
-
-Mon Nov  7 15:46:21 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * common.ac: Run autoupdate.
-        * c-dir.h: Change #if names and NLENGTH to new style.
-
-Fri Oct 28 21:28:02 1994  K. Berry  (karl@terminus.cs.umb.edu)
-
-        * Version 2.4.
-
-        * tex-make.c (maketex): Don't call db_insert, that routine is
-        buggy. I'll fix it later. In the meantime, trying to get a
-        semi-stable release.
-
-Tue Oct 25 16:43:31 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * Version 2.3.
-
-        * progname.c (kpse_set_progname): Initialize kpathsea_debug from
-        the KPATHSEA_DEBUG envvar.  From neal@ctd.comsat.com.
-
-Mon Oct 24 13:41:24 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * db.c (db_insert): New function.
-        * db.h: Declare it.
-        * tex-make.c (maketex): db_insert the result if we succeeded.
-
-        * basename.c: New file to define basename.
-        * lib.h (basename): Declare it.
-        * Makefile.in (objects): Include basename.o.
-
-        * tex-file.h (kpse_file_format_type): Add missing enum values for
-        base/fmt/pool files.
-        * tex-file.c (kpse_init_format): Add cases for these.
-        From te@informatik.uni-hannover.de.
-
-        * lib.h (WARNING, FATAL): Use fputs instead of fprintf.
-        * Many files: Use DEBUGF instead of printf ("kdebug".
-        * debug.h (DEBUGF) [DEBUG]: Define this.
-
-        * xputenv.c (xputenv): Initialize that static saved_env_items to
-        null, just for documentation's sake.
-
-Tue Oct 18 13:19:06 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * tex-file.c (KPSE_*_ENVS): Move environment variable list here.
-        * tex-file.h: Move them from here.
-
-        * tex-glyph.h: Doc fix.
-
-        * tex-file.c (kpse_find_file): Correct off-by-one in suffix
-        comparison. From toy@rtp.ericsson.se.
-
-Mon Oct 17 14:01:02 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * elt-dirs.c (do_subdir): Find a top-level subdir if it matches
-        the POST.
-
-        * db.c (kpse_db_search): Allow for the passed name including a
-        directory part, as in dpi600/cmr10.pk.
-        * tex-glyph.c (try_format): First search all specs with
-        must_exist=false.
-
-        * kpsexpand.c: New file, from te@informatik.uni-hannover.de.
-        * Makefile.in (kpsexpand): New target (a program).
-        (install-exec): Depend on, and install, kpsexpand.
-        
-        * common.ac: Doc fix.
-
-        * cnf.c (do_line): Don't quit just because the variable is in the
-        environment.  From te@informatik.uni-hannover.de.
-
-        * tex-glyph.c (PXL_BITMAP_SPEC): Remove this, we're not going to
-        support pxl1500.
-
-Sun Oct 16 20:46:26 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * kpathsea.texi: Make it clear that names of debugging bits can
-        never be used.
-
-Fri Oct 14 10:31:35 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * Version 2.2.
-
-        * hash.c (hash_lookup) [DEBUG]: Cast to long, not int.
-
-Thu Oct 13 15:39:34 1994  Karl Berry  <karl@owl>
-
-        * db.c (db_build): Warn if ls-R contains nothing useful.
-
-        * debug.c (fopen, fclose) [DEBUG]: fflush stdout.
-        * dir.c (dir_links),
-        * hash.c (hash_lookup),
-        * tex-file.c (kpse_init_format),
-        * elt-dirs.c (kpse_element_dirs): Likewise.
-
-Thu Oct 13 09:02:56 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * hash.c (kpse_debug_hash_lookup_int) [DEBUG]: New global.
-        (hash_lookup): Use it.
-        * hash.h [DEBUG]: Declare it.
-        * dir.c (dir_links) [DEBUG]: Set it and reset it.
-
-        * tex-glyph.c (PXL_BITMAP_SPEC): Add this (pxlNNN/cmr10.pk) for
-        the Bitstream utilities. From abrahams@acm.org.
-        (try_format): Search for this.
-
-Tue Oct 11 15:15:49 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * db.c (db_build): Use kpse_db_dir instead of KPSE_DB_DIR.  This
-        avoids one variable expansion, and te@informatik.uni-hannover.de
-        says otherwise TeX sometimes can't find ls-R.
-
-Sun Oct  9 17:18:23 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * kdefault.c: Rename from default.c.
-        * Makefile.in (objects): Likewise.
-
-Fri Oct  7 12:58:33 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * tex-file.c (kpse_init_format): Call INIT_MT for the any_glyph
-        case. From carson@lehman.com.
-
-Sun Oct  2 14:11:20 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * magstep.c: Doc fix.
-
-Sun Sep 25 17:11:40 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * Makefile.in: Include library.make.
-
-Thu Sep 22 15:34:40 1994  Karl Berry  <karl@cs.umb.edu>
-
-        * tex-file.h (kpse_file_format_type): Don't make equal to the last
-        element index, make one more.  From Eric Auborg.
-
-Thu Sep 15 19:24:30 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Makefile.in (distdir): Include install.texi in the distribution.
-
-Mon Sep 12 11:05:18 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Version 2.1.
-
-Sun Sep 11 15:03:18 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Makefile.in (install-data): Install texmf.cnf if it didn't exist.
-
-Sat Sep 10 13:28:29 1994  Karl Berry  (karl@cs.umb.edu)
-
-	* Makefile.in (texmf.sed, paths.h): Use tr 012 instead of \n.
-	From John Interrante.
-	
-        * Makefile.in (distdir): Include the .aux and .cps files in the
-        distribution.  Don't include paths.h (from John Interrante).
-        
-        * kpathsea.texi: Fix overfull boxes and other TeX errors.
-
-Wed Sep  7 16:28:37 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Version 2.0.
-
-Tue Sep  6 10:33:18 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * dir.c (dir_links): Use %ld for ret, since it's now a long.
-
-Sat Sep  3 09:01:25 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * dir.c (dir_links): Use long instead of int for the cast and the
-        variable, to avoid warnings on the Alpha.
-
-        * c-std.h (SYSV, X_NOT_STDC_ENV): Don't define these here.
-        * c-memstr.h (SYSV): Define this.
-        (_XFUNCS_H_): And this.
-
-        * Makefile.in (distclean): Add texmf.cnf and texmf.sed.
-
-Thu Sep  1 14:22:48 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * xputenv.c (putenv): Declare this to avoid a warning.
-        * xstat.c (lstat): And this.
-
-        * common.ac (SMART_PUTENV): Use program to test for this.  From
-        mike@cs.utah.edu.
-
-        * tex-glyph.c (try_fallback_resolutions): Quit early if there's no
-        resolutions in the list.  From sanjoy@dope.caltech.edu.
-
-Tue Aug 30 14:26:48 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * acconfig.h (FOIL_X_WCHAR_T): New definition.
-
-        * c-std.h (hypot) [!hypot]: Conditionalize declaration.
-
-Fri Aug 26 09:00:24 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Makefile.in (install-data): Install headers into
-        $(includedir)/kpathsea, not just $(includedir).  From john@wpi.edu.
-
-        * pathsearch.c (search): Show results of the search as well as the
-        start of it.
-
-Thu Aug 25 13:40:29 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * proginit.c (kpse_init_prog): Newline at end of fputs.
-
-        * pathsearch.c (search): Add debug statement.
-        * debug.h (KPSE_DEBUG_SEARCH): New bit.
-
-        * tex-file.h (kpse_format_info_type): Rename `font_override_p' from
-        `font_p'. Also `program_enabled' => `program_enabled_p'.
-        Also new member `suffix_search_only'.
-        * tex-file.c (kpse_find_file): Avoid searching for foo.tex.tex, etc.
-
-Tue Aug 16 09:29:59 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-make.c (maketex): Announce that we are running the script
-        before running it.
-
-Mon Aug 15 11:18:19 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * texmf.cnf.in (PKFONTS.xdvi): Write program-specific definition
-        to include gsftopk and ps2pk ``modes''.
-
-Sat Aug 13 16:34:43 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Makefile.in (lib): Rename to program to simplify rules.
-
-        * magstep.h: Doc fix.
-
-        * common.ac (AC_HAVE_FUNCS): Test for bcopy.
-
-Tue Aug  9 14:18:56 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-make.c (misstex): Prepend kpathsea: to the missfont.log
-        message.
-
-Mon Aug  8 17:53:58 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-make.c (set_maketex_mag): Rewrite to call kpse_magstep_fix.
-        * magstep.[ch]: New files.
-
-Fri Aug  5 14:07:51 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * db.c (match): Allow a trailing component in the filename.
-
-Tue Aug  2 08:55:21 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Change `debug:' to `kdebug:'.
-        * hash.c (hash_lookup): Print results of lookup if DEBUG_HASH.
-        * debug.h (KPSE_DEBUG_HASH): New bit, replacing DB_BUILD.
-        * db.c (db_build): Don't print the built hash table.
-
-        * db.c (match): Implement this. Petr Sojka and Zdenek Salvet(?)
-        supplied code for this, but I wound up writing my own.
-        * variable.c (expand): Do variable expansion on the value.
-
-        * texmf.cnf.in (TEXINPUTS): Put this after the .prog-specific entries.
-
-        * tex-file.c (kpse_pict_format): Remember to break after setting
-        the type.
-        (EXPAND_DEFAULT, init_path): Keep raw_path as pre-default expansion.
-
-Sun Jul 31 14:18:09 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * debug.c: Don't include debug.h, it's already in debug.h.
-
-        * Makefile.in (db.o,pathsearch.o): Don't need these special cases
-        since tossed db_dir from paths.make.
-        * db.h (DB_DIR): Change default to $TEXMF, rename to KPSE_DB_DIR.
-        (kpse_db_dir): New global variable (sigh).
-        * db.c (kpse_db_dir): Define.
-        * cnf.c: Include db.h for KPSE_DB_DIR.
-        (read_files): Set kpse_db_dir after all have been read.
-        * pathsearch.c (elt_in_db): Check if kpse_db_dir is null.
-        (path_search): Do not initialize db_dir.
-
-Sat Jul 30 06:12:12 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * c-dir.h [_POSIX_VERSION]: Remove this condition; just use DIRENT.
-
-Fri Jul 29 11:36:25 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-file.c (init_path): Look up cnf file value if no suffix.
-
-        * xstat.h (SAME_FILE_P): Move here.
-        * c-stat.h (SAME_FILE_P): From here.
-        * file-p.c: Change include.
-        * lib.h (dir_p, dir_links): Declare here.
-        * dir.h: Split into xopendir.h and c-dir.h; Sun 3 include files
-        get confused otherwise, according to john@minster.york.ac.uk.
-	* xopendir.c: Include xopendir.h.
-	* elt-dirs.c, dir.c: Change includes.
-	
-Sun Jul 17 10:21:16 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * hash.c (hash_insert): Put new elements in at the end of the
-        list, instead of the beginning.
-        * hash.h: Document this.
-
-        * texmf.cnf.in (TEXMFROOT): Change to TEXMF.
-        * kpathsea.texi: Likewise.
-
-        * cnf.c (do_line): assert program_invocation_short_name.
-        * progname.c: Doc fix.
-
-        * absolute.[ch] (kpse_absolute_p): Take additional arg relative_ok.
-        * pathsearch.c (log_search): Call it (with false).
-        * tex-glyph.c: Change call.
-
-        * pathsearch.c (path_search): Initialize db_dir here.
-        (elt_in_db): Not here.
-
-Fri Jul 15 11:44:15 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-file.h: Doc fix.
-
-        * pathsearch.c (log_search): Pass in the whole str_list; anything
-        else is unreliable.
-
-        * proginit.[ch] (kpse_init_prog): Don't pass in argv0; we need it
-        earlier.
-
-Tue Jul 12 11:56:54 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-file.c (init_path): Use the first envvar that's *set*, not
-        the first in the list.
-
-        * tex-file.h (kpse_format_info_type): New member `type'.
-        * tex-file.c (kpse_init_format): Initialize it.
-
-        * pathsearch.c (log_search): New fn.
-        (search): Call it.
-
-Fri Jul  1 11:54:29 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-file.c: Doc fix.
-
-Mon Jun 27 10:18:59 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * db.c (db_build): Call kpse_var_expand on the db filename.
-        * pathsearch.c (elt_in_db): Likewise.
-
-        * tex-glyph.h (kpse_find_gf): By analogy with kpse_find_pk.
-
-Sat Jun 25 16:09:05 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-glyph.c (try_format): Try both Unix and DOS bitmap specs,
-        instead of just one or the other.
-        (bitmap_name): No longer needed.
-
-Fri Jun 24 11:52:32 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-file.c (kpse_find_file): Don't try the suffix if it doesn't
-        exist.
-
-        * tex-file.h (kpse_find_{dvips_header,pict}): New definition.
-
-Thu Jun 23 16:57:58 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-file.h (kpse_{pict,dvips_header}_format): New consts.
-        (KPSE_{PICT,DVIPS_HEADER}_ENVS): Likewise.
-
-Tue Jun 21 11:53:09 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-file.c (kpse_find_file): Try the name as given if the name
-        concatenated with the suffix fails, for the sake of, e.g., EPS files.
-
-        * tex-file.h (kpse_find_tex): New definition.
-
-        * absolute.[ch]: Make arg const.
-
-        * tex-glyph.[ch]: (kpse_bitmap_tolerance): Move here from tex-make.
-
-        * c-proto.h (P6[CH]): New definitions.
-
-        * Makefile.in (objects): Add proginit.o.
-        * proginit.[ch]: New files.
-
-Mon Jun 20 14:55:57 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-file.c (kpse_init_format): Make override path not apply to
-        TFM and VF files.
-
-        * tex-glyph.c (kpse_find_glyph_format): Rename to kpse_find_glyph,
-        and don't call MakeTeXPK if the filename is absolute.
-        * tex-glyph.h: Likewise.
-
-Sun Jun 19 11:00:50 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * common.ac (HAVE_PROGRAM_INVOCATION_NAME): Test for this.
-        * acconfig.h: #undef this by default.
-        * progname.[ch]: New files.
-        * Makefile.in (objects): Add progname.o.
-        * cnf.c (do_line): Check for .<progname> qualification.
-
-Sat Jun 18 16:55:36 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * elt-dirs.c (kpse_element_dirs): Avoid stats in leaf directories
-        found via a non-null post.
-
-Fri Jun 17 14:25:08 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * elt-dirs.c (kpse_element_dirs) [DEBUG]: Print the directory
-        expansion of the path element.
-
-        * str-llist.h: Doc fix.
-
-        * elt-dirs.c (do_subdir): Ignore anything beginning with ., not
-        just `.' and `..'.
-
-Tue Jun 14 11:53:49 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * dir.c (dir_links): Cache the lookups.
-
-        * elt-dirs.c (kpse_element_dirs): Don't expand the argument.
-        * expand.h (kpse_path_expand): New routine.
-        * expand.c: Define it.
-        * pathsearch.h: Doc fix.
-
-        * db.c, tex-file.c [DEBUG]: Prefix output lines with `debug:'.
-
-        * tex-file.h (kpse_format_info_type): Add cnf_path to the struct.
-        * tex-file.c (kpse_init_path): Print the cnf_path.
-        (init_path): Set it, instead of a local variable.
-
-        * pathsearch.c (path_search): Use !! for no-disk-search instead of
-        %%, because now % is the comment char in cnf files.
-        * kpathsea.texi: Document this. Also change all `Kpathsearch' to
-        `kpathsea'.
-
-Mon Jun 13 10:15:49 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-make.h (kpse_set_maketex_mag): Remove.
-        * tex-make.c (kpse_set_maketex_mag): Make static, remove kpse_
-        prefix, and use KPATHSEA_DPI and MAKETEX_BASE_DPI instead of args.
-
-Sun Jun 12 13:49:15 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * db.c (db_build): Put a header on the hash table.
-
-        * tex-glyph.c (try_format): Set extension and path after
-        kpse_init_format, natch.
-
-Sat Jun 11 14:26:34 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Makefile.in (objects): Add cnf.o.
-        * variable.c (expand): Call kpse_cnf_get if no envvar value.
-
-Fri Jun 10 11:20:23 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-make.h: Remove spec type and variable.
-
-Thu Jun  9 13:42:21 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Makefile.in (objects): Remove init-path.o.
-        * tex-file.c (kpse_find_file): Rewrite to initialize the paths
-        only once, and keep all path info in a structure.
-        * tex-file.h: Vastly simplify.
-        * tex-glyph.h (kpse_font_file_type): Move here, since it's really
-        only for glyphs.
-        * tex-glyph.c: Corresponding changes.
-        * debug.h (KPSE_DEBUG_PATHS): New debug bit.
-
-        * default.h, str-list.h: Doc fix.
-
-Tue May 31 10:06:51 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * debug.c: Doc fix.
-
-Mon May 23 11:50:03 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * c-fopen.h (FOPEN_A_MODE): Define this.
-        * tex-make.c (misstex, maketex): Split up kpse_make_tex into
-        these, and create missfont.log if appropriate.
-
-Sun May 22 17:39:52 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-make.h: Doc fix.
-
-Wed May 11 13:25:58 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * configure.in (AC_OUTPUT): Use just `Makefile' instead of
-        `./Makefile', to avoid a bug in Autoconf (through 1.10).
-
-Sun Apr 17 16:18:00 1994  Karl Berry  (karl@ra.cs.umb.edu)
-
-        * debug.h: Prefix macros with KPSE_.
-        * db.c, dir.c: Change calls.
-
-        * common.ac: Remove :: VPATH stuff; that made it in to Autoconf 1.8.
-
-        * Makefile.in (top_srcdir): Define this for configure to substitute.
-
-Thu Apr  7 17:52:05 1994  Karl Berry  (karl@ra.cs.umb.edu)
-
-        * debug.[ch]: Implement fopen/fclose tracing.
-
-Thu Mar 31 07:25:49 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Version 1.8.
-
-Thu Mar 24 10:01:20 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-glyph.c: Doc fix.
-
-        * pathsearch.c (path_search): Don't search the disk if there is
-        magic in the path spec.
-
-        * db.c: Doc fix.
-
-Wed Mar 16 13:50:17 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * readable.c (kpse_readable_file): Complain if errno == EPERM.
-
-Sun Mar 13 11:14:19 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * pathsearch.h (kpse_path_search): Take an extra arg must_exist.
-        * pathsearch.c (kpse_path_search, search, path_search): Likewise.
-        * tex-file.c (kpse_find_file): Change call.
-        * tex-file.h (kpse_find_*): Change these calls, too.
-
-        * hash.c (hash_create): Don't use xcalloc to init pointers to null.
-
-        * db.c (kpse_db_search): Don't free the pointer after incrementing it.
-        From Frank Jensen.
-
-Sat Mar 12 17:55:36 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * db.h (kpse_db_search): Returns a pointer.
-        * db.c (kpse_db_search): If db can't be built, return NULL, else a
-        pointer to the (possibly empty) list.
-        (db_build): Return whether we found the file.
-        * pathsearch.c (path_search): Change call.
-
-Thu Mar 10 07:45:13 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Makefile.in (install-info): New target.
-
-Fri Mar  4 08:06:16 1994  Karl Berry  (karl@cs.umb.edu)
-
-	* hash.c (hash): Change hash function to spread out the values a
-	bit better.
-
-	* debug.h (DEBUG_DB_BUILD): New debug bit.
-	* db.c (db_build) [DEBUG]: If bit is set, print hash table.
-	* hash.h (hash_print): Declare.
-
-Thu Mar  3 08:52:01 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Version 1.7.
-
-Sun Feb 27 15:57:30 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Makefile.in (objects): Add db.o, hash.o.
-        * db.[ch]: New files.
-        * hash.[ch]: Also new files.
-        * pathsearch.c (path_search): Try db search.
-        * tex-glyph.c, fontmap.c: Use general hash functions.
-
-Sat Feb 26 13:15:53 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * fontmap.c: Doc fix.
-
-        * pathsearch.c (INIT_ALLOC): Increase to 75, what the heck.
-
-Fri Feb 25 08:30:50 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-file.[ch]: Decare args const.
-
-Thu Feb 24 07:55:43 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-make.h: Include tex-file.h, not init-path.h.
-
-        * init-path.h (KPSE_*_{ENVS,PATHS}, kpse_font_override_path): Move
-        to tex-font.h.
-        * tex-font.h (kpse_find_{file,tfm,vf}): Also declare these.
-        * tex-font.c (kpse_find_file): Define these.
-        (kpse_font_override_path): Move definition here.
-        
-        * tex-file.*: Rename from tex-font.*.
-        * GNUmakefile: Corresponding changes.
-
-        * elt-dirs.c (do_subdir): Only append the / once we know it's a
-        directory.
-
-Wed Feb 23 16:41:31 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * elt-dirs.c (do_subdir): Don't tack POST on if it is exactly the
-        d_name, so we can find a/b with a path of a//b.
-
-        * c-vararg.h (PVAR3[CH]): New defines.
-
-        * init-path.h: Include KPSE_*_{ENVS,PATHS} here.
-        (kpse_init_path): Take an additional arg font_p.
-        * init-path.c (kpse_override_path): Rename kpse_font_override_path.
-        (kpse_init_path): Only use kpse_font_override_font if font_p.
-
-Mon Feb 21 15:38:53 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * common.ac (extrasub): Define to remove VPATH lines if srcdir = `.'.
-
-Thu Feb  3 06:19:49 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Version 1.6.
-
-        * fn.c (fn_copy0): Remember to allocate space for the null.
-        Thanks, simon.
-
-Wed Feb  2 09:57:47 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * tex-make.h (KPSE_BITMAP_TOLERANCE): Move to here from tex-glyph.c
-        (kpse_check_bitmap_tolerance): Declare.
-        * tex-make.c (kpse_check_bitmap_tolerance): Define.
-
-Tue Feb  1 10:42:03 1994  Karl Berry  (karl@cs.umb.edu)
-
-	* c-std.h (*alloc) [! _MALLOC_INTERNAL]: Make decl conditional.
-
-        * c-std.h [HAVE_STDLIB_H]: Change #if for including <stdlib.h> to this.
-        * common.ac (AC_HAVE_HEADERS): Check for stdlib.h.
-
-        * Makefile.in (paths.h): Do all substitutions globally.
-
-        * absolute.c [DOS]: Include c-ctype.h.
-        * tex-glyph.c (KPATHSEA_BITMAP_NAME) [DOS]: Double the backslash.
-        * elt-dirs.c (do_subdir) [!UNIX_ST_LINK]: Avoid dangling else.
-        From Wayne.
-
-        * paths.h.in: Doc fix.
-
-        * xputenv.c (xputenv): Check entire variable name for being saved,
-        not just a prefix of it.
-
-Mon Jan 31 12:05:30 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * fn.c (fn_copy0): Allocate LEN if that's bigger than CHUNK_SIZE.
-        (CHUNK_SIZE): Increase to 75.
-
-Sat Jan 22 15:36:08 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * Version 1.5.
-
-        * common.ac (AC_HAVE_FUNCS): Check for memmove.
-
-        * paths.h.in (DEFAULT_MF_PATH): Don't search just public/, cause
-        we need ams/.
-
-Mon Jan 17 15:09:36 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * paths.h.in (DEFAULT_{FMT,BASE}_PATH): Include `.'.
-
-Sun Jan 16 14:50:02 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * paths.h.in (DEFAULT_PK_PATH): Search subdirs of pk.
-
-Mon Jan 10 16:40:35 1994  Karl Berry  (karl@cs.umb.edu)
-
-        * xputenv.c (xputenv): Don't try to be smart about saving/freeing
-        stuff if SMART_PUTENV is defined.
-
-        * c-std.h (assert) [!HAVE_ASSERT_H]: Define as nothing, to avoid
-        undefined references to assert.
-
-Tue Dec 21 16:28:13 1993  Karl Berry  (karl@cs.umb.edu)
-
-        * c-std.h (SYSV) [STDC_HEADERS]: Define, to get around old X
-        include files under hpux.
-
-Sun Dec 19 13:06:15 1993  Karl Berry  (karl@cs.umb.edu)
-
-        * Makefile.in (objects): Put tex-font.o first.
-
-Sat Dec 18 15:03:57 1993  Karl Berry  (karl@cs.umb.edu)
-
-        * config.h (GCC_WCHAR_T, _GCC_WCHAR_T): Remove these; I have
-        another theory now for wchar_t, done in xdvi.h and x11.c.
-
-Sat Dec 18 14:41:15 1993  Karl Berry  (karl@owl.hq.ileaf.com)
-
-	* c-memstr.h ([r]index) [STDC_HEADERS]: Conditionalize #define.
-
-Tue Dec 14 17:43:30 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Makefile.in (paths.h): Change substitutions accordingly.
-	* paths.h.in (DEFAULT_FMT_PATH): Variable is now fmtdir.
-	(DEFAULT_{BIB,BST}_PATH): Variable is now texmf_prefix.
-
-Sat Dec 11 13:21:43 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-make.c (ABS): New macro.
-	(kpse_set_maketex_mag): Use it, instead of fabs.
-
-Fri Dec 10 15:31:16 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* xmalloc.c, xrealloc.c: Use exit instead of abort, remove abort
-	decls, and reword error messages to be less cryptic. From
-	john@minster.york.ac.uk.
-
-	* dir.h: use `defined' instead of just `DIRENT || _POSIX_VERSION'.
-	How annoying. From kretschm@aitxu3.ait.physik.uni-tuebingen.de.
-
-	* xputenv.c (putenv): Remove declaration, as different systems do
-	it differently. From kayvan@satyr.sylvan.com.
-
-Thu Dec  9 09:12:33 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-make.c (kpse_set_maketex_mag): Allow off-by-1 when deciding
-	if a dpi is a magstep.
-
-Tue Dec  7 11:03:51 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-make.c (kpse_set_maketex_mag): New routine from dvips,
-	called by dvipsk and xdvik to ensure consistency.
-	(magstep): Subroutine of above, also from dvips.
-	* tex-make.h: Declare it.
-
-	* tex-doc.texi: Correct menu item (from maechler@stat.math.ethz.ch).
-
-Fri Dec  3 12:53:38 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* c-pathmx.h: Doc fix.
-
-Sat Nov 27 14:36:11 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* default.h: Doc fix.
-
-	* paths.h.in (texfontdir): This has been renamed to fontdir.
-
-Sun Nov 21 08:28:41 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Makefile.in (distdir): Include HIER in the distribution, until
-	we merge it into the manual.
-
-Sun Nov  7 14:54:47 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* c-namemx.h (NAME_MAX): Avoid use of pathconf.
-	* c-pathmx.h: Doc fix.
-
-Thu Nov  4 14:50:45 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* config.h (_GCC_WCHAR_T) [!GCC_WCHAR]: Conditionalize.
-
-	* c-std.h (EXIT_SUCCESS) [!EXIT_SUCCESS]: Move these defines
-	outside of !STDC_HEADERS, for the sake of SunOS 4.1.1.  (From
-	vonbrand@inf.utfsm.cl.)
-
-Wed Nov  3 14:43:05 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Version 1.4.
-
-Wed Nov  3 07:05:48 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* paths.h.in (DEFAULT_{BASE,FMT}_PATH): Had these definitions reversed.
-
-Fri Oct 29 19:27:36 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-glyph.c (try_fallback_resolutions): Initialize ret in all cases.
-
-Thu Oct 28 14:32:34 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* lib.h: Doc fix.
-
-	* common.h (AC_UNISTD_H): Replace this with unistd.h in the list
-	of HAVE_HEADERS.
-
-Tue Oct 26 13:59:33 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* str-llist.[ch]: New files.
-	* Makefile.in (objects): Add str_llist.o.
-	* elt-dirs.[ch]: Use str_llist_type throughout.
-	* pathsearch.c (dir_list_search): Take a str_llist_type, and float
-	a successful dir towards the top.
-	(path_search): Change call of kpse_element_dirs.
-
-Sun Oct 24 19:41:49 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* elt-dirs.c (do_optional): Remove this stub.
-	(expand_elt): Don't call it.
-
-Fri Oct 22 14:46:44 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* xmalloc.c, xrealloc.c, line.c, pathsearch.c: Doc fix.
-
-Tue Oct 19 12:11:32 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-glyph.c (try_fallback_resolutions): New routine.
-	(kpse_find_glyph_format): Call it, instead of repeating (the now
-        pretty complicated) code.
-	* tex-font.c (kpse_init_fallback_resolutions): Pass the value of
-	any environment variable, not its name. From R.Kooijman@et.tudelft.nl.
-
-	* c-memstr.h (str[r]chr) [!str[r]chr]: Conditionalize. From
-	maarrrk@seidel.ece.ucsb.edu.
-
-Tue Oct 12 16:26:48 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-make.c: Doc fix.
-
-Thu Oct  7 13:13:57 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* xmalloc.c: Rewrite to not require <config.h>.
-	* xrealloc.c: Likewise.
-
-	* make-suffix.c (make_suffix): Declare variables const.
-	* remove-suffx.c (remove_suffix): Likewise.  Also rename to
-	rm-suffix.c.
-	* xputenv.c (putenv): Declare with correct prototype.
-	* fontmap.c (internal routines): Likewise.
-	* line.c (xmalloc, xrealloc): Declare as void *.
-	(From john@minster.york.ac.uk.)
-
-Wed Oct  6 06:49:53 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Version 1.3.
-
-	* tilde.c (kpse_tilde_expand): Always return a malloc-ed value.
-	(From ken@cs.toronto.edu.)
-
-Sun Oct  3 14:11:33 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* config.h (_GCC_WCHAR_T): Define.
-
-Sat Oct  2 17:17:32 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Makefile.in (install-*): Don't reassign PATH, just invoke
-	mkdirchain explicitly.
-
-	* tex-glyph.c (KPATHSEA_BITMAP_NAME) [DOS]: Define what I think
-	will work for this ...
-
-	* paths.h.in: Doc fix.
-
-	* Makefile.in: Doc fix.
-
-	* tex-glyph.c (kpse_find_glyph_format): Unconditionally initialize
-	glyph_paths[*], since we might use them both in try_size.  From
-	worsch@ira.uka.de.
-
-Fri Oct  1 12:02:11 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* expand.c: Doc fix.
-
-Wed Sep 29 15:21:49 1993    (karl@terminus.cs.umb.edu)
-
-	* Version 1.2.
-
-Sat Sep 25 14:12:00 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* pathsearch.c (path_search, absolute_search): Don't initialize
-	structs.
-
-Fri Sep 24 12:50:00 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-glyph.c (try_size): Skip the simultaneous stuff.
-	(try_format): Set the envvar here.
-	(bitmap_name): Not here.
-	* pathsearch.c (kpse_*_multi_search): Delete.
-	Change most other routines to take only a single name again,
-	instead of a name list.
-	* pathsearch.h: Delete decls.
-
-	* tex-glyph.c (init-path.h): Don't need to include this.
-
-	* tex-glyph.c (kpse_find_glyph_format): Try the fallback
-	resolutions for the fallback font.
-
-	* Makefile.in (warn_more, MAKEINFO_FLAGS) [hayley]: Define these
-	for development and distribution.
-
-	* Makefile.in (dvi): Make analogous to info (including use of new
-	suffix rule).
-
-	* tex-glyph.c (kpse_find_glyph_format): Set KPATHSEA_NAME to the
-	fallback font if we get that far.
-
-Wed Sep 15 19:29:56 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* filefmt.h (KPSE_*_PATH): Pass NULL as first arg.
-
-	* xputenv.c (xputenv): Rewrite again to save the variable names,
-	not the old items.
-
-Mon Sep 13 06:55:29 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* concatn.h: Doc fix.
-
-Sun Sep 12 15:54:55 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* lib.h (XTALLOC): Parenthesize the cast.
-
-	* xputenv.c (xputenv): Rewrite to collect some of the garbage.
-
-Fri Sep 10 14:00:35 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* lib.h (ENVVAR_SET_DEFAULT): No longer needed.
-
-	* xputenv.c (xputenv_int): New routine.
-
-Thu Sep  9 14:58:00 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-make.c (MAKE_TEX_PK_SPEC): Change MAKETEX_DPI to
-	KPATHSEA_DPI.
-
-	* tex-glyph.c (try_fontmap): Use KPSE_GLYPH_PATH.
-	* filefmt.c (KPSE_GLYPH_{PATH,ENVS}): New macros.
-	(KPSE_{GF,PK}_ENVS): Use GLYPH_ENVS.
-
-	* tex-glyph.c (bitmap_name): Rewrite to use a variable spec,
-	introducing KPATHSEA_{BITMAP_NAME,FORMAT,DPI,NAME}.
-	(kpse_find_glyph_format): Set KPATHSEA_DPI instead of MAKETEX_DPI;
-	also set KPATHSEA_NAME.
-	(try_fontmap): Also set KPATHSEA_NAME here.
-	(try_size): Set KPATHSEA_DPI here.
-
-	* tex-glyph.c (try_name): Delete this routine.
-	(kpse_find_glyph_format): Try fallback resolutions here, call
-	try_resolution directly.
-	(try_fontmap): Call try_resolution directly.
-
-	* init-path.h: Need not include c-proto.h.
-
-Sun Aug 29 13:34:25 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-make.c: Doc fix.
-
-	* filefmt.h: Don't need c-proto.h or types.h.
-
-Fri Aug 27 10:36:46 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* c-vararg.h (PVAR2C): Take AP as an arg.
-
-	* init-path.[ch] (kpse_init_path): Take the current value as an
-	additional argument, separate from the default path, and always
-	expand_default.
-
-	* uppercasify.c (uppercasify): Don't discard upcased result!
-
-Thu Aug 26 10:36:28 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Version 1.1.
-
-Sun Aug 22 19:18:35 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* install-data (install-data): Replace nonexistent
-	$(kpath_includedir) with $(includedir), and define it.  Also
-	remove c-auto.h.
-
-Thu Aug  5 09:03:22 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Version 1.0.
-
-Wed Aug  4 13:51:24 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-glyph.c (kpse_find_glyph_format): Fill in the font_file
-	struct in the maketex case.
-
-	* Makefile.in (info): Just depend on kpathsea.info, and rely on
-	new suffix rule to do the work.
-
-Tue Aug  3 17:50:40 1993  Karl Berry  (karl@fishbowl.hq.ileaf.com)
-
-	* tex-glyph.c (try_name): Don't free expanded_name if we're
-	returning it.
-
-Tue Aug  3 10:13:43 1993  Karl Berry  (karl@owl.hq.ileaf.com)
-
-	* version.c (kpathsea_version_string): Do not declare const.
-
-	* line.h (read_line): Protoize decl.
-
-Tue Aug  3 09:10:07 1993  Karl Berry  (karl@blood.hq.ileaf.com)
-
-	* c-memstr.h (bcmp, bcopy, bzero) [!HAVE_BCOPY]: Conditionalize.
-
-	* putenv.c: Include <kpathsea/c-auto.h>, and use const when
-	calling memcpy.
-
-Sun Aug  1 08:48:49 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Add new features to manual.
-
-	* Makefile.in (objects): Include putenv.o.
-	* putenv.c: New file from gdb.
-	* common.ac: Test for putenv.
-
-Sat Jul 31 11:54:31 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Makefile.in (distclean): Remove paths.h.
-
-	* Most files: changes for traditional C compatibility.
-
-	* filefmt.h: Add new KPSE_..._PATH's for the other formats.
-	* paths.h.in: Add defaults.
-	* Makefile.in (paths.h): sed the values in.
-
-Fri Jul 30 17:23:10 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* filefmt.h (KPSE_VF_PATH): Add empty parens.
-
-	* tex-paths.h*: Rename to just paths.h*.
-
-Tue Jul 27 09:00:58 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* filefmt.h: Include tex-paths.h, and use default paths in
-	KPSE_..._PATH macros.
-
-	* find-suffix.c: Correct logic.
-
-	* filefmt.h: Include init-path.h.
-
-Sat Jul 24 10:44:21 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-glyph.c (kpse_find_glyph_format): Assign to it.
-	* tex-font.h (kpse_font_file_type): New member `source'.
-	(KPSE_FONT_FILE_SOURCE): Accessor macro.
-	(kpse_source_type): New type.
-
-Wed Jul 21 19:45:45 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Makefile.in (configclean): New target.
-
-Sun Jul 18 13:53:38 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tilde.[ch] (kpse_expand_tilde): Rename to kpse_tilde_expand.
-
-	* elt-dirs.c, pathsearch.c, tex-glyph.c: Replace calls to
-	kpse_expand_tilde with kpse_expand.
-	* expand.[ch]: New files.
-	* Makefile.in (objects): Add it.
-
-	* fn.[ch]: New files.
-	* elt-dirs.c (fn*): Moved to fn.c.
-	* tex-make.c, variable.c: Use the new routines.
-	* *obstack*: No longer needed.
-	* Makefile.in (objects): Appropriate changes.
-
-Sat Jul 17 13:25:25 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* concat.c: Doc fix.
-
-	* pathsearch.c (search, path_search): Expand variable references.
-
-	* itoa.c: New file.
-	* lib.h (itoa): Declare it.
-	* Makefile.in (objects): Add it.
-
-	* lib.h (ENVVAR_SET_DEFAULT): New macro.
-	* tex-glyph.c (kpse_find_glyph_format): Call it to set the dpi.
-
-Fri Jul 16 09:10:52 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* xputenv.c: New file.
-	* Makefile.in (objects): Add it.
-	* lib.h (xputenv): Declare it.	
-
-	* c-obstack.h: New file.
-	* variable.[ch]: New files.
-	* Makefile.in (objects): Add it.
-
-	* uppercasify.c: New file.
-	* Makefile.in (objects): add it.
-	* lib.h (uppercasify): Declare it.
-
-Tue Jul 13 13:47:54 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-glyph.c (kpse_find_glyph_format): Simplify path initialization.
-	* filefmt.h: New file; add abbrevs for GF and PK inits.
-
-	* Makefile.in (objects): Add obstack.o and tex-make.o.
-	* obstack.[ch]: New files from GNU.
-	* concatn.[ch], tex-make.[ch]: New files.
-	* init-path.c: Doc fix.
-
-	* elt-dirs.c: Doc fix.
-	* readable.[ch]: Doc fixes.
-
-Sun Jul 11 13:37:02 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-font.h (kpse_font_format_type): Rename to kpse_file_format_type,
-	and include the other file formats.
-	* tex-glyph.c: Change uses.
-
-Tue Jul  6 08:09:10 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-font.c (kpse_fallback_font): Initialize to NULL.
-
-Mon Jul  5 08:23:09 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-glyph.c (try_size): Don't fill in FONT_FILE if it's null.
-
-	* tex-font.c (kpse_init_fallback_resolutions): Look for TEXSIZES
-	after the program-specific *SIZES var.
-
-	* tex-glyph.c (kpse_find_glyph_format): Use kpse_init_path.
-	* Makefile.in (objects): Add init_path.o.
-	* tex-font.[ch] (kpse_override_path): Move to init-path.[ch].
-	* init-path.[ch]: New files.
-	* c-vararg.h: New file.
-
-Sun Jul  4 11:26:17 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-font.c (kpse_init_fallback_resolutions): New routine.
-	* tex-font.h: Declare it, and companion return type.
-
-Fri Jul  2 10:43:11 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-glyph.c (kpse_find_glyph_format): Take first successful
-	fontmap entry.
-
-	* fontmap.c (map_file_parse): Take first % on line as starting the
-	comment, not the last.
-
-	* fontmap.c (map_insert): Always insert the new element.
-
-Thu Jul  1 19:21:35 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* fontmap.c (map_lookup): Return a list, not a single string.
-	(map_lookup_str): Likewise.
-	* fontmap.h (map_lookup): Change decl.
-	* tex-glyph.c (kpse_find_glyph_format): Change caller.
-
-Sat Jun 26 11:48:36 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* tex-font.h: Doc fix.
-
-Thu Jun 24 11:16:41 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* configure.in (MISSING_HEADERS): Toss in favor of HAVE_HEADERS.  Sigh.
-	Also, move all this to an include file.
-	Change uses in several files.
-
-	* stat.h: Rename to c-stat.h, and change includers.
-
-	* Makefile.in (objects): Add tex-glyph.o.
-	* pathsearch.[ch] (kpse_*_multi_search): New routines.
-
-Sat Jun 19 11:37:18 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* str-list.c (str_list_free): New routine.
-
-Fri Jun 18 13:54:08 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* fontmap.c (map_create): Rewrite to use kpse_all_path_search.
-	Include const in various subroutines.
-
-Tue Jun 15 15:58:18 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Change <kpathsea/pathsrch.h> to pathsearch.  Rename the files
-	themselves.
-
-	* elt-dirs.c (cache): Copy the key into our own storage, since it
-	comes from kpse_path_element and might get overwritten.  Should we
-	copy all the values, too?
-
-Sun Jun 13 16:49:09 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* pathsearch.c (dir_list_search): Don't need to append the null
-	here; in fact, it's wrong, since then the final list might have
-	nulls in the middle.
-
-	* elt-dirs.c (dir_list_add): Correct check for new directory
-	already ending in /.
-
-Fri Jun 11 10:45:33 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* str-list.[ch]: New files.
-	* pathsrch.c: Use it for the dir_list routines.
-	* Many changes and new files throughout for new implementation
-	including TeX-font-lookup routines.
-
-Tue Jun  8 14:00:54 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Most files: Change `const string' (constant pointer) to `const
-	char *' (pointer to constant data).  What a crock.
-
-Mon Jun  7 09:43:21 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* debug.[ch]: New files.
-	* config.h: Include debug.h.
-
-	* dir-p.c: Rename to dir.c.
-	(dir_links): New routine.
-
-	* c-std.h (assert.h) [!ASSERT_H_MISSING]: Include this.
-	* configure.in: Check for it with new macro AC_MISSING_HEADERS.
-
-Thu Jun  3 10:12:12 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* dirio.h (leaf_dir_p): No longer defined; rename to dir.h.
-	* xopendir.c, dir-p.c, pathsrch.c: Change include.
-
-Mon May 31 07:49:16 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* c-std.h (EXIT_{SUCCESS,FAILURE}): Define these if they're undefined.
-
-	* config.h: Use <kpathsea/...> instead "...".
-
-	* kpathlib.h: Had #ifndef protection messed up.  Rename to lib.h.
-
-	* c-memstr.h (index, rindex) [!index, !rindex]: Make definitions
-	conditional.
-
-Tue May 25 10:07:00 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* c-{namemx,pathmx,pathch,...}.h: Doc fixes.
-
-	* c-systypes.h: New file.
-	* c-std.h: Include it.
-
-	* stat.h: New file.
-	* xstat.h: Include it.
-
-	* configure.in (AC_HAVE_HEADERS): Test for `pwd.h'.
-
-Sun May 23 19:06:22 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* pathsrch.[ch]: Doc fixes.
-
-Fri May 21 11:27:54 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* line.c (free): Declare.
-
-	* pathsrch.c, find-suffix.c: Change caller.
-	* c-pathch.h ({IS_,}{DIR,ENV}_SEP): Rename existing confusing
-	definitions to these.  Suggested by rocky.
-
-Mon May 17 08:18:18 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Version 0.3.
-
-	* pathsrch.c (expand_default): Handle doubled colon and
-	nothing-but-colon cases.
-
-	* Write documentation, change Makefile accordingly.
-
-Thu May 13 16:32:34 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* c-std.h (popen) [VMS]: Make decl conditional, and include
-	<unixlib.h> and <unixio.h>.
-
-Mon May 10 07:12:50 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Version 0.2.
-
-	* version.c: Put in placeholder.
-
-Sun May  9 10:42:34 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* config.h (c-auto.h): Use <...> instead of "...".
-
-Tue May  4 14:54:41 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Makefile.in (info check dvi): New targets (that do nothing).
-
-Mon May  3 13:46:17 1993  Karl Berry  (karl@claude.cs.umb.edu)
-
-	* Version 0.1.
-
-	* Use KPATHSEARCH_ prefix for various headers' cpp protections.
-
-Sun May  2 10:28:25 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* Makefile.in (dist): Depend on TAGS, and put it in the dist.
-
-	* Makefile.in (c-auto.h.in): Remove extra $(srcdir).
-
-Sun Apr 25 11:22:12 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* pathsrch.h: Include c-proto.h.
-
-	* make-suffix.c: New file.
-	* Makefile.in (objects): Add the .o.
-
-	* file-p.c: Use the SAME_FILE_P macro.
-
-	* fontmap.h: Include c-proto.h and types.h.
-
-	* lib.h: Rename to kpathlib.h.
-	* config.h: Include changed.
-
-	* c-proto.h, c-std.h: Doc fix.
-
-	* c-limits.h [LIMITS_H_MISSING]: Conditionalize include of c-std.h.
-
-	* xstat.h: Include c-std.h.
-
-	* Makefile.in (c-auto.h.in): Add unused warning to top.
-
-	* dirio.h: Include c-proto.h and types.h.
-
-Fri Apr 23 16:11:13 1993  Karl Berry  (karl@cs.umb.edu)
-
-	* line.c: Don't include config.h, just declare xmalloc and
-	xrealloc explicitly.
-
-	* pathsrch.c: paths.h need not be included.
-
-	* Created.
deleted file mode 100644
--- a/kpathsea/HIER
+++ /dev/null
@@ -1,59 +0,0 @@
-Here is the installed TeX & Metafont hierarchy (as of 4sep94) that
-we have been working on.  Please send comments to mackay@cs.washington.edu,
-unixtex@u.washington.edu, and kb@cs.umb.edu.
-(Especially if you try to actually install TeX like this!)
-
-First, pick a root directory for the library files:
-TEXMF = /usr/local/lib/texmf
-
-(Or, in make variable terms: $(datadir)/texmf.)
-
-All the files are installed relative to $TEXMF.  Top-level directories:
-bibtex		-- bib/*.bib, bst/*.bst
-doc		-- bibtex/, fontname/, eplain/, ...
-fonts 		-- see below
-tex		-- see below
-mf		-- utility MF sources
-                   ({plain, expr, null, io, slant, modes, ...}.mf)
-ini		-- .base, .fmt, .pool
-dvips		-- only if you have a PostScript printer, naturally
-
-In general, where possible, the same setup as ctan is clearly a win.
-
-Under dvips, have the .pro/.ps/psfonts.map files.
-
-Under tex, at least:
-plain	({plain, manmac, null, plain, story, testfont, webmac}.tex,
-	 perhaps also texinfo.tex, eplain.tex, other single-file sources)
-latex	(with subdirectories base/ for M&S's files,
-	 misc/ for one-file styles, and other distributions by directory)
-tugboat	(tugboat.cmn, tugboat.sty, etc.)
-mft	(*.mft)
-
-Under fonts:
-<source>/<typeface>/
-  for <source> in public, adobe, ams, bitstream, urw, ...
-  for public/<typeface> in cm, concrete, punk, ...
-  for ams/<typeface> in euler, symbols, ...
-  for adobe/<typeface> in times, palatino, avantgar, ...
-  See the *.map files in fontname 2.0 for canonical directory names.
-
-Under .../<source>/<typeface>/
-src/*.mf
-tfm/*.tfm
-vf/*.vf
-afm/*.afm
-pk/$MAKETEX_MODE (including pseudo-modes for gsrenderfont, ps2pk, gsftopk)
-type1/*.{pfa,pfb,gsf}
-truetype/*.ttf
-
-See the TeX directory structure node in the manual for an additional
-complication with MAKETEX_MODE.
-
-For example:
-texmf/fonts/public/cm/pk/cx/cmr10.300pk
-texmf/fonts/public/sauter/src/b-cmbx.mf
-texmf/fonts/adobe/utopia/type1/putr.pfa
-
-
-For default path values, see texmf.cnf[.in].
deleted file mode 100644
--- a/kpathsea/INSTALL
+++ /dev/null
@@ -1,410 +0,0 @@
-Contents:
-
-Installation
-  Default paths
-  Common problems
-    Unable to find files
-    Slow path searching
-    `XtInherit'
-    `wchar_t'
-    `ShellWidgetClass'
-    Pointer combination warnings
-  Shared library
-  Reporting bugs
-
-
-Installation
-************
-
-  Here are the basic steps for configuration and installation:
-
-  1. Edit the file `make/paths.make' if you want to make changes to the
-     installation directories or paths that will have effect across
-     different runs of `configure'.  Alternatively, override the Make
-     variables on the command line when you run Make.
-
-     Exception: to reliably change the top-level `prefix', you must give
-     `configure' the option `-prefix=PREFIX', instead of changing the
-     value in `paths.make'.
-
-  2. Edit `kpathsea/texmf.cnf.in' to change the local paths to match
-     your local setup.  *Note Default paths: (kpathsea)Default paths,
-     for more details on changing the paths. A copy is in
-     `kpathsea/INSTALL'.  See `kpathsea/HIER' for an explanation of the
-     default setup.
-
-     If the paths do not match where the files actually are, the
-     programs will probably start up Very, Very, Slowly, and/or not be
-     able to find the fonts or other input files.
-
-  3. `sh configure' (in the top-level directory).  This makes
-     system-dependent `#define's' in `*/c-auto.h' (from the
-     corresponding `c-auto.h.in') and creates a `Makefile' (from the
-     corresponding `Makefile.in', by doing `@VAR@' and `ac_include'
-     substitutions).
-
-     Perhaps the most common desire is to compile with optimization
-     instead of or as well as debugging.  You can change the options
-     passed to the compiler by changing `CFLAGS', either for
-     `configure' or `make'.  For example:
-
-          prompt$ env CFLAGS="-g -O" configure
-          prompt$ make
-     or
-          prompt$ configure
-          prompt$ make CFLAGS="-g -O"
-
-     *Note Running `configure' scripts: (autoconf)Invoking configure,
-     for detailed `configure' options.  (A copy is in
-     `kpathsea/CONFIGURE'.)
-
-  4. `make' (still in the top-level directory). Barring configuration
-     and compiler bugs, this will compile all the programs.  *Note
-     Common problems: (kpathsea)Common problems, for system-dependent
-     problems (this section is also in `kpathsea/INSTALL').
-
-     This also creates the `texmf.cnf' and `paths.h' files that define
-     the default search paths.
-
-  5. `make install'. This installs the library, header files, and
-     documentation. Or `make install-data' to just install the
-     architecture-independent files. Or `make install-exec' to just
-     install the (binary) archive library file.
-
-     Since I only distribute Kpathsea as part of another package, you
-     will probably be doing the above in a top-level directory that
-     contains a `Makefile', `kpathsea', and the other package.  But you
-     can do the installation in `kpathsea' itself, if you only want to
-     install the library, not the other package.
-
-  6. The first time you install any manual in Info, you have to add a
-     line (you choose where) to the `dir' file in your `$(infodir)'
-     directory.  A sample line to add is given near the top of the
-     Texinfo source files (`kpathsea/kpathsea.texi' and
-     `dvipsk/dvips.texi').
-
-  7. `make distclean'.  This removes all files created by the build.
-
-
-  *Note Filename database::, for a description of an
-externally-generated database that can help speed searches.
-
-  *Note Debugging::, for runtime debugging support that may help track
-down problems.
-
-  Do not attempt to use any version of Kpathsea with any program except
-the version that the program came with, unless you are a glutton for
-punishment.
-
-Default paths
-=============
-
-  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' (and a little extra magic--see `kpathsea/Makefile') is
-     applied to `texmf.cnf.in' to generate `texmf.cnf'. This is the
-     file that will eventually be installed and used by the programs to
-     look up programs.
-
-  4. The definitions in `texmf.cnf' are changed into the form of C
-     `#define''s, producing `paths.h'. These values will be the
-     compile-time defaults; they are not used unless no `texmf.cnf' file
-     can be found at runtime.
-
-     (That's a partial lie: the compile-time defaults are what 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.)
-
-
-  The purpose of this elaborate sequence is to avoid having the same
-information in more than one place. If you change the installation
-directories or top-level prefix before running `configure', those
-changes will propagate through the whole sequence. If you change the
-default paths in `texmf.cnf.in', those changes are propagated to the
-compile-time defaults.
-
-  Alternatively, you can ignore the whole mess and edit `texmf.cnf'
-after it is installed. Maybe even copying it into place beforehand so
-you can complete the installation, if TeX or Metafont is having trouble
-finding their input files.
-
-  Unfortunately, editing `Makefile.in' *does not work* in one common
-case--changing the `prefix' or `exec_prefix' variables. For these, you
-must use the `-prefix' or `-exec-prefix' options to `configure'.  *Note
-Running `configure' scripts: (autoconf)Running configure Scripts.
-(That's another partial lie: editing does work, as long as a program
-named `tex' is not in your `PATH'.)
-
-  *Note TeX directory structure: TeX directory structure, for a
-description of some ways to arrange the TeX library files, and some
-features of the distributed paths that may not be obvious.  The file
-`kpathsea/HIER' is a copy of that section.
-
-  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 potentially run Make in the
-subdirectories.)
-
-Common problems
-===============
-
-  Some common problems with compilation, linking, or execution are
-described below.
-
-Unable to find files
---------------------
-
-  If a program complains it cannot find fonts (or other input files),
-any of several things might be wrong:
-
-   * You don't have the fonts (or whatever) installed. Nothing will
-     automatically generate TFM files or TeX and Metafont sources for
-     you (by default). *Note Obtaining Web2c: (web2c)Obtaining Web2c.
-
-     You can, however, configure TeX and Metafont to run a script to
-     generate these input files, if you have (or write) such scripts.
-     *Note `MakeTeX'... invocation: (web2c)MakeTeX... invocation.
-
-   * 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, thus overriding what you
-     carefully set in `texmf.cnf'. *Note TeX environment variables: TeX
-     environment variables.
-
-   * Your files reside in a directory that is only pointed to via a
-     symbolic link, in a leaf directory.
-
-     Unfortunately, Kpathsea's subdirectory searching has a (congenital)
-     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::, for an explanation of why this happens.
-
-     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.  This is since presumably you would not have
-     asked for the directory to be searched for subdirectories if you
-     didn't want it to be.
-
-   * There is a bug in the library. *Note Reporting bugs::.
-
-  In any case, you may find the debugging options helpful in determining
-precisely where the fonts (or whatever) are being looked for. See the
-program's documentation for its debugging options, and also *note
-Debugging::..
-
-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 reinstall any of
-     the programs.)
-
-   * Your recursively-searched directories (e.g.,
-     `/usr/local/lib/tex/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 directories
-     where the dozens of TFM, PK, or whatever files reside.
-
-   * Finally, one simple-to-fix (but unlikely) cause: If you recursively
-     search `$HOME' or `~', and you are running as `root', you will
-     search every directory on the system.  This typically takes quite
-     some time!
-
-  In any case, you may find the debugging options helpful in determining
-precisely when the disk or network is being pounded. *Note Debugging::,
-and also see the program's documentation.
-
-`XtInherit'
------------
-
-  On DEC OSF/1 1.x systems, the loader has a bug that manifests itself
-in the following error (all on one line, but for the sake of the paper
-width it's broken here):
-
-     xdvik/xdvi: /sbin/loader: Fatal Error: search_for_undefineds:
-          symbol _XtInherit should not have any relocation entry
-
-According to Michael Rickabaugh `<mjr@quarry.enet.dec.com>':
-
-     This is a bug fixed in DEC OSF/1 2.0.
-     
-     If you know how, installing `/sbin/loader' from a 2.0 system onto a
-     1.3 system will work.  Make sure that `/usr' is *not* mounted
-     when you do this.  (If you forget about umounting `/usr', it is
-     possible most of your filesystems will become corrupted.)
-     
-     Otherwise, I suggest getting a hold of a 2.0 CD and running
-     `/usr/sbin/installupdate'.
-
-  Alternatively, you may be able to use the freely available X11
-libraries that come with the MIT distribution (on `ftp.x.org', for
-example).
-
-  Linking statically, perhaps only with some of the X libraries, may
-also work.  (if you find the definitive workaround, please let me know.)
-
-`wchar_t'
----------
-
-  The upshot of all the following is that if you get error messages
-regarding `wchar_t', try defining `NO_FOIL_X_WCHAR_T' (for Web2c) or
-`FOIL_X_WCHAR_T' (for everything else).
-
-  `wchar_t' has caused infinite trouble. None of my code ever uses
-`wchar_t'; all I want to do is include X header files and various
-system header files, possibly compiling with GCC. This seems an
-impossible task!
-
-  The X11 header `<Xlib.h>' and GCC's `<stddef.h>' have conflicting
-definitions for wchar_t.
-
-  The particulars: `<X11/Xlib.h>' from MIT X11R5 defines `wchar_t' if
-`X_WCHAR' is defined, which is defined if `X_NOT_STDC_ENV' is defined,
-and we define *that* if `STDC_HEADERS' is not defined (`configure'
-decides if STDC_HEADERS gets defined).  But when compiling with gcc on
-SunOS 4.1.x, `STDC_HEADERS' is not defined (`string.h' doesn't declare
-the `mem'* functions), so we do get X's `wchar_t'--and we also get
-gcc's `wchar_t' from its `<stddef.h>'.  Conflict.
-
-  On the other hand, SunOS 4.1.1 with some other X configurations
-actually needs GCC to define `wchar_t', and fails otherwise.
-
-  My current theory is to define `wchar_t' to a nonsense symbol before
-the X include files are read; that way its definition (if any) will be
-ignored by other system include files.  Going along with that, define
-`X_WCHAR' to tell X not to use `<stddef.h>', that we've already
-included, but instead to make its own definition.
-
-  But this is not the end of the story. The X11 include files
-distributed with DG/UX 5.4.2 for the Aviion have been modified to
-include `<_int_wchar_t.h>' if `X_WCHAR', so our `#define' will not have
-any typedef to change--but the uses of `wchar_t' in the X include files
-will be changed to reference this undefined symbol. So there's nothing
-to foil in this case. I don't know how to detect this automatically, so
-it's up to you to define `NO_FOIL_X_WCHAR_T' yourself.
-
-`ShellWidgetClass'
-------------------
-
-  This section is adapted from question 47 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'. This problem does not arise with
-the standard MIT libraries under SunOS.
-
-  The cause is bugs in the `Xmu' shared library as shipped from Sun.
-There are several fixes:
-
-   * Get the Openwindows patches that apply to this problem.
-
-   * Statically link the `Xmu' library into the executable.
-
-   * Avoid using `Xmu' at all. For this last, if you are compiling
-     Metafont, *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 format, alter the
-`x_libs' make variable to include
-
-     -Bstatic -lXmu -Bdynamic
-
-  If you are using `gcc', include `-static' in `LDFLAGS'; this will
-link all libraries statically. If you want to link only `Xmu'
-statically and everything else dynamically, you have to do it by hand:
-run `gcc -v', grab the `ld' line, and add the `-B''s given above around
-`-lXmu'.
-
-  The reason is that gcc moves all linker options to the front of the
-`ld' command line.  So you can't specify different options for
-different libraries.  When I reported this to the GCC maintainers, the
-reply was that they would happily merge in the changes, but they didn't
-want to take the time to do it themselves.
-
-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.
-
-  In general, 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 bug list.)
-
-Shared library
-==============
-
-  You can compile Kpathsea as a shared library.  The advantage in doing
-this is that the different executables can then share the code,
-decreasing memory usage.  (The other advantage in general of shared
-libraries is that it's possible to update the library and programs
-independently.  But since the Kpathsea interface is not and can not be
-frozen, that doesn't apply here.)
-
-  Under Solaris, use `-K pic -xstrconst' if you compile with a Sun
-compiler, `-fpic' if you use GCC.  Also add `-L$(LIBDIR) -R$(LIBDIR)'
-to `LDFLAGS' when you link the binaries, so that the library can be
-found, and users do not have set `LD_LIBRARY_PATH'.
-
-  (If you know how to make Kpathsea shared on other systems, please
-send a message to the bug address in the next section.)
-
-Reporting bugs
-==============
-
-  If you encounter problems, please report them to `tex-k@cs.umb.edu'.
-Include the version number of the library, the system you are using, and
-enough information to reproduce the bug in your report.  To get on this
-mailing list yourself, email `tex-k-request@cs.umb.edu' with a message
-whose body contains a line
-     subscribe YOU@YOUR.PREFERRED.ADDRESS
-
-  To avoid wasted effort and time (both mine and yours), I strongly
-advise applying the principles given in the GNU C manual (*note
-Reporting Bugs: (gcc)Bugs.) to your bug reports.
-
-  Please also report bugs in this documentation--not only factual
-errors, but unclear explanations, typos, wrong fonts, ...
deleted file mode 100755
--- a/kpathsea/MakeTeXPK.in
+++ /dev/null
@@ -1,276 +0,0 @@
-#!/bin/sh
-# original MakeTeXPK -- make a new PK font, because one wasn't found.
-# Version of 12dec94.
-# 
-# (If you change or delete the word `original' on the previous line,
-# installation won't write this MakeTeXPK over yours.)
-#
-# This script must echo the name of the generated PK file (and nothing
-# else) to standard output. Yes, this is different from the original dvips.
-# 
-# Parameters:
-#   name dpi bdpi magnification [mode [destdir]]
-#
-#   `name' is the base name of the font, such as `cmr10'.
-#   `dpi' is the resolution the font is needed at.
-#   `bdpi' is the base resolution, used to intuit the mode to use.
-#   `magnification' is a string to pass to MF as the value of `mag'.
-#   `mode', if supplied, is the mode to use. Unless it's `default', in
-#     which case we guess. (This is so people can specify a destdir
-#     without a mode.)
-#   `destdir', if supplied, is either the absolute directory name to use
-#     (if it starts with a /) or relative to the default DESTDIR (if not).
-
-# The root of where to put the new file. (Using the sh construct
-# ${var=value} is the tersest construct that lets an environment
-# variable `var' override the value given here.)
-: ${DESTROOT=${MTPK_DESTROOT-@fontdir@}}
-
-# Define to `gsftopk' or `ps2pk' or whatever to make PK files for
-# PostScript fonts. If this is defined, PSMAPFILE must also be defined to
-# be your psfonts.map file or some equivalent.
-: ${ps_to_pk=gsftopk}
-: ${PSMAPFILE=@psheaderdir@/psfonts.map}
-
-# Location of the files that map font name parts to directory names.
-: ${NAMEMAPDIR=@fontnamedir@}
-
-# This is needed only if all the font directories were not included in
-# the compile-time path for gsftopk. 
-: ${DVIPSHEADERS=@datadir@/ghostscript/type1:}
-
-# If this directory doesn't exist, the DC fonts won't be attempted.
-: ${dcfontdir=@dcfontdir@}
-
-# If this directory doesn't exist, the Sauter stuff won't be attempted.
-: ${sauterdir=@sauterdir@}
-
-# If the true typeface directory cannot be determined from the fontname,
-# the files are installed here, relative to $DESTROOT.
-: ${default_namepart=tmp/pk}
-
-# TEMPDIR needs to be unique for each process because of the possibility
-# of processes simultaneously running this script.
-TEMPDIR=${TMPDIR-/tmp}/mtpk.$$
-
-if test $# -lt 4; then
-  echo "Usage: $0 name dpi bdpi mag [mode [destdir]]." >&2
-  exit 1
-fi
-
-NAME=$1
-DPI=$2
-BDPI=$3
-MAG=$4
-MODE=$5
-
-# DESTDIR is harder.
-case "$6" in
-  "")
-      # Nothing specified, so try to intuit the directory from the
-      # fontname. First the special cases: either $NAME matches an entire
-      # name in special.map, or it matches the abbreviation in
-      # special.map and ends with a numeral (for the pointsize).
-      # We (painfully) use only the minimal features in original awk.
-      if test -r $NAMEMAPDIR/special.map; then
-        namepart=`awk \
-'{if ($1 == NAME || (substr (NAME, 1, length ($1)) == $1 \
-                      && substr (NAME, length (NAME), 1) ~ /[0-9]/)) \
-     { print $2 "/" $3; exit; }}' NAME=$NAME $NAMEMAPDIR/special.map`
-
-        if test -z "$namepart"; then
-          # Try the normal case. Source first.
-          s_abbrev=`echo $NAME | cut -c 1-1`
-          sourcedir=`awk '{ if ($1 == s_abbrev) { print $2; exit; }}' \
-                     s_abbrev=$s_abbrev $NAMEMAPDIR/source.map`
-
-          if test -n "$sourcedir"; then
-            # We found the source. Try for the typeface.
-            t_abbrev=`echo $NAME | cut -c 2-3`
-            typefacedir=`awk '{ if ($1 == t_abbrev) { print $2; exit; }}' \
-                         t_abbrev=$t_abbrev $NAMEMAPDIR/typeface.map`
-
-            if test -n "$typefacedir"; then
-              # Found everything.
-              namepart=$sourcedir/$typefacedir
-
-            else
-              echo "$0: Could not map typeface abbreviation $t_abbrev." >&2
-            fi
-          else
-            echo "$0: Could not map source abbreviation $s_abbrev." >&2
-          fi
-        fi
-      else
-        # No map files.
-        :
-      fi
-      if test -z "$namepart"; then
-        # If we failed for whatever reason, default to a generic subdir.
-        namepart=$default_namepart
-      else
-        # Otherwise, get the `pk' in before we append the mode.
-        namepart=$namepart/pk 
-      fi
-      
-      # Finally, update the parent of the installation directory.
-      DESTROOT="$DESTROOT/$namepart"
-      ;;
-  /*) DESTDIR=$6;;           # Absolute, explicit destdir => use it.
-   *) DESTDIR=$DESTROOT/$6;; # Relative destdir => append to the default.
-esac
-
-GFNAME=$NAME.$DPI'gf'
-PKNAME=$NAME.$DPI'pk'
-
-# Clean up on normal or abnormal exit. DESTDIR changes, hence the eval.
-trap "cd /; eval rm -rf $TEMPDIR \$DESTDIR/pktmp.$$" 0 1 2 15
-
-# Allow fonts to be read and written (especially in case we make
-# directories) by everyone.  
-umask 0
-
-# Possible local customizations?
-test -r @web2cdir@/MakeTeXPK.site && . @web2cdir@/MakeTeXPK.site
-
-# Remember where we were for the paths. We'd most like to replace `.',
-# wherever it is in the path, with $SAVEPWD, but we don't have access to the
-# compile-time path. So we are conservative, and put this at the end.
-SAVEPWD=`pwd`
-
-# Go to the unique working directory.
-test -d $TEMPDIR || mkdir $TEMPDIR 
-cd $TEMPDIR || exit 1
-
-# grep for the font in $PSMAPFILE, if some ps-to-pk is claimed to be supported.
-# We have to figure out the name of the base font -- $NAME is probably
-# something like pplr, but it's rpplr or pplr0 or pplr8r that's in psfonts.map.
-pattern="^r?$NAME"'(0|8r)?([ 	]|$)' 
-test -n "$ps_to_pk" && egrep "$pattern" $PSMAPFILE >psline
-if test -s psline; then
-  # This is a PostScript font.
-  MODE=$ps_to_pk
-  case $ps_to_pk in
-       ps2pk*) special_part=`cat psline | sed -e 's/^.*"//' -e 's/".*$//'`
-               # .167 SlantFont
-               slant=`echo $special_part \
-                      | awk '{ if ($2 == SlantFont) print "-S" $1 }'`
-               extend=`echo $special_part \
-                       | awk '{ if ($2 == ExtendFont) print "-E" $1 }'`
-               cmd="$ps_to_pk -v -X$DPI $slant $extend $NAME";;
-            *) cmd="$ps_to_pk $NAME $DPI";;
-  esac
-
-  # Update DESTDIR for new mode, and check if we were spuriously called.
-  test -z "$6" && DESTDIR="$DESTROOT/$MODE"
-  if test -r $DESTDIR/$PKNAME; then # sigh, this is repeated below
-    echo "$0: $DESTDIR/$PKNAME already exists." >&2
-    echo $DESTDIR/$PKNAME
-    exit 0
-  fi
-
-  DVIPSHEADERS="$DVIPSHEADERS:$SAVEPWD"
-  export DVIPSHEADERS
-  echo "$0: Running $cmd" >&2
-  $cmd >&2 || { echo "$0: $ps_to_pk failed." >&2; exit 1; }
-
-else
-  # Try Metafont.
-  MFINPUTS="$MFINPUTS:$SAVEPWD"
-  export MFINPUTS
-
-  # If an explicit mode is not supplied, try to guess. You can get a
-  # list of extant modes from ftp.cs.umb.edu:pub/tex/modes.mf.
-  if test -z "$MODE" || test "$MODE" = default; then
-    case "$BDPI" in
-      85) MODE=sun;;
-     300) MODE=cx;;
-     600) MODE=ljfour;;
-    1270) MODE=linolo;;
-       *) echo "$0: Can't guess mode for $BDPI dpi devices." >&2
-          echo "$0: Use a config file, or update me." >&2
-          exit 1
-    esac
-  fi
-
-  # If no destination directory specified, install font in directory
-  # named for the mode.
-  test -z "$6" && DESTDIR="$DESTROOT/$MODE"
-
-  if test -r $DESTDIR/$PKNAME; then # sigh, this is repeated above
-    echo "$0: $DESTDIR/$PKNAME already exists." >&2
-    echo $DESTDIR/$PKNAME
-    exit 0
-  fi
-
-  # Run Metafont. Always use plain Metafont, since reading cmbase.mf
-  # does not noticeably slow things down. Separate the filename from the
-  # rest, since we have to use ./$NAME if we generate something.
-  cmd="mf \mode:=$MODE; mag:=$MAG; scrollmode; input"
-  echo "$0: Running $cmd $NAME" >&2
-  if $cmd $NAME </dev/null >&2; then
-    : # Success already.
-  
-  else
-    # These other cases should really be part of MakeTeXMF.
-    # First have to figure out the real magnification, which means
-    # extracting the point size from the name -- a trailing number.
-    rootname=`echo $NAME | sed 's/[0-9]*$//'`
-    pointsize=`echo $NAME | sed "s/^$rootname//"`
-    case "$pointsize" in
-      11) realsize=10.95444;;	# \magstephalf
-      14) realsize=14.4;;	# \magstep2
-      17) realsize=17.28;;	# \magstep3
-      20) realsize=20.74;;	# \magstep4
-      25) realsize=24.88;;	# \magstep5
-       *) realsize=$pointsize;;
-    esac
-    mfname=$NAME.mf
-    rm -f $mfname # We are in $TEMPDIR, so this is safe.
-
-    if test -z "$pointsize"; then
-      # No point size, so it can't be a DC or Sauter font. Give up.
-      :
-
-    elif echo $NAME | grep '^dc' >/dev/null; then
-      echo "$0: Trying DC font." >&2
-      echo "if unknown dxbase: input dxbase fi;" >$mfname
-      echo "gensize:=$realsize;" >>$mfname
-      echo "generate $rootname." >>$mfname
-      echo "$0: Running $cmd ./$NAME" >&2
-      $cmd ./$mfname </dev/null >&2
-
-    elif test -d $sauterdir; then
-      echo "$0: Trying interpolated/extrapolated (Sauter) font." >&2
-      echo "design_size:=$realsize;" >>$mfname
-      echo "input b-$rootname;" >>$mfname
-      echo "$0: Running $cmd ./$NAME" >&2
-      $cmd ./$mfname </dev/null >&2
-      # Result should go in the sauterdir, not the cm dir.
-      test -z "$6" && $DESTDIR=$sauterdir/pk/$MODE
-    fi # alternative mf sources
-  fi # first mf failed
-  
-  # If we couldn't make the font, quit.
-  test -r $GFNAME || \
-    { echo "$0: Metafont failed to make $GFNAME." >&2; exit 1; }
-
-  # Success.  Make the PK file.
-  gftopk ./$GFNAME $PKNAME || exit 1
-fi
-
-# If we get here, we've succeeded; move the final font to $DESTDIR.
-test -d $DESTDIR \
-  || mkdir $DESTDIR \
-  || { echo "$0: Could not mkdir $DESTDIR." >&2; exit 1; }
-
-# Install the PK file carefully, since others may be working simultaneously.
-mv $PKNAME $DESTDIR/pktmp.$$ \
-  || { echo "$0: Could not mv $PKNAME $DESTDIR/pktmp.$$." >&2; exit 1; }
-
-cd $DESTDIR || exit 1
-mv pktmp.$$ $PKNAME
-
-# If this line (or an equivalent) is not present, dvipsk/xdvik/dviljk
-# will think MakeTeXPK failed.  Any other output to stdout will also lose.
-echo $DESTDIR/$PKNAME
deleted file mode 100644
--- a/kpathsea/Makefile.in
+++ /dev/null
@@ -1,635 +0,0 @@
-# Makefile for kpathsea --kb@cs.umb.edu.
-version = 2.52
-
-ac_include ../make/paths.make
-ac_include ../make/makevars.make
-
-# Add -DNO_DEBUG to disable debugging, for unnoticeably better performance.
-DEFS = $(XDEFS)
-
-ac_include ../make/common.make
-ac_include ../make/library.make
-ac_include ../make/programs.make
-ac_include ../make/texi.make
-
-# Install these header files (except c-auto.h).
-install_headers = *.h
-
-##ifdef HOSTNAME
-##warn_more = -Wmissing-prototypes -Wwrite-strings -Wshadow
-##MAKEINFO_FLAGS := $(MAKEINFO_FLAGS) --no-split
-##malloc = onefile.o # gmalloc.o
-##endif
-
-# Put tex-file.o first, because it's what depends on the paths, and may
-# reduce frustration if the paths are wrong by doing it first.
-
-objects = tex-file.o absolute.o basename.o cnf.o concat.o concat3.o      \
-concatn.o db.o debug.o dir.o elt-dirs.o expand.o extend-fname.o file-p.o \
-find-suffix.o fn.o fontmap.o getopt.o getopt1.o hash.o itoa.o kdefault.o \
-line.o magstep.o make-suffix.o path-elt.o pathsearch.o proginit.o        \
-progname.o putenv.o readable.o rm-suffix.o str-list.o str-llist.o        \
-tex-glyph.o tex-make.o tilde.o truncate.o uppercasify.o variable.o       \
-version.o xcalloc.o xfopen.o xmalloc.o xopendir.o xputenv.o xrealloc.o   \
-xstat.o xstrdup.o $(malloc)
-
-LIBS_TO_INSTALL = libkpathsea.a
-
-SH_LIBS_TO_INSTALL = libkpathsea.$(SHLEXT)
-
-ifeq ($(SHARED_LIBS), true)
-  BINDISTFILES = libkpathsea.$(SHLEXT)
-  BINDISTLIBS = $(addprefix kpathsea/, libkpathsea.$(SHLEXT))
-endif
-
-default all: stamp-picdir kpsewhich MakeTeXPK kpathsea.info stamp-shared
-
-stamp-picdir:
-	@if $(SHARED_LIBS); then \
-	  if [ -n "$(CPICFLAG)" ]; then \
-	    if [ -d pic ]; then \
-	      true ; \
-	    else \
-	      echo "mkdir pic" ; \
-	      mkdir pic ; \
-	    fi ; \
-	  else \
-	    true ; \
-	  fi ; \
-	fi
-	touch stamp-picdir
-
-libkpathsea.a: $(objects)
-	rm -f $@
-	$(AR) $(ARFLAGS) $@ $(objects)
-	$(RANLIB) $@
-
-ifeq ($(SHARED_LIBS), true)
-  ifdef CPICFLAG
-    PICOBJ := $(addprefix pic/, $(objects))
-  else
-    PICOBJ := $(objects)
-  endif
-endif
-
-stamp-shared: $(PICOBJ)
-	if $(SHARED_LIBS); then \
-	  $(SH_LD) $(SH_LDFLAGS) -o libkpathsea.$(SHLEXT) $(PICOBJ) ; \
-	fi
-	touch stamp-shared
-
-kpsewhich: libkpathsea.a kpsewhich.o
-	$(link_command) kpsewhich.o $(LOADLIBES)
-
-MakeTeXPK: MakeTeXPK.in $(top_srcdir)/../make/paths.make
-	sed -e 's,@datadir@,$(datadir),g' \
-	    -e 's,@psheaderdir@,$(psheaderdir),g' \
-	    -e 's,@fontnamedir@,$(fontnamedir),g' \
-	    -e 's,@fontdir@,$(fontdir),g' \
-	    -e 's,@dcfontdir@,$(dcfontdir),g' \
-	    -e 's,@sauterdir@,$(sauterdir),g' \
-	    -e 's,@web2cdir@,$(web2cdir),g' \
-	<$(srcdir)/MakeTeXPK.in >$@.tmp
-	mv $@.tmp $@
-	-chmod a+x $@
-
-# Besides the straight variable substitutions, also change all
-# occurrences of `$(texmf)/' to `$TEXMF', so simply setting that envvar
-# changes the root of the whole tree.
-texmf.cnf: texmf.cnf.in texmf.sed
-	sed -f texmf.sed -e 's%$(texmf)/%$$TEXMF/%g' $(srcdir)/texmf.cnf.in >$@
-
-# The idea is to turn each var=value into s%@var@%value%g. Seems simpler
-# to put the substitutions in a file than to play shell games.
-texmf.sed: $(top_srcdir)/../make/makevars.make
-	echo $(makevars) \
-	| tr ' ' '\012' \
-	| sed -e 's/^/s%@/' -e 's/=/@%/' -e 's/$$/%/' -e 's/$$/g/' \
-	>$@
-
-# First null out comments and leading/trailing whitespace, then remove
-# lines that define invalid C identifiers, then remove blank lines. Each
-# line remaining looks like
-# <name> = <value>
-# (but = and surrounding spaces are optional, hence can't remove all spaces).
-# Change this to #ifndef DEFAULT_name@#define DEFAULT_name "value"@#endif,
-# then change the @'s to newlines (sed isn't good at multiline replacements),
-# then change $TEXMF back to $(texmf)
-# 
-# No backslash-newline escapes in the long sed replacement because that
-# will turn into a space in the output.
-# 
-# Without the $TEXMF substitution, if the cnf file was not found for
-# some reason, none of the compile-time paths would be of any use, since
-# TEXMF wouldn't be defined. Alternatively, we could have a way to
-# specify compile-time default values for variables in general, but I
-# think it's better to keep the last-resort paths as simple as possible.
-# 
-# The definition of DEFAULT_TEXMF (and possibly other variables)
-# that winds up in the final paths.h will not be used.
-paths.h: texmf.cnf
-	echo "/* paths.h: Generated from texmf.cnf `date`.  */" >$@
-	sed -e 's/%.*//' -e 's/^[ 	]*//' -e 's/[ 	]*$$//' texmf.cnf \
-	| grep '^[ 	]*[A-Za-z_]*[ 	=]' \
-	| sed '/^$$/d' \
-	| sed 's/^\([^ 	=]*\)[ 	]*=*[ 	]*\(.*\)/#ifndef DEFAULT_\1@#define DEFAULT_\1 "\2"@#endif/' \
-	| tr @ '\012' \
-	| sed 's@\$$TEXMF@$(texmf)@g' \
-	>>$@
-
-# A few object files need extra definitions. The dependencies are below.
-tex-file.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) \
-	  -DDEFAULT_FONT_SIZES='"$(default_texsizes)"' -c $(srcdir)/tex-file.c
-
-pic/tex-file.o:
-	$(CC) $(CPPFLAGS) $(CPICFLAG) $(CFLAGS) \
-	  -DDEFAULT_FONT_SIZES='"$(default_texsizes)"'\
-	  -c $(srcdir)/tex-file.c -o $@
-
-# Don't optimize.
-
-XCC = $(patsubst -O%, , $(CC))
-XCFLAGS = $(patsubst -O%, , $(ALL_CFLAGS))
-
-hash.o:
-	$(XCC) $(CPPFLAGS) $(XCFLAGS) -c $(srcdir)/hash.c
-
-pic/hash.o:
-	$(XCC) $(CPPFLAGS) $(CPICFLAG) $(XCFLAGS) -c $(srcdir)/hash.c -o $@
-
-# Need the -DHAVE_CONFIG_H.
-gmalloc.o:
-	$(CC) $(CPPFLAGS) @DEFS@ $(CFLAGS) -c $(srcdir)/gmalloc.c
-
-pic/gmalloc.o:
-	$(CC) $(CPPFLAGS) $(CPICFLAG) @DEFS@ $(CFLAGS) \
-	  -c $(srcdir)/gmalloc.c -o pic/gmalloc.o
-
-check: 
-
-install:
-	for f in $(LIBS_TO_INSTALL); do \
-	  if [ -f $$f ]; then $(INSTALL_DATA) $$f $(libdir)/$$f; fi; \
-	done
-	for f in $(SH_LIBS_TO_INSTALL); do \
-	  if [ -f $$f ]; then $(INSTALL_PROGRAM) $$f $(libdir)/$$f; fi; \
-	done
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s" install
-
-uninstall:
-
-# Installation of kpathsea itself is complicated by the fact that we
-# want to install texmf.cnf, kpathsea.info, and MakeTeXPK by default,
-# but not the headers or the .a file itself.  So we have a separate
-# target `install-library' to install the latter stuff.
-#install: install-exec install-data
-#uninstall: uninstall-exec uninstall-data
-#
-#install-exec: kpsewhich MakeTeXPK
-#	$(SHELL) $(top_srcdir)/../mkdirchain $(bindir) $(scriptdir)
-#	if grep 'original MakeTeXPK --' $(scriptdir)/MakeTeXPK >/dev/null 2>&1\
-#	   || test ! -r $(scriptdir)/MakeTeXPK; then \
-#	  $(INSTALL_PROGRAM) MakeTeXPK $(scriptdir)/MakeTeXPK; \
-#	else true; fi
-#	$(INSTALL_PROGRAM) kpsewhich $(bindir)/kpsewhich
-#uninstall-exec:
-#	rm -f $(bindir)/kpsewhich
-#
-#install-data: texmf.cnf kpathsea.info
-#	$(SHELL) $(top_srcdir)/../mkdirchain $(texmf) $(infodir) $(web2cdir)
-#	if grep 'original texmf.cnf --' $(web2cdir)/texmf.cnf >/dev/null 2>&1 \
-#	   || test ! -r $(web2cdir)/texmf.cnf; then \
-#	  $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf; \
-#	else true; fi
-#	$(INSTALL_DATA) $(srcdir)/kpathsea.info $(infodir)/kpathsea.info
-#uninstall-data:
-#	rm -f $(infodir)/kpathsea.info*
-#
-#install-library: libkpathsea.a 
-#	$(SHELL) $(top_srcdir)/../mkdirchain $(includedir)/kpathsea $(libdir)
-#	$(INSTALL_DATA) libkpathsea.a $(libdir)/libkpathsea.a
-#	for f in $(install_headers); do \
-#	  $(INSTALL_DATA) $$f $(includedir)/kpathsea/$$f; done
-#	rm -f $(includedir)/kpathsea/c-auto.h
-#uninstall-library:
-#	rm -f $(libdir)/libkpathsea.a
-#	for f in $(install_headers); do rm -f $(includedir)/$$f; done
-
-# distdir is used by other distributions; they define $(distdir).
-distdir: INSTALL TAGS kpathsea.info kpathsea.dvi
-	rm -rf $(distdir)
-	mkdir -p $(distdir)
-	ln $(ln_files) $(distdir)
-	cp -p $(HOME)/gnu/gnuorg/*.texi $(distdir)
-	touch *.info*
-	ln *.info* *.texi kpathsea.aux kpathsea.cps $(distdir)
-	ln CONFIGURE HIER common.ac $(distdir)
-	cd $(distdir); rm -f paths.h
-	cd $(distdir); add-version $(version) version.c
-
-bin-dist:
-	if [ -n "$(BINDISTFILES)" ]; then \
-	  ln $(BINDISTFILES) ../`cat ../.fname`/kpathsea ; \
-	fi
-	if [ -n "$(BINDISTLIBS)" ]; then \
-	  echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES ; \
-	fi
-.PHONY: bin-dist
-
-ac_include ../make/config.make
-
-info: kpathsea.info
-dvi: kpathsea.dvi
-INSTALL: kpathsea.texi install.texi
-	$(MAKEINFO) $(MAKEINFO_FLAGS) --no-headers $< -o - \
-	  | sed -n -e '/^Installation/,/wrong fonts/'p >$@
-	add-info-toc $@
-
-ac_include ../make/misc.make
-
-mostlyclean::
-	rm -f kpsewhich
-distclean::
-	rm -f paths.h texmf.cnf texmf.sed so_locations
-	rm -f libkpathsea.a libkpathsea.$(SHLEXT)
-
-ac_include ../make/rdepend.make
-absolute.o: absolute.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/absolute.h $(kpathsea_srcdir)/c-pathch.h
-basename.o: basename.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-pathch.h
-cnf.o: cnf.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.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 paths.h \
-  $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/variable.h
-concat.o: concat.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h
-concat3.o: concat3.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h
-concatn.o: concatn.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/concatn.h $(kpathsea_srcdir)/c-vararg.h
-db.o: db.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/db.h \
-  $(kpathsea_srcdir)/str-list.h $(kpathsea_srcdir)/hash.h $(kpathsea_srcdir)/line.h \
-  $(kpathsea_srcdir)/readable.h $(kpathsea_srcdir)/variable.h
-debug.o: debug.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h
-dir.o: dir.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h
-elt-dirs.o: elt-dirs.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-pathch.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.o: expand.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/expand.h $(kpathsea_srcdir)/pathsearch.h \
-  $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/tilde.h $(kpathsea_srcdir)/variable.h
-extend-fname.o: extend-fname.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h
-file-p.o: file-p.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/xstat.h $(kpathsea_srcdir)/c-stat.h 
-find-suffix.o: find-suffix.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-pathch.h
-fn.o: fn.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/fn.h
-fontmap.o: fontmap.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.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
-getopt.o: getopt.c \
-  getopt.h
-getopt1.o: getopt1.c getopt.h 
-hash.o: hash.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/hash.h $(kpathsea_srcdir)/str-list.h
-itoa.o: itoa.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h
-kdefault.o: kdefault.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/default.h
-kpsewhich.o: kpsewhich.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/getopt.h $(kpathsea_srcdir)/line.h $(kpathsea_srcdir)/proginit.h \
-  $(kpathsea_srcdir)/progname.h $(kpathsea_srcdir)/tex-file.h $(kpathsea_srcdir)/tex-glyph.h \
-  $(kpathsea_srcdir)/variable.h
-kpsexpand.o: kpsexpand.c \
-  tex-file.h $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/types.h
-line.o: line.c 
-magstep.o: magstep.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/magstep.h
-make-suffix.o: make-suffix.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h
-path-elt.o: path-elt.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/pathsearch.h $(kpathsea_srcdir)/str-llist.h
-pathsearch.o: pathsearch.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.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.o: proginit.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/proginit.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/tex-file.h
-progname.o: progname.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/progname.h
-putenv.o: putenv.c ./c-auto.h
-readable.o: readable.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/readable.h $(kpathsea_srcdir)/truncate.h
-rm-suffix.o: rm-suffix.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h
-str-list.o: str-list.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/str-list.h
-str-llist.o: str-llist.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/str-llist.h
-tex-file.o: tex-file.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/cnf.h $(kpathsea_srcdir)/default.h \
-  $(kpathsea_srcdir)/expand.h paths.h $(kpathsea_srcdir)/pathsearch.h \
-  $(kpathsea_srcdir)/str-llist.h $(kpathsea_srcdir)/tex-file.h
-tex-glyph.o: tex-glyph.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.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-make.o: tex-make.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-fopen.h $(kpathsea_srcdir)/c-pathch.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.o: tilde.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/tilde.h 
-truncate.o: truncate.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-namemx.h $(kpathsea_srcdir)/c-pathch.h $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/truncate.h
-uppercasify.o: uppercasify.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-ctype.h 
-variable.o: variable.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/c-ctype.h $(kpathsea_srcdir)/cnf.h \
-  $(kpathsea_srcdir)/fn.h $(kpathsea_srcdir)/variable.h
-version.o: version.c
-xcalloc.o: xcalloc.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h
-xfopen.o: xfopen.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h
-xmalloc.o: xmalloc.c 
-xopendir.o: xopendir.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/xopendir.h $(kpathsea_srcdir)/c-dir.h 
-xputenv.o: xputenv.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h
-xrealloc.o: xrealloc.c 
-xstat.o: xstat.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/xstat.h $(kpathsea_srcdir)/c-stat.h 
-xstrdup.o: xstrdup.c $(kpathsea_srcdir)/config.h ./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 $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/debug.h
deleted file mode 100644
--- a/kpathsea/NEWS
+++ /dev/null
@@ -1,124 +0,0 @@
-This file records noteworthy changes.
-
-2.6 (9 January 1995)
-* MakeTeXPK installed from kpathsea, instead of each driver.
-* MakeTeXPK.site looked for in texmf/web2c, instead of texmf/dvips.
-* texmf.cnf installed and looked for in texmf/web2c, instead of texmf.
-* If a mode is not explicitly specified, search all subdirectories (this
-  was actually in a previous release).
-* install-sh only looked for in the top-level directory.
-* kpsewhich replaces and generalizes kpsexpand.
-
-2.5 (15 December 1994)
-* Go back to calling db_insert after a successful MakeTeXPK, and check
-  for lack of an ls-R.
-* Handle case of magstep -.5 for MakeTeXPK properly.
-
-2.4 (28 October 1994)
-* Avoid calling db_insert, which caused a segmentation fault.
-
-2.3 (26 October 1994)
-* Extra :'s in an envvar value, referring to the texmf.cnf value, work.
-* Names like dpi600/cmr10.pk can be found in ls-R.
-* KPATHSEA_DEBUG environment variable checked.
-* Directories like pk/ljfour directly under $TEXMF/fonts are found.
-* New standalone program, kpsexpand, optionally compiled and installed,
-  to do variable expansion (not path searching).
-* Debugging output written to stderr instead of stdout.
-* pxlNNN support removed; I never intended to support `pxl1500', and
-  pxl300 is never used.
-
-2.2 (14 October 1994)
-* MakeTeXPK invoked for the any_glyph type; this is for xdvik.
-* MakeTeXPK sources $(psheaderdir)/MakeTeXPK.site if it exists.
-* pxlNNN/cmr10.pk searched for (as well as dpiNNN/cmr10.pk and cmr10.NNNpk)
-
-2.1 (12 September 1994)
-* Manual goes through TeX, and .cps/.aux files are in the distribution.
-* INSTALL* variables set at the top level.
-* Dependency on GNU tr making paths.h and texmf.sed (->texmf.cnf) removed.
-* texmf.cnf installed if it didn't previously exist.
-
-2.0 (8 September 1994)
-* Runtime configuration file support; see the manual.
-* Both dpi600/cmr10.pk and cmr10.600pk are searched for.
-* ls-R matches $TEXMF//latex2e vs. $TEXMF//latex209.
-* $TEXMFLOG, if set, specifies a filename for logging successful searches.
-* All directory entries beginning with `.' are ignored, not just `.' and `..'.
-* Default path for PK and GF fonts includes the mode name.
-* ls-R is in $TEXMFROOT instead of hardwired at compile time.
-* More debugging flags, and they can be set with client program options.
-* If MakeTeX{PK,TFM} fail, or aren't invoked, a file missfont.log is
-  written with the requisite commands, as in dvips.
-* More 328/329/330 fixes, maybe for the last time.
-* The override font paths (XDVIFONTS etc.) apply only to glyph (PK/GF)
-  searches, not TFM or VF.
-* -g is not the default when linking, to avoid unnecessarily large binaries
-  (due to static libraries) under Linux.
-* configure checks for a smart putenv.
-* Stat results are cached to speed up disk searches.
-
-1.8 (2 April 1994)
-* New target install-info, so the documentation can be installed without
-  the headers.
-* Existing but unreadable files are complained about, instead of just ignored.
-* A leading %% in a path element forbids searching the disk for that
-  element; only a db will be searched (if it exists).
-* The db is only used if it might be relevant to a given path element,
-  not searched first regardless.
-
-1.7 (1 March 1994)
-* Searches can use an externally-built ls-R ``database'', for speed.
-* `VPATH = .' lines removed from generated Makefile, for broken Sun make.
-* A path foo//tfm finds foo/tfm as well as foo/*/tfm.
-
-1.6 (3 February 1994)
-* Memory fault in copying long paths fixed.
-* More variables passed down from the top-level Makefile.
-* Mention SMART_PUTENV in the INSTALL file, and fix bug in xputenv.c
-  when one envvar is a proper prefix of another.
-* More attempts at eliminating magstephalf annoyances.
-* Directory name substitutions are done globally when creating paths.h.
-* Various changes for DOS.
-
-1.5 (24 January 1994)
-* Default paths changed.
-* Defining GCC_WCHAR lets GCC define wchar_t.
-* EXIT_FAILURE and EXIT_SUCCESS defined in all cases (if they're not already).
-* str[r]chr never redefined (I hope).
-
-1.4 (3 November 1993)
-* Check closest fallback font size.
-* All default paths (including dvips') in paths.h.in, not the Makefile.
-* Rearrange directory lists so that dirs in which a file is found
-  migrate to the top.
-* Update for Autoconf 1.7.
-
-1.3 (6 October 1993)
-* Fix free of non-malloced memory bug.
-* Fix uninitialized gf path bug.
-* mkdirchain invoked as an absolute filename.
-
-1.2 (27 September 1993)
-* Running MakeTeXPK is tried before the fallback resolutions.
-* The final bitmap name uses a variable spec, so DOS & OS/2 can get
-  dpi300/cmr10.pk.
-* Document TeX-specific features.
-* Dpi passed to MakeTeXPK via the envvar KPATHSEA_DPI instead of MAKETEX_DPI.
-
-1.1 (26 August 1993)
-* Installation fixes.
-
-1.0 (5 August 1993)
-* Routines to look up TeX font files, default path specifications, etc.
-* Sort-of pattern matching: /foo//bar matches subdirectories
-  /foo/a/bar, /foo/b/bar, /foo/a1/a2/bar, etc.
-* $var and ${var} expansion.
-* Support for MakeTeX... scripts.
-* Support for fallback resolutions and font.
-* Lazy evaluation of path elements.
-* Some runtime debugging support.
-
-0.2 (12 May 1993)
-
-First general release as a standalone library.
deleted file mode 100644
--- a/kpathsea/README
+++ /dev/null
@@ -1,27 +0,0 @@
-This directory contains the Kpathsea[rch] library, which implements
-generic path searching, configuration, and TeX-specific file searching.
-
-See `Makefile.in' for the version number.
-See `NEWS' for changes by release.
-See `INSTALL' for installation instructions.
-See `CONFIGURE' for details on running Autoconf-generated configure scripts.
-See `PROJECTS' for future improvements.
-
-Please report bugs to tex-k@cs.umb.edu. 
-(Email tex-k-request@cs.umb.edu with a line containing
-    subscribe you@preferred.email.address
-in the body of the message to join this mailing list.)
-
-Suggestions for improvements in either the library or the documentation,
-no matter how small, are welcome.
-
-Installing this package will create the library and header files in
-subdirectories of /usr/local (by default). Typically this library is not
-installed, however; only the programs that use it are.
-
-This is free software.  See the files COPYING* for copying permissions.
-The top-level headers are `pathsearch.h' for the generic path searching
-support, and `tex-{file,glyph}.h' for the TeX-specific support.
-
-kb@cs.umb.edu
-Member of the League for Programming Freedom -- write lpf@uunet.uu.net.
deleted file mode 100644
--- a/kpathsea/README.CONFIGURE
+++ /dev/null
@@ -1,179 +0,0 @@
-Contents:
-
-  Basic Installation
-  Compilers and Options
-  Using a Different Build Directory
-  Installation Names
-  Optional Features
-  Specifying the System Type
-  Sharing Defaults
-  Operation Controls
-
-
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source directory by typing `make clean'.  To also remove the files
-     that `configure' created (so you can compile the package for a
-     different kind of computer), type `make distclean'.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Using a Different Build Directory
-=================================
-
-   You can compile the package in a different directory from the one
-containing the source code.  Doing so allows you to compile it on more
-than one kind of computer at the same time.  To do this, you must use a
-version of `make' that supports the `VPATH' variable, such as GNU
-`make'.  `cd' to the directory where you want the object files and
-executables to go and run the `configure' script.  `configure'
-automatically checks for the source code in the directory that
-`configure' is in and in `..'.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Save the results of the tests in FILE instead of `config.cache'.
-     Set FILE to `/dev/null' to disable caching, for debugging
-     `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
deleted file mode 100644
--- a/kpathsea/absolute.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* absolute.c: Test if a filename is absolute or explicitly relative.
-
-Copyright (C) 1993, 94 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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/absolute.h>
-#include <kpathsea/c-pathch.h>
-
-#ifdef DOS
-#include <kpathsea/c-ctype.h> /* For ISALPHA */
-#endif /* DOS */
-
-
-/* Sorry this is such a system-dependent mess, but I can't see any way
-   to usefully generalize.  */
-
-boolean
-kpse_absolute_p P2C(const_string, filename,  boolean, relative_ok)
-{
-#ifdef VMS
-#include <string.h>
-  return strcspn (filename, "]>:") != strlen (filename);
-#else /* not VMS */
-  boolean absolute = IS_DIR_SEP (*filename)
-#ifdef DOS
-                      || ISALPHA (*filename) && filename[1] == ':'
-#endif /* DOS */
-		      ;
-  boolean explicit_relative
-    = relative_ok && (*filename == '.'
-       && (IS_DIR_SEP (filename[1])
-           || (filename[1] == '.' && IS_DIR_SEP (filename[2]))));
-
-  return absolute || explicit_relative;
-#endif /* not VMS */
-}
deleted file mode 100644
--- a/kpathsea/absolute.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* absolute.h: Declare absolute filename predicate.
-
-Copyright (C) 1993, 94 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_ABSOLUTE_H
-#define KPATHSEA_ABSOLUTE_H
-
-#include <kpathsea/types.h>
-#include <kpathsea/c-proto.h>
-
-
-/* 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);
-
-#endif /* not KPATHSEA_ABSOLUTE_H */
deleted file mode 100644
--- a/kpathsea/acconfig.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* acconfig.h -- used by autoheader when generating c-auto.h.in.  */
-
-/* Define if your putenv doesn't waste space when the same environment
-   variable is assigned more than once, with different (malloced)
-   values.  This is true only on NetBSD/FreeBSD, as far as I know. See
-   xputenv.c.  */
-#undef SMART_PUTENV
-
-/* Define if you are using GNU libc or otherwise have global variables
-   `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
-
-/* Define if you have SIGIO, F_SETOWN, and FASYNC.  */
-#undef HAVE_SIGIO
deleted file mode 100644
--- a/kpathsea/aclocal.m4
+++ /dev/null
@@ -1,349 +0,0 @@
-dnl Modifications for the latest version of Autoconf for kpathsea.
-dnl These changes have all been sent back to the Autoconf maintainer.
-
-dnl This is a subroutine of AC_OUTPUT.  It is called inside an unquoted
-dnl here document whose contents are going into config.status.
-dnl AC_OUTPUT_FILES(FILE...)
-dnl I've added ac_include support --karl@cs.umb.edu.
-undefine([AC_OUTPUT_FILES])
-define(AC_OUTPUT_FILES,
-[# Protect against being on the right side of a sed subst in config.status. 
-changequote(, )dnl
-sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; 
- s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
-changequote([, ])dnl
-dnl These here document variables are unquoted when configure runs
-dnl but quoted when config.status runs, so variables are expanded once.
-$ac_vpsub
-dnl Shell code in configure.in might set extrasub.
-$extrasub
-dnl Insert the sed substitutions of variables.
-undivert(AC_DIVERSION_SED)
-CEOF
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"$1"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-dnl Specifying an input file breaks the trap to clean up on interrupt,
-dnl but that's not a huge problem.
-  # Support "outfile[:infile]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust relative srcdir, etc. for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-changequote(, )dnl
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-changequote([, ])dnl
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/$ac_dir"
-    # A "../" for each directory in $ac_dir_suffix.
-changequote(, )dnl
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-changequote([, ])dnl
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-ifdef([AC_PROVIDE_AC_PROG_INSTALL],
-[  case "$ac_given_INSTALL" in
-changequote(, )dnl
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-changequote([, ])dnl
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-])dnl
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-  # Replace lines of the form ac_include foo with the contents of foo:
-  # first, from the ac_include lines construct a list of sed
-  # commands to remove them, and include the files; then run sed.
-  # Have to use sed because old (Ultrix, SunOS) awk does not support
-  # getline or system. (Anyway, configure scripts aren't supposed to use awk.)
-  # Use \@...@<cmd> form of sed address because the filename may contain /.
-  # Can't use only one -e and commands {dr foo} because foo has to be last.
-  # Use @e initially instead of -e because GNU echo has a -e option.
-  # USe `X' to mean a bunch of backslashes; this is for FreeBSD.
-  file_substs=`sed -n \
-changequote(,)dnl
-"/^ac_include/s%ac_include[ 	]*\(.*\)%@e 'X@^&@r \1' -e 'X@^&@d'%p" \
-changequote([,])dnl
-               $ac_given_srcdir/${ac_file}.in`
-  if test -n "$file_substs"; then
-    # Change @e back to -e and X@^ to \@^.
-    file_subst_cmd="sed `echo $file_substs \
-                         | sed -e 's/@e/-e/g' -e 's/X@^/\\\\\@^/g'`"
-  else
-    # If no substitutions and hence no sed commands, don't choke.
-    file_subst_cmd=cat
-  fi
-  # cd into the srcdir because the files being included more or less
-  # must be part of the distribution. I can't find any way to do
-  # variable substitution in the sed commands (so the user could have,
-  # e.g., $top_srcdir in their ac_include line).
-  (cd $ac_given_srcdir && eval $file_subst_cmd ${ac_file}.in) \
-  | sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-ifdef([AC_PROVIDE_AC_PROG_INSTALL], [s%@INSTALL@%$INSTALL%g
-])dnl
-" -f conftest.subs > $ac_file
-fi; done
-rm -f conftest.subs
-])
-
-
-dnl 
-dnl Only change from Autoconf 2.1 is to check IceConnectionNumber, not
-dnl ...Numbers.
-dnl
-dnl Find additional X libraries, magic flags, etc.
-undefine([AC_PATH_XTRA])
-AC_DEFUN(AC_PATH_XTRA,
-[AC_REQUIRE([AC_ISC_POSIX])dnl
-AC_REQUIRE([AC_PATH_X])dnl
-if test "$no_x" = yes; then 
-  # Not all programs may use this symbol, but it does not hurt to define it.
-  X_CFLAGS="$X_CFLAGS -DX_DISPLAY_MISSING"
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
-  fi
-
-  # It would be nice to have a more robust check for the -R ld option than
-  # just checking for Solaris.
-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n "$x_libraries"; then
-    X_LIBS="$X_LIBS -L$x_libraries"
-    if test "`(uname) 2>/dev/null`" = SunOS &&
-      uname -r | grep '^5' >/dev/null; then
-      X_LIBS="$X_LIBS -R$x_libraries"
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-
-  ac_save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # libraries we check for below, so use a different variable.
-  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-  AC_CHECK_LIB(ICE, IceConnectionNumber,
-    [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"])
-  LDFLAGS="$ac_save_LDFLAGS"
-
-  # Check for system-dependent libraries X programs must link with.
-
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-  else
-    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And karl@cs.umb.edu says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
-    if test $ac_cv_lib_dnet = no; then
-      AC_CHECK_LIB(dnet_stub, dnet_ntoa,
-        [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
-    fi
-
-    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # Not sure which flavor of 386 UNIX this is, but it seems harmless to
-    # check for it.
-    AC_CHECK_LIB(nsl, t_accept, [X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"])
-
-    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT 2.0.
-    # But -lsocket is broken on IRIX, according to simon@lia.di.epfl.ch.
-    if test "`(uname) 2>/dev/null`" != IRIX; then
-      AC_CHECK_LIB(socket, socket, [X_EXTRA_LIBS="$X_EXTRA_LIBS -lsocket"])
-    fi
-  fi
-fi
-AC_SUBST(X_CFLAGS)dnl
-AC_SUBST(X_PRE_LIBS)dnl
-AC_SUBST(X_LIBS)dnl
-AC_SUBST(X_EXTRA_LIBS)dnl
-])
-
-
-dnl 
-dnl Definition was buggy in Autoconf 2.1; parameters were incorrectly
-dnl passed to AC_MSG_ERROR and AC_TRY_LINK.
-dnl
-dnl Check if lex declares yytext as a char * by default, not a char[].
-undefine([AC_DECL_YYTEXT])
-AC_DEFUN(AC_DECL_YYTEXT,
-[AC_REQUIRE_CPP()dnl
-AC_REQUIRE([AC_PROG_LEX])dnl
-AC_CACHE_VAL(ac_cv_prog_lex_output_root,
-[# The minimal lex program is just a single line: %%.  But some broken lexes
-# (Solaris, I think it was) want two %% lines, so accommodate them.
-echo '%%
-%%' | $LEX
-if test -f lex.yy.c; then
-  ac_cv_prog_lex_output_root=lex.yy
-elif test -f lexyy.c; then
-  ac_cv_prog_lex_output_root=lexyy
-else
-  AC_MSG_ERROR([cannot find output from $LEX, giving up])
-fi])dnl
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_output_root
-AC_SUBST(LEX_OUTPUT_ROOT)dnl
-AC_MSG_CHECKING(for yytext declaration)
-AC_CACHE_VAL(ac_cv_prog_lex_yytext_pointer,
-[# POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
-ac_save_LIBS="$LIBS"
-LIBS="$LIBS $LEXLIB"
-AC_TRY_LINK(`cat $LEX_OUTPUT_ROOT.c`,, ac_cv_prog_lex_yytext_pointer=yes)
-LIBS="$ac_save_LIBS"
-rm -f "${LEX_OUTPUT_ROOT}.c"])dnl
-AC_MSG_RESULT($ac_cv_prog_lex_yytext_pointer)
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
-  AC_DEFINE(YYTEXT_POINTER)
-fi
-])
-
-dnl 
-dnl install-sh needs .. magic.
-dnl
-dnl AC_OUTPUT_SUBDIRS(DIRECTORY...)
-undefine([AC_OUTPUT_SUBDIRS])
-define(AC_OUTPUT_SUBDIRS,
-[
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  for ac_arg in $ac_configure_args; do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case "$ac_arg" in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  for ac_config_dir in $1; do
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    if test ! -d $srcdir/$ac_config_dir; then
-      continue
-    fi
-
-    echo configuring in $ac_config_dir
-
-    case "$srcdir" in
-    .) ;;
-    *)
-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
-      else
-        AC_MSG_ERROR(can not create `pwd`/$ac_config_dir)
-      fi
-      ;;
-    esac
-
-    ac_popdir=`pwd`
-    cd $ac_config_dir
-
-    case "$srcdir" in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
-    *) # Relative path.
-      ac_sub_srcdir=../$srcdir/$ac_config_dir ;;
-    esac
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure=$ac_sub_srcdir/configure
-    elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      AC_MSG_WARN(no configuration information is in $ac_config_dir)
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-
-      # Make the cache file name correct relative to the subdirectory.
-changequote(, )dnl
-      # A "../" for each directory in /$ac_config_dir.
-      ac_dots=`echo /$ac_config_dir|sed 's%/[^/]*%../%g'`
-changequote([, ])dnl
-      case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
-        ac_sub_cache_file="$ac_dots$cache_file" ;;
-      esac
-
-ifdef([AC_PROVIDE_AC_PROG_INSTALL],
-      [  case "$ac_given_INSTALL" in
-changequote(, )dnl
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-changequote([, ])dnl
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
-])dnl
-
-      echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir"
-      # The eval makes quoting arguments work.
-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
-        AC_MSG_ERROR($ac_sub_configure failed for $ac_config_dir)
-      fi
-    fi
-
-    cd $ac_popdir
-  done
-fi
-])
deleted file mode 100644
--- a/kpathsea/basename.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* basename.c: return the last element in a path.
-
-Copyright (C) 1992, 94, 95 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-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>
-
-#ifndef HAVE_BASENAME /* rest of file */
-
-#include <kpathsea/c-pathch.h>
-
-/* Return NAME with any leading path stripped off.  This returns a
-   pointer into NAME.  For example, `basename ("/foo/bar.baz")'
-   returns "bar.baz".  */
-
-const_string
-basename P1C(const_string, name)
-{
-  const_string base = NULL;
-  unsigned len = strlen (name);
-  
-  for (len = strlen (name); len > 0; len--)
-    {
-      if (IS_DIR_SEP (name[len - 1]))
-        {
-          base = name + len;
-          break;
-        }
-    }
-
-  if (!base)
-    base = name;
-  
-  return base;
-}
-
-#endif /* not HAVE_BASENAME */
deleted file mode 100644
--- a/kpathsea/c-auto.h.in
+++ /dev/null
@@ -1,71 +0,0 @@
-/* c-auto.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if the closedir function returns void instead of int.  */
-#undef CLOSEDIR_VOID
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if your putenv doesn't waste space when the same environment
-   variable is assigned more than once, with different (malloced)
-   values.  This is true only on NetBSD/FreeBSD, as far as I know. See
-   xputenv.c.  */
-#undef SMART_PUTENV
-
-/* Define if you are using GNU libc or otherwise have global variables
-   `program_invocation_name' and `program_invocation_short_name'.  */
-#undef HAVE_PROGRAM_INVOCATION_NAME
-
-/* Define if you have the basename function.  */
-#undef HAVE_BASENAME
-
-/* Define if you have the bcopy function.  */
-#undef HAVE_BCOPY
-
-/* Define if you have the memmove function.  */
-#undef HAVE_MEMMOVE
-
-/* Define if you have the putenv function.  */
-#undef HAVE_PUTENV
-
-/* Define if you have the <assert.h> header file.  */
-#undef HAVE_ASSERT_H
-
-/* Define if you have the <dirent.h> header file.  */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the <float.h> header file.  */
-#undef HAVE_FLOAT_H
-
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
-
-/* Define if you have the <memory.h> header file.  */
-#undef HAVE_MEMORY_H
-
-/* Define if you have the <ndir.h> header file.  */
-#undef HAVE_NDIR_H
-
-/* Define if you have the <pwd.h> header file.  */
-#undef HAVE_PWD_H
-
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <sys/dir.h> header file.  */
-#undef HAVE_SYS_DIR_H
-
-/* Define if you have the <sys/ndir.h> header file.  */
-#undef HAVE_SYS_NDIR_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
deleted file mode 100644
--- a/kpathsea/c-ctype.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* c-ctype.h: ASCII-safe versions of the <ctype.h> macros.
-
-Copyright (C) 1992 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_C_CTYPE_H
-#define KPATHSEA_C_CTYPE_H
-
-#include <ctype.h>
-
-/* Be sure we have `isascii'.  */
-#ifndef isascii
-#define isascii(c) 1
-#endif
-
-#define ISALNUM(c) (isascii (c) && isalnum(c))
-#define ISALPHA(c) (isascii (c) && isalpha(c))
-#define ISASCII isascii
-#define ISCNTRL(c) (isascii (c) && iscntrl(c))
-#define ISDIGIT(c) (isascii (c) && isdigit (c))
-#define ISGRAPH(c) (isascii (c) && isgraph(c))
-#define ISLOWER(c) (isascii (c) && islower(c))
-#define ISPRINT(c) (isascii (c) && isprint(c))
-#define ISPUNCT(c) (isascii (c) && ispunct(c))
-#define ISSPACE(c) (isascii (c) && isspace(c))
-#define ISUPPER(c) (isascii (c) && isupper(c))
-#define ISXDIGIT(c) (isascii (c) && isxdigit(c))
-#define TOASCII toascii
-#define TOLOWER(c) (ISUPPER (c) ? tolower (c) : (c))
-#define TOUPPER(c) (ISLOWER (c) ? toupper (c) : (c))
-
-/* This isn't part of the usual <ctype.h>, but it's useful sometimes.  */
-#ifndef isblank
-#define isblank(c) ((c) == ' ' || (c) == '\t')
-#endif
-
-
-/* Here's why this mess is necessary:
-
-From: meyering@cs.utexas.edu (Jim Meyering)
-Date: Wed, 25 Nov 1992 09:52:33 -0600
-Subject: ss-921123: using isascii with <ctype.h> macros
-
-  Yesterday some cursory regression testing found that GNU od
-  (in an upcoming release of textutils) generated incorrect output
-  when run on an SGI indigo because isprint ('\377') returned true.
-  Of course, '\377' is not a printing character;  the problem lay
-  in using isprint without first making sure its integer argument
-  corresponded to an ascii code.
-
-  MORAL: always guard uses of ctype macros with isascii if it's available.
-  An obvious alternative is to avoid <ctype.h> and define and use your
-  own versions of the ctype macros.
-
-  A pretty clean approach to using <ctype.h> and isascii was
-  suggested by David MacKenzie:
-
-  #ifndef isascii
-  #define isascii(c) 1
-  #endif
-
-  #define ISDIGIT(c) (isascii (c) && isdigit (c))
-  #define ISPRINT(c) (isascii (c) && isprint (c))
-  ...
-
-  then, use ISDIGIT, etc. instead of isdigit, etc.  */
-  
-#endif /* not KPATHSEA_C_CTYPE_H */
deleted file mode 100644
--- a/kpathsea/c-dir.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* c-dir.h: directory headers.
-
-Copyright (C) 1992, 93, 94 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_C_DIR_H
-#define KPATHSEA_C_DIR_H
-
-/* Use struct dirent instead of struct direct.  */
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#define NAMLEN(dirent) strlen ((dirent)->d_name)
-#else /* not DIRENT */
-#define dirent direct
-#define NAMLEN(dirent) ((dirent)->d_namlen)
-
-#ifdef HAVE_SYS_NDIR_H
-#include <sys/ndir.h>
-#endif
-
-#ifdef HAVE_SYS_DIR_H
-#include <sys/dir.h>
-#endif
-
-#ifdef HAVE_NDIR_H
-#include <ndir.h>
-#endif
-
-#endif /* not DIRENT */
-
-#endif /* not KPATHSEA_C_DIR_H */
deleted file mode 100644
--- a/kpathsea/c-errno.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* c-errno.h: <errno.h> and the errno variable.
-
-Copyright (C) 1992 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_C_ERRNO_H
-#define KPATHSEA_C_ERRNO_H
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#endif /* not KPATHSEA_C_ERRNO_H */
deleted file mode 100644
--- a/kpathsea/c-fopen.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* c-fopen.h: how to open files with fopen.
-
-Copyright (C) 1992, 94 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef C_FOPEN_H
-#define C_FOPEN_H
-
-/* How to open a text file:  */
-#ifndef FOPEN_A_MODE
-#define FOPEN_A_MODE "a"
-#endif
-
-#ifndef FOPEN_R_MODE
-#define FOPEN_R_MODE "r"
-#endif
-
-#ifndef FOPEN_W_MODE
-#define FOPEN_W_MODE "w"
-#endif
-
-/* How to open a binary file for reading:  */
-#ifndef FOPEN_RBIN_MODE
-#if defined (VMS) || defined (DOS) || defined (VMCMS)
-#define	FOPEN_RBIN_MODE	"rb"
-#else
-#define	FOPEN_RBIN_MODE	"r"
-#endif /* not (VM/CMS or DOS or VMS) */
-#endif /* not FOPEN_RBIN_MODE */
-
-/* How to open a binary file for writing:  */
-#ifndef FOPEN_WBIN_MODE
-#ifdef DOS
-#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 */
-#endif /* not FOPEN_WBIN_MODE */
-
-#endif /* not C_FOPEN_H */
deleted file mode 100644
--- a/kpathsea/c-limits.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* c-limits.h: include the system parameter file.
-
-Copyright (C) 1992, 93 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef C_LIMITS_H
-#define C_LIMITS_H
-
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#else
-#include <kpathsea/systypes.h>
-#include <sys/param.h>
-#endif
-
-/* Some systems may have the floating-point limits in the above.  */
-#if defined (HAVE_FLOAT_H) && !defined (FLT_MAX)
-#include <float.h>
-#endif
-
-#endif /* not C_LIMITS_H */
deleted file mode 100644
--- a/kpathsea/c-memstr.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* c-memstr.h: memcpy, strchr, etc.
-
-Copyright (C) 1992, 93, 94 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_C_MEMSTR_H
-#define KPATHSEA_C_MEMSTR_H
-
-/* <X11/Xfuncs.h> tries to declare bcopy etc., which can only conflict.  */
-#define _XFUNCS_H_
-
-/* Just to be complete, we make both the system V/ANSI and the BSD
-   versions of the string functions available.  */
-#if defined (STDC_HEADERS) || defined (HAVE_STRING_H)
-#define SYSV /* so <X11/Xos.h> knows not to include <strings.h> */
-#include <string.h>
-
-/* An ANSI string.h and pre-ANSI memory.h might conflict.  */
-#if !defined (STDC_HEADERS) && defined (HAVE_MEMORY_H)
-#include <memory.h>
-#endif /* not STDC_HEADERS and HAVE_MEMORY_H */
-
-/* Do not define these if we are not STDC_HEADERS, because in that
-   case X11/Xos.h defines `strchr' to be `index'. */
-#ifdef STDC_HEADERS
-/* Let's hope that if index/rindex are defined, they're defined to the
-   right thing.  */
-#ifndef index
-#define index strchr
-#endif
-#ifndef rindex
-#define rindex strrchr
-#endif
-#endif /* STDC_HEADERS */
-
-#ifndef HAVE_BCOPY
-#ifndef bcmp
-#define bcmp(s1, s2, len) memcmp ((s1), (s2), (len))
-#endif
-#ifndef bcopy
-#define bcopy(from, to, len) memcpy ((to), (from), (len))
-#endif
-#ifndef bzero
-#define bzero(s, len) memset ((s), 0, (len))
-#endif
-#endif /* not HAVE_BCOPY */
-
-#else /* not (STDC_HEADERS or HAVE_STRING_H) */
-
-#include <strings.h>
-
-#ifndef strchr
-#define strchr index
-#endif
-#ifndef strrchr
-#define strrchr rindex
-#endif
-
-#define memcmp(s1, s2, n) bcmp ((s1), (s2), (n))
-#define memcpy(to, from, len) bcopy ((from), (to), (len))
-
-extern char *strtok ();
-extern char *strstr ();
-
-#endif /* not (STDC_HEADERS or HAVE_STRING_H) */
-
-#endif /* not KPATHSEA_C_MEMSTR_H */
deleted file mode 100644
--- a/kpathsea/c-minmax.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* c-minmax.h: define INT_MIN, etc.  Assume a 32-bit machine if the
-   values aren't defined.
-
-Copyright (C) 1992, 93 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_C_MINMAX_H
-#define KPATHSEA_C_MINMAX_H
-
-#include <kpathsea/c-limits.h>
-
-/* Declared in <limits.h> on ANSI C systems.  If the system doesn't
-   define it, we use the minimum ANSI values -- except for `int'; we
-   assume 32-bit integers.  */
-
-#ifndef SCHAR_MIN
-#define SCHAR_MIN (-127)
-#endif
-#ifndef SCHAR_MAX
-#define SCHAR_MAX 128
-#endif
-#ifndef UCHAR_MAX
-#define UCHAR_MAX 255
-#endif
-
-#ifndef SHRT_MIN
-#define SHRT_MIN (-32767)
-#endif
-#ifndef SHRT_MAX
-#define SHRT_MAX 32767
-#endif
-#ifndef USHRT_MAX
-#define USHRT_MAX 65535
-#endif
-
-#ifndef INT_MIN
-#define INT_MIN (-2147483647)
-#endif
-#ifndef INT_MAX
-#define INT_MAX 2147483647
-#endif
-#ifndef UINT_MAX
-#define UINT_MAX 4294967295
-#endif
-
-#ifndef LONG_MIN
-#define LONG_MIN INT_MIN
-#endif
-#ifndef LONG_MAX
-#define LONG_MAX INT_MAX
-#endif
-#ifndef ULONG_MAX
-#define ULONG_MAX UINT_MAX
-#endif
-
-/* Declared in <float.h> on ANSI C systems.  */
-#ifndef DBL_MIN
-#define DBL_MIN 1e-37
-#endif
-#ifndef DBL_MAX
-#define DBL_MAX 1e+37
-#endif
-
-#ifndef FLT_MIN
-#define FLT_MIN 1e-37
-#endif
-#ifndef FLT_MAX
-#define FLT_MAX 1e+37
-#endif
-
-#endif /* not KPATHSEA_C_MINMAX_H */
deleted file mode 100644
--- a/kpathsea/c-namemx.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* c-namemx.h: define NAME_MAX, the maximum length of a single
-   component in a filename.  No such limit may exist, or may vary
-   depending on the filesystem.
-
-Copyright (C) 1992, 93 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_C_NAME_MX_H
-#define KPATHSEA_C_NAME_MX_H
-
-#include <kpathsea/c-limits.h>
-
-/* Most likely the system will truncate filenames if it is not POSIX,
-   and so we can use the BSD value here.  */
-#ifndef _POSIX_NAME_MAX
-#define _POSIX_NAME_MAX 255
-#endif
-
-#ifndef NAME_MAX
-#define NAME_MAX _POSIX_NAME_MAX
-#endif
-
-#endif /* not KPATHSEA_C_NAME_MX_H */
deleted file mode 100644
--- a/kpathsea/c-pathch.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* c-pathch.h: define the characters which separate components of
-   filenames and environment variable paths.
-
-Copyright (C) 1992, 93 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef C_PATHCH_H
-#define C_PATHCH_H
-
-/* What separates filename components?  */
-#ifndef DIR_SEP
-#ifdef VMS
-#define DIR_SEP ':'
-#define DIR_SEP_STRING ":"
-#else
-#ifdef DOS
-#define DIR_SEP '\\'
-#define DIR_SEP_STRING "\\"
-/* On DOS, it's good to allow both \ and / between directories.  */
-#define IS_DIR_SEP(ch) ((ch) == DIR_SEP || (ch) == '/')
-#else
-#ifdef VMCMS
-#define DIR_SEP ' '
-#define DIR_SEP_STRING " "
-#else
-#define DIR_SEP '/'
-#define DIR_SEP_STRING "/"
-#endif /* not VM/CMS */
-#endif /* not DOS */
-#endif /* not VMS */
-#endif /* not PATH_SEP */
-
-#ifndef IS_DIR_SEP
-#define IS_DIR_SEP(ch) ((ch) == DIR_SEP)
-#endif
-
-
-/* What separates elements in environment variable path lists?  */
-#ifndef ENV_SEP
-#ifdef VMS
-#define ENV_SEP ','
-#define ENV_SEP_STRING ","
-#else
-#ifdef DOS
-#define ENV_SEP ';'
-#define ENV_SEP_STRING ";"
-#else
-#ifdef VMCMS
-#define ENV_SEP ' '
-#define ENV_SEP_STRING " "
-#else
-#define ENV_SEP ':'
-#define ENV_SEP_STRING ":"
-#endif /* not VM/CMS */
-#endif /* not DOS */
-#endif /* not VMS */
-#endif /* not ENV_SEP */
-
-#ifndef IS_ENV_SEP
-#define IS_ENV_SEP(ch) ((ch) == ENV_SEP)
-#endif
-
-#endif /* not C_PATHCH_H */
deleted file mode 100644
--- a/kpathsea/c-pathmx.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* c-pathmx.h: define PATH_MAX, the maximum length of a filename.
-   Since no such limit may exist, it's preferable to dynamically grow
-   filenames as needed.
-
-Copyright (C) 1992, 93 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_C_PATH_MX_H
-#define KPATHSEA_C_PATH_MX_H
-
-#include <kpathsea/c-limits.h>
-
-/* Cheat and define this as a manifest constant no matter what, instead
-   of using pathconf.  I forget why we want to do this.  */
-
-#ifndef _POSIX_PATH_MAX
-#define _POSIX_PATH_MAX 255
-#endif
-
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX _POSIX_PATH_MAX
-#endif
-#endif /* not PATH_MAX */
-
-
-#endif /* not KPATHSEA_C_PATH_MAX_H */
deleted file mode 100644
--- a/kpathsea/c-proto.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* c-proto.h: macros to include or discard prototypes.
-
-Copyright (C) 1992, 93 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_C_PROTO_H
-#define KPATHSEA_C_PROTO_H
-
-/* 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. <ansidecl.h> from the GNU C library.  P1H(void)
-   also works for definitions of routines which take no args.  */
-
-#if __STDC__
-
-#define P1H(p1) (p1)
-#define P2H(p1,p2) (p1, p2)
-#define P3H(p1,p2,p3) (p1, p2, p3)
-#define P4H(p1,p2,p3,p4) (p1, p2, p3, p4)
-#define P5H(p1,p2,p3,p4,p5) (p1, p2, p3, p4, p5)
-#define P6H(p1,p2,p3,p4,p5,p6) (p1, p2, p3, p4, p5, p6)
-
-#define P1C(t1,n1)(t1 n1)
-#define P2C(t1,n1, t2,n2)(t1 n1, t2 n2)
-#define P3C(t1,n1, t2,n2, t3,n3)(t1 n1, t2 n2, t3 n3)
-#define P4C(t1,n1, t2,n2, t3,n3, t4,n4)(t1 n1, t2 n2, t3 n3, t4 n4)
-#define P5C(t1,n1, t2,n2, t3,n3, t4,n4, t5,n5) \
-  (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5)
-#define P6C(t1,n1, t2,n2, t3,n3, t4,n4, t5,n5, t6,n6) \
-  (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6)
-
-#else /* not __STDC__ */
-
-#define P1H(p1) ()
-#define P2H(p1, p2) ()
-#define P3H(p1, p2, p3) ()
-#define P4H(p1, p2, p3, p4) ()
-#define P5H(p1, p2, p3, p4, p5) ()
-#define P6H(p1, p2, p3, p4, p5, p6) ()
-
-#define P1C(t1,n1) (n1) t1 n1;
-#define P2C(t1,n1, t2,n2) (n1,n2) t1 n1; t2 n2;
-#define P3C(t1,n1, t2,n2, t3,n3) (n1,n2,n3) t1 n1; t2 n2; t3 n3;
-#define P4C(t1,n1, t2,n2, t3,n3, t4,n4) (n1,n2,n3,n4) \
-  t1 n1; t2 n2; t3 n3; t4 n4;
-#define P5C(t1,n1, t2,n2, t3,n3, t4,n4, t5,n5) (n1,n2,n3,n4,n5) \
-  t1 n1; t2 n2; t3 n3; t4 n4; t5 n5;
-#define P6C(t1,n1, t2,n2, t3,n3, t4,n4, t5,n5, t6,n6) (n1,n2,n3,n4,n5,n6) \
-  t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6;
-
-#endif /* not __STDC__ */
-
-#endif /* not KPATHSEA_C_PROTO_H */
deleted file mode 100644
--- a/kpathsea/c-stat.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* c-stat.h: declarations for using stat(2).
-
-Copyright (C) 1993 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_STAT_H
-#define KPATHSEA_STAT_H
-
-#include <kpathsea/systypes.h>
-#include <sys/stat.h>
-
-/* POSIX predicates for testing file attributes.  */
-
-#if !defined (S_ISBLK) && defined (S_IFBLK)
-#define	S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
-#endif
-#if !defined (S_ISCHR) && defined (S_IFCHR)
-#define	S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
-#endif
-#if !defined (S_ISDIR) && defined (S_IFDIR)
-#define	S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-#if !defined (S_ISREG) && defined (S_IFREG)
-#define	S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
-#if !defined (S_ISFIFO) && defined (S_IFIFO)
-#define	S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
-#endif
-#if !defined (S_ISLNK) && defined (S_IFLNK)
-#define	S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#endif
-#if !defined (S_ISSOCK) && defined (S_IFSOCK)
-#define	S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
-#endif
-#if !defined (S_ISMPB) && defined (S_IFMPB) /* V7 */
-#define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB)
-#define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC)
-#endif
-#if !defined (S_ISNWK) && defined (S_IFNWK) /* HP/UX */
-#define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
-#endif
-
-#endif /* not KPATHSEA_STAT_H */
deleted file mode 100644
--- a/kpathsea/c-std.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* c-std.h: the first header files.
-
-Copyright (C) 1992, 93, 94 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_C_STD_H
-#define KPATHSEA_C_STD_H
-
-/* 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.  */
-#include <math.h>
-#include <stdio.h>
-
-/* Be sure we have constants from <unistd.h>.  */
-#include <kpathsea/c-unistd.h>
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-/* Include <stdlib.h> before <stddef.h>, to help avoid NULL
-   redefinitions on some systems.  (We don't include <stddef.h>
-   ourselves any more, but FYI.)  */
-#else
-/* It's impossible to say for sure what the system will deign to put in
-   <stdlib.h>, but let's hope it's at least these.  */
-extern char *getenv ();
-
-#ifndef ALLOC_RETURN_TYPE
-#ifdef DOS
-#define ALLOC_RETURN_TYPE void
-#else
-#define ALLOC_RETURN_TYPE char
-#endif /* not DOS */
-#endif /* not ALLOC_RETURN_TYPE */
-
-#ifndef _MALLOC_INTERNAL
-/* Don't bother to declare these if we are compiling gmalloc.c itself.  */
-extern ALLOC_RETURN_TYPE *calloc (), *malloc (), *realloc ();
-#endif
-
-#endif /* not STDC_HEADERS */
-
-/* SunOS 4.1.1 gets STDC_HEADERS defined, but it doesn't provide
-   EXIT_FAILURE.  So far no system has defined one of EXIT_FAILURE and
-   EXIT_SUCCESS without the other.  */
-#ifndef EXIT_SUCCESS
-#ifdef VMS
-#define EXIT_SUCCESS 1
-#define EXIT_FAILURE 0
-#else
-#define EXIT_SUCCESS 0
-#define EXIT_FAILURE 1
-#endif
-#endif /* not EXIT_SUCCESS */
-
-/* strchr vs. index, memcpy vs. bcopy, etc.  */
-#include <kpathsea/c-memstr.h>
-
-/* Error numbers and errno declaration.  */
-#include <kpathsea/c-errno.h>
-
-/* Numeric minima and maxima.  */
-#include <kpathsea/c-minmax.h>
-
-/* Assertions are too useful to not make generally available.  */
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#else
-#define assert(expr) /* as nothing */
-#endif
-
-#ifdef VMS
-#include <unixlib.h>
-#include <unixio.h>
-#else
-/* `popen' and `pclose' are part of POSIX.2, not POSIX.1.  So
-   STDC_HEADERS isn't enough.  */
-extern FILE *popen ();
-extern int pclose ();
-#endif
-
-#ifndef hypot
-/* hypot appears not to have made it into POSIX.2, even.  */
-extern double hypot ();
-#endif
-
-#endif /* not KPATHSEA_C_STD_H */
deleted file mode 100644
--- a/kpathsea/c-unistd.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* c-unistd.h: ensure we have constants from <unistd.h>.  Included from
-   c-std.h.
-
-Copyright (C) 1992, 93 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_C_UNISTD_H
-#define KPATHSEA_C_UNISTD_H
-
-/* <unistd.h> is allowed to depend on <sys/types.h>.  */
-#include <kpathsea/systypes.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <kpathsea/c-std.h>
-
-/* For fseek.  */
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#define SEEK_CUR 1
-#define SEEK_END 2
-#endif /* not SEEK_SET */
-
-/* For access.  */
-#ifndef F_OK
-#define F_OK 0
-#define X_OK 1
-#define W_OK 2
-#define R_OK 4
-#endif /* not F_OK */
-
-#ifndef STDIN_FILENO
-#define STDIN_FILENO    0
-#define STDOUT_FILENO   1
-#define STDERR_FILENO   2
-#endif /* not STDIN_FILENO */
-
-#endif /* not KPATHSEA_C_UNISTD_H */
deleted file mode 100644
--- a/kpathsea/c-vararg.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* c-vararg.h: Top layer for stdarg and varargs.
-
-Copyright (C) 1993 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef C_VARARG_H
-#define C_VARARG_H
-
-/* See `kpathsea/init-path.c' for an example of use.  The idea is to say
-   PVAR1(type1, parameter1, ap) in the function header, and then end
-   the function with two }}'s.  We do this to avoid having to specify
-   the argument list (with types) twice -- once in the function header,
-   and once in a (hypothetical) VA_START1.  */
-
-#if __STDC__
-#include <stdarg.h>
-
-#define PVAR1H(p1) (p1, ...)
-#define PVAR2H(p1, p2) (p1, p2, ...)
-#define PVAR3H(p1, p2, p3) (p1, p2, p3, ...)
-
-#define PVAR1C(t1, n1,  ap) \
-  (t1 n1, ...) { va_list ap; va_start (ap, n1);
-#define PVAR2C(t1, n1,  t2, n2,  ap) \
-  (t1 n1, t2 n2, ...) { va_list ap; va_start (ap, n2);
-#define PVAR3C(t1, n1,  t2, n2,  t3, n3,  ap) \
-  (t1 n1, t2 n2, t3 n3, ...) { va_list ap; va_start (ap, n3);
-
-#else /* not __STDC__ */
-#include <varargs.h>
-
-#define PVAR1H(p1) ()
-#define PVAR2H(p1, p2) ()
-#define PVAR3H(p1, p2, p3) ()
-
-#define PVAR1C(t1, n1,  ap) \
-  (va_alist) va_dcl { t1 n1; va_list ap; va_start (ap); \
-                      n1 = va_arg (ap, t1);
-#define PVAR2C(t1, n1,  t2, n2,  ap) \
-  (va_alist) va_dcl { t1 n1; t2 n2; va_list ap; va_start (ap); \
-                      n1 = va_arg (ap, t1); n2 = va_arg (ap, t2);
-#define PVAR3C(t1, n1,  t2, n2,  t3, n3,  ap) \
-  (va_alist) va_dcl { t1 n1; t2 n2; t3 n3; va_list ap; va_start (ap); \
-                      n1 = va_arg (ap, t1); n2 = va_arg (ap, t2); \
-                      n3 = va_arg (ap, t3);
-#endif /* not __STDC__ */
-
-#endif /* not C_VARARG_H */
deleted file mode 100644
--- a/kpathsea/cnf.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* cnf.c: read config files.
-
-Copyright (C) 1994 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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-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/tex-file.h>
-#include <kpathsea/variable.h>
-
-
-/* By using our own hash table, instead of the environment, we
-   complicate variable expansion (because now we have to look in two
-   places), but we don't bang so heavily on the system.  DOS and System
-   V have very limited environment space.  Also, this way
-   `kpse_init_format' can distinguish between values originating from
-   the cnf file and ones from environment variables, which can be useful
-   for users trying to figure out what's going on.  */
-#ifndef CNF_HASH_SIZE
-#define CNF_HASH_SIZE 751
-#endif
-static hash_table_type cnf_hash;
-
-/* Do a single line in a cnf file: if it's blank or a comment, skip it.
-   Otherwise, parse <variable>[.<program>] [=] <value>.  Do
-   this even if the <variable> is already set in the environment, since
-   the envvalue might contain a trailing :, in which case we'll be
-   looking for the cnf value.  */
-
-static void
-do_line P1C(string, line)
-{
-  unsigned len;
-  string start;
-  string value, var;
-  
-  /* Skip leading whitespace.  */
-  while (ISSPACE (*line))
-    line++;
-  
-  /* More to do only if we have non-comment material left.  */
-  if (*line == 0 || *line == '%' || *line == '#')
-    return;
-  
-  /* The variable name is everything up to the next space or = or `.'.  */
-  start = line;
-  while (!ISSPACE (*line) && *line != '=' && *line != '.')
-    line++;
-
-  /* `line' is now one character past the end of the variable name.  */
-  len = line - start;
-  var = xmalloc (len + 1);
-  strncpy (var, start, len);
-  var[len] = 0;
-  
-  /* If the variable is qualified with a program name, we might be
-     ignoring it.  */
-  while (ISSPACE (*line))
-    line++;
-  if (*line == '.') 
-    { /* Skip spaces, then everything up to the next space or =.  */
-      string prog;
-      extern string program_invocation_short_name; /* must be set by main */
-      
-      line++;
-      while (ISSPACE (*line))
-        line++;
-      start = line;
-      while (!ISSPACE (*line) && *line != '=')
-        line++;
-      
-      /* 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);
-      strncpy (prog, start, len);
-      prog[len] = 0;
-      
-      /* If we are running `prog', fine; otherwise, we're done.  */
-      assert (program_invocation_short_name);
-      if (!STREQ (prog, program_invocation_short_name))
-        {
-          free (var);
-          free (prog);
-          return;
-        }
-    }
-
-  /* Skip whitespace, an optional =, more whitespace.  */
-  while (ISSPACE (*line))
-    line++;
-  if (*line == '=')
-    {
-      line++;
-      while (ISSPACE (*line))
-        line++;
-    }
-  
-  /* Everything up to the next whitespace or eol is the value. */
-  start = line;
-  while (*line && !ISSPACE (*line))
-    line++;
-  len = line - start;
-  
-  value = xmalloc (len + 1);
-  strncpy (value, start, len);
-  value[len] = 0;
-  
-  /* For cnf files, multiple values for a single variable make no sense,
-     but instead of removing them, we'll just take the most recent in
-     `kpse_cnf_get'.  Thus, we are assuming here that `hash_insert' puts
-     the most recent entries in first.  */
-  hash_insert (&cnf_hash, var, value);
-  
-  /* We could check that anything remaining is preceded by a comment
-     character, but let's not bother.  */
-}
-
-/* Read all the configuration files in the path.  */
-
-static void
-read_files P1H(void)
-{
-  string *cnf_files;
-  const_string cnf_path = kpse_init_format (kpse_cnf_format);
-
-  cnf_hash = hash_create (CNF_HASH_SIZE);
-
-  for (cnf_files = kpse_all_path_search (cnf_path,
-                                    kpse_format_info[kpse_cnf_format].program);
-       cnf_files && *cnf_files; cnf_files++)
-    {
-      string line;
-      string cnf_filename = *cnf_files;
-      FILE *cnf_file = xfopen (cnf_filename, FOPEN_R_MODE);
-      
-      while ((line = read_line (cnf_file)) != NULL)
-        {
-          do_line (line);
-          free (line);
-        }
-
-      xfclose (cnf_file, cnf_filename);
-    }
-  
-  /* After (*after*) reading the cnf files, expand the db directory, for
-     use by `elt_in_db' in pathsearch.c.  The default value of $TEXMF
-     has to be able to get TEXMF from a cnf file, therefore in the
-     `kpse_all_path_search' call above, we do not have DB_DIR.  */
-  kpse_db_dir = kpse_var_expand (KPSE_DB_DIR);
-  if (! *kpse_db_dir)
-    kpse_db_dir = kpse_var_expand (DEFAULT_TEXMF);
-}
-
-/* Read the cnf files on the first call.  Return the first value in the
-   returned list -- this will be from the last-read cnf file.  */
-
-string
-kpse_cnf_get P1C(const_string, name)
-{
-  string *ret_list;
-  
-  if (cnf_hash.size == 0)
-    read_files ();
-  
-  ret_list = hash_lookup (cnf_hash, name);
-  
-  return ret_list ? *ret_list : NULL;
-}
deleted file mode 100644
--- a/kpathsea/cnf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* cnf.h: runtime config files.
-
-Copyright (C) 1994 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_CNF_H
-#define KPATHSEA_CNF_H
-
-#include <kpathsea/c-proto.h>
-#include <kpathsea/types.h>
-
-/* Return the value in the last-read cnf file for VAR, or NULL if none.
-   On the first call, also read all the cnf files in the path (and
-   initialize the path) named the `program' member of the
-   `kpse_cnf_format' element of `kpse_format_info'.  */
-extern string kpse_cnf_get P1H(const_string var);
-
-#endif /* not KPATHSEA_CNF_H */
deleted file mode 100644
--- a/kpathsea/common.ac
+++ /dev/null
@@ -1,98 +0,0 @@
-dnl Common Autoconf sinclude file for kpathsea-using programs.  (Have to
-dnl use the m4 `sinclude' builtin instead of `include', since Autoconf
-dnl disables `include'.)
-
-dnl Write output here, instead of putting a zillion -D's on the command line.
-AC_CONFIG_HEADER(c-auto.h)
-
-AC_PROG_MAKE_SET
-
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-AC_ISC_POSIX
-
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_FUNC_CLOSEDIR_VOID
-AC_CHECK_HEADERS(assert.h float.h limits.h memory.h pwd.h stdlib.h \
-                 string.h unistd.h)
-
-AC_CHECK_FUNCS(basename bcopy memmove putenv)
-
-AC_C_CONST
-
-
-# This is a GNU libc invention.
-AC_MSG_CHECKING(whether program_invocation_name is predefined)
-AC_CACHE_VAL(kb_cv_var_program_inv_name,
-[AC_TRY_LINK(, [main() { program_invocation_name = "love"; }],
-  kb_cv_var_program_inv_name=yes, kb_cv_var_program_inv_name=no)])dnl
-AC_MSG_RESULT($kb_cv_var_program_inv_name)
-if test $kb_cv_var_program_inv_name = yes; then
-  AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME)
-fi
-
-
-# Some BSD putenv's, e.g., FreeBSD, do malloc/free's on the environment.
-# This test program is due to Mike Hibler <mike@cs.utah.edu>.
-# We don't actually need to run this if we don't have putenv, but it
-# doesn't hurt.
-AC_MSG_CHECKING(whether putenv uses malloc)
-AC_CACHE_VAL(kb_cv_func_putenv_malloc,
-[AC_TRY_RUN([
-#define VAR	"YOW_VAR"
-#define STRING1 "GabbaGabbaHey"
-#define STRING2 "Yow!!"		/* should be shorter than STRING1 */
-extern char *getenv (); /* in case char* and int don't mix gracefully */
-main ()
-{
-  char *str1, *rstr1, *str2, *rstr2;
-  str1 = getenv (VAR);
-  if (str1)
-    exit (1);
-  str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1);
-  if (str1 == 0)
-    exit (2);
-  strcpy (str1, VAR);
-  strcat (str1, "=");
-  strcat (str1, STRING1);
-  if (putenv (str1) < 0)
-    exit (3);
-  rstr1 = getenv (VAR);
-  if (rstr1 == 0)
-    exit (4);
-  rstr1 -= strlen (VAR) + 1;
-  if (strncmp (rstr1, VAR, strlen (VAR)))
-    exit (5);
-  str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1);
-  if (str2 == 0 || str1 == str2)
-    exit (6);
-  strcpy (str2, VAR);
-  strcat (str2, "=");
-  strcat (str2, STRING2);
-  if (putenv (str2) < 0)
-    exit (7);
-  rstr2 = getenv (VAR);
-  if (rstr2 == 0)
-    exit (8);
-  rstr2 -= strlen (VAR) + 1;
-#if 0
-  printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2);
-  /*
-   * If string from first call was reused for the second call,
-   * you had better not do a free on the first string!
-   */
-  if (rstr1 == rstr2)
-          printf ("#define SMART_PUTENV\n");
-  else
-          printf ("#undef SMART_PUTENV\n");
-#endif
-  exit (rstr1 == rstr2 ? 0 : 1);
-}], kb_cv_func_putenv_malloc=yes, kb_cv_func_putenv_malloc=no,
-    kb_cv_func_putenv_malloc=no)])dnl
-AC_MSG_RESULT($kb_cv_func_putenv_malloc)
-if test $kb_cv_func_putenv_malloc = yes; then
-  AC_DEFINE(SMART_PUTENV)
-fi
deleted file mode 100644
--- a/kpathsea/concat.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* concat.c: dynamic string concatenation.
-
-Copyright (C) 1992, 93 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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>
-
-
-/* Return the concatenation of S1 and S2.  See `concatn.c' for a
-   `concatn', which takes a variable number of arguments.  */
-
-string
-concat P2C(const_string, s1,  const_string, s2)
-{
-  string answer = (string) xmalloc (strlen (s1) + strlen (s2) + 1);
-  strcpy (answer, s1);
-  strcat (answer, s2);
-
-  return answer;
-}
deleted file mode 100644
--- a/kpathsea/concat3.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* concat3.c: concatenate three strings.
-
-Copyright (C) 1992 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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>
-
-
-string
-concat3 P3C(const_string, s1,  const_string, s2,  const_string, s3)
-{
-  string answer
-    = (string) xmalloc (strlen (s1) + strlen (s2) + strlen (s3) + 1);
-  strcpy (answer, s1);
-  strcat (answer, s2);
-  strcat (answer, s3);
-
-  return answer;
-}
deleted file mode 100644
--- a/kpathsea/concatn.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* concatn.c: Concatenate an arbitrary number of strings.
-
-Copyright (C) 1993 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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/concatn.h>
-
-
-/* OK, it would be epsilon more efficient to compute the total length
-   and then do the copying ourselves, but I doubt it matters in reality.  */
-
-string
-concatn PVAR1C(const_string, str1,  ap)
-{
-  string arg;
-  string ret;
-
-  if (!str1)
-    return NULL;
-  
-  ret = xstrdup (str1);
-  
-  while ((arg = va_arg (ap, string)) != NULL)
-    {
-      ret = concat (ret, arg);
-    }
-  va_end (ap);
-  
-  return ret;
-}}
-
-#ifdef TEST
-int
-main ()
-{
-  printf ("null = \"%s\"\n", concatn (NULL));
-  printf ("\"a\" = \"%s\"\n", concatn ("a", NULL));
-  printf ("\"ab\" = \"%s\"\n", concatn ("a", "b", NULL));
-  printf ("\"abc\" = \"%s\"\n", concatn ("a", "b", "c", NULL));
-  printf ("\"abcd\" = \"%s\"\n", concatn ("ab", "cd", NULL));
-  printf ("\"abcde\" = \"%s\"\n", concatn ("ab", "c", "de", NULL));
-  printf ("\"abcdef\" = \"%s\"\n", concatn ("", "a", "", "bcd", "ef", NULL));
-  return 0;
-}
-
-#endif /* TEST */
-
-
-/*
-Local variables:
-standalone-compile-command: "gcc -posix -g -I. -I.. -DTEST concatn.c kpathsea.a"
-End:
-*/
deleted file mode 100644
--- a/kpathsea/concatn.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* concatn.h: concatenate a variable number of strings.
-   This is a separate include file only because I don't see the point of
-   having every source file include <c-vararg.h>.  The declarations for
-   the other concat routines are in lib.h.
-
-Copyright (C) 1993 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_CONCATN_H
-#define KPATHSEA_CONCATN_H
-
-#include <kpathsea/c-proto.h>
-#include <kpathsea/c-vararg.h>
-#include <kpathsea/types.h>
-
-/* Concatenate a null-terminated list of strings and return the result
-   in malloc-allocated memory.  */
-extern string concatn PVAR1H(const_string str1);
-
-#endif /* not KPATHSEA_CONCATN_H */
-
-
deleted file mode 100755
--- a/kpathsea/config.guess
+++ /dev/null
@@ -1,686 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    alpha:OSF1:*:*)
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-cbm-sysv4
-	exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
-    amiga:OpenBSD:*:*)
-      echo m68k-cbm-openbsd${UNAME_RELEASE}
-      exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:NetBSD:*:*)
-	echo m68k-atari-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-atari-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3*:NetBSD:*:*)
-	echo m68k-sun-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-sun-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:NetBSD:*:*)
-	echo m68k-apple-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-apple-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	sed 's/^	//' << EOF >dummy.c
-	int main (argc, argv) int argc; char **argv; {
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	${CC-cc} dummy.c -o dummy \
-	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	fi
-        else echo i586-dg-dgux${UNAME_RELEASE}
-        fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^		//' << EOF >dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-		rm -f dummy.c dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:4)
-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=4.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
-	    9000/8?? )            HP_ARCH=hppa1.0 ;;
-	esac
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i?86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
-    F300:UNIX_System_V:*:*)
-        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    F301:UNIX_System_V:*:*)
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-       exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-	echo m68k-hp-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp3[0-9][05]:OpenBSD:*:*)
-	echo m68k-hp-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo i386-pc-cygwin32
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin32
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us.
-	ld_help_string=`ld --help 2>&1`
-	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
-	  echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
-	  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
-	  echo "powerpc-unknown-linux-gnu" ; exit 0
-	elif test "${UNAME_MACHINE}" = "alpha" ; then
-	  echo alpha-unknown-linux-gnu ; exit 0
-	elif test "${UNAME_MACHINE}" = "sparc" ; then
-	  echo sparc-unknown-linux-gnu ; exit 0
-	else
-	  # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
-	  # useful --help.  Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	  test ! -d /usr/lib/ldscripts/. \
-	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-	  # Determine whether the default compiler is a.out or elf
-	  cat >dummy.c <<EOF
-main(argc, argv)
-int argc;
-char *argv[];
-{
-#ifdef __ELF__
-  printf ("%s-pc-linux-gnu\n", argv[1]);
-#else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
-	fi ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-	fi
-	exit 0 ;;
-    i?86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    m68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i?86:LynxOS:2.*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-cat >dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-#if !defined (ultrix)
-  printf ("vax-dec-bsd\n"); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-#echo '(Unable to guess system type)' 1>&2
-
-exit 1
deleted file mode 100644
--- a/kpathsea/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* config.h: master configuration file, included first by all compilable
-   source files (not headers).
-
-Copyright (C) 1993 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_CONFIG_H
-#define KPATHSEA_CONFIG_H
-
-/* 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.h.in).  We use <...> instead of "..." so that the current
-   cpp directory (i.e., kpathsea/) won't be searched. */
-#include <c-auto.h>
-
-/* ``Standard'' system headers.  */
-#include <kpathsea/c-std.h>
-
-/* Macros to discard or keep prototypes.  */
-#include <kpathsea/c-proto.h>
-
-/* Our own definitions of supposedly always-useful stuff.  */
-#include <kpathsea/lib.h>
-#include <kpathsea/types.h>
-
-/* Support extra runtime tracing.  */
-#include <kpathsea/debug.h>
-
-/* If you want to find subdirectories in a directory with non-Unix
-   semantics (specifically, if a directory with no subdirectories does
-   not have exactly two links), define this.  */
-#if !defined (DOS) && !defined (VMS) && !defined (VMCMS)
-#define UNIX_ST_NLINK
-#endif /* not DOS and not VMS and not VMCMS */
-
-#endif /* not KPATHSEA_CONFIG_H */
deleted file mode 100755
--- a/kpathsea/config.sub
+++ /dev/null
@@ -1,927 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-if [ x$1 = x ]
-then
-	echo Configuration name missing. 1>&2
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-	echo "or     $0 ALIAS" 1>&2
-	echo where ALIAS is a recognized configuration type. 1>&2
-	exit 1
-fi
-
-# First pass through any local machine types.
-case $1 in
-	*local*)
-		echo $1
-		exit 0
-		;;
-	*)
-	;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  linux-gnu*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
-		os=
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
-		| arme[lb] | pyramid \
-		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-		| alpha | we32k | ns16k | clipper | i370 | sh \
-		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
-		| pdp11 | mips64el | mips64orion | mips64orionel \
-		| sparc | sparclet | sparclite | sparc64)
-		basic_machine=$basic_machine-unknown
-		;;
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i[3456]86)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
-	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
-	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-cbm
-		;;
-	amigados)
-		basic_machine=m68k-cbm
-		os=-amigados
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-cbm
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[3456]86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i[3456]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i[3456]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i[3456]86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5)
-		basic_machine=i586-intel
-		;;
-	pentiumpro | p6)
-		basic_machine=i686-intel
-		;;
-	pentium-* | p5-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	k5)
-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
-		basic_machine=i586-amd
-		;;
-	nexen)
-		# We don't have specific support for Nexgen yet, so just call it a Pentium
-		basic_machine=i586-nexgen
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=rs6000-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-       vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	mips)
-		basic_machine=mips-mips
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sparc)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-unixware* | svr4*)
-		os=-sysv4
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -linux-gnu* | -uxpv*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigados
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f301-fujitsu)
-		os=-uxpv
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
deleted file mode 100644
--- a/kpathsea/configure.in
+++ /dev/null
@@ -1,55 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(pathsearch.c)
-
-AC_CANONICAL_HOST
-if test -z "$host"; then
-  host=unknown
-fi
-target_host_type=$host
-canonical_host_type=$host
-
-### Enable creation of shared libraries.  Currently only works with
-### gcc on some systems.
-
-AC_ARG_ENABLE(shared,
-  [  --shared                create shared libraries (not all systems)],
-  [if test $enableval = no; then SHARED_LIBS=false; else SHARED_LIBS=true; fi],
-  SHARED_LIBS=false)
-AC_SUBST(SHARED_LIBS)
-
-CPICFLAG=-fPIC
-SHLEXT=so
-SH_LD="$CC"
-SH_LDFLAGS=-shared
-case "$canonical_host_type" in
-  *-*-386bsd* | *-*-openbsd* | *-*-netbsd* | *-*-freebsd*)
-    SH_LD=ld
-    SH_LDFLAGS=-Bshareable
-  ;;
-  alpha-dec-osf*)
-    CPICFLAG=
-    SH_LDFLAGS="-shared -Xlinker -expect_unresolved -Xlinker '*'"
-  ;;
-  rs6000-ibm-aix* | powerpc-ibm-aix*)
-    CPICFLAG=
-  ;;
-  hppa*-hp-hpux*)
-    SHLEXT=sl
-    SH_LDFLAGS="-shared -fPIC"
-  ;;
-  *-sgi-*)
-    CPICFLAG=
-  ;;
-esac
-AC_MSG_RESULT([defining CPICFLAG to be $CPICFLAG])
-AC_MSG_RESULT([defining SHLEXT to be $SHLEXT])
-AC_MSG_RESULT([defining SH_LD to be $SH_LD])
-AC_MSG_RESULT([defining SH_LDFLAGS to be $SH_LDFLAGS])
-AC_SUBST(CPICFLAG)
-AC_SUBST(SHLEXT)
-AC_SUBST(SH_LD)
-AC_SUBST(SH_LDFLAGS)
-
-sinclude(common.ac)
-
-AC_OUTPUT(Makefile)
deleted file mode 100644
--- a/kpathsea/copying.texi
+++ /dev/null
@@ -1,390 +0,0 @@
-@node Copying
-@appendix GNU GENERAL PUBLIC LICENSE
-@center Version 2, June 1991
-
-@display
-Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
-
-@unnumberedsec Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software---to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-@iftex
-@unnumberedsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end iftex
-@ifinfo
-@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end ifinfo
-
-@enumerate
-@item
-This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The ``Program'', below,
-refers to any such program or work, and a ``work based on the Program''
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term ``modification''.)  Each licensee is addressed as ``you''.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-@item
-You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-@item
-You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-@enumerate a
-@item
-You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
-
-@item
-You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
-
-@item
-If the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License.  (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
-@end enumerate
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-@item
-You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-@enumerate a
-@item
-Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
-
-@item
-Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-
-@item
-Accompany it with the information you received as to the offer
-to distribute corresponding source code.  (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsection b above.)
-@end enumerate
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-@item
-You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-@item
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-@item
-Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-@item
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-@item
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-@item
-The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and ``any
-later version'', you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-@item
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-@iftex
-@heading NO WARRANTY
-@end iftex
-@ifinfo
-@center NO WARRANTY
-@end ifinfo
-
-@item
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-@item
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-@end enumerate
-
-@iftex
-@heading END OF TERMS AND CONDITIONS
-@end iftex
-@ifinfo
-@center END OF TERMS AND CONDITIONS
-@end ifinfo
-
-@page
-@unnumberedsec Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the ``copyright'' line and a pointer to where the full notice is found.
-
-@smallexample
-@var{one line to give the program's name and a brief idea of what it does.}
-Copyright (C) 19@var{yy}  @var{name of author}
-
-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
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-@end smallexample
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-@smallexample
-Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author}
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-This is free software, and you are welcome to redistribute it
-under certain conditions; type `show c' for details.
-@end smallexample
-
-The hypothetical commands @samp{show w} and @samp{show c} should show
-the appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than @samp{show w} and
-@samp{show c}; they could even be mouse-clicks or menu items---whatever
-suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a ``copyright disclaimer'' for the program, if
-necessary.  Here is a sample; alter the names:
-
-@example
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-`Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-@var{signature of Ty Coon}, 1 April 1989
-Ty Coon, President of Vice
-@end example
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
deleted file mode 100644
--- a/kpathsea/db.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* db.c: an external database to avoid filesystem lookups.
-
-Copyright (C) 1994 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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-fopen.h>
-#include <kpathsea/c-pathch.h>
-#include <kpathsea/db.h>
-#include <kpathsea/hash.h>
-#include <kpathsea/line.h>
-#include <kpathsea/readable.h>
-#include <kpathsea/str-list.h>
-#include <kpathsea/variable.h>
-
-/* See comments in `read_files' in cnf.c.  */
-string kpse_db_dir = NULL;
-
-/* The hash table for ls-R.  */
-static hash_table_type db;
-
-
-/* If no DB_FILE, return false (maybe they aren't using this feature).
-   Otherwise, build the db and return true.  */
-
-static boolean
-db_build P1C(hash_table_type *, table)
-{
-  string line;
-  unsigned dir_count = 0, file_count = 0; /* for debugging */
-  string cur_dir = NULL; /* First thing in ls-R might be a filename.  */
-  string db_filename = concat3 (kpse_db_dir, DIR_SEP_STRING, KPSE_DB_NAME);
-  FILE *db_file = fopen (db_filename, FOPEN_R_MODE);
-  
-  if (db_file)
-    {
-      while ((line = read_line (db_file)) != NULL)
-        {
-          unsigned len = strlen (line);
-          /* A line like `/foo:' = new dir foo */
-          if (IS_DIR_SEP (line[0]) && line[len - 1] == ':')
-            {
-              cur_dir = xstrdup (line);
-              cur_dir[len - 1] = DIR_SEP;
-              dir_count++;
-            }
-          else if (line[0] != 0 && cur_dir) /* other nonblank line */
-            { /* New hash table entry with a key of `line' and a data of
-                 `cur_dir'.  Already-existing identical keys are ok, since
-                 a file named `foo' can be in more than one directory.
-                 Since it doesn't hurt, share the directory name string
-                 among all the files in the directory. */
-              hash_insert (table, xstrdup (line), cur_dir);
-              file_count++;
-            }
-          /* else ignore blank lines */
-
-          free (line);
-        }
-      xfclose (db_file, db_filename);
-      
-      if (file_count == 0)
-        {
-          fprintf (stderr, "kpathsea: no usable entries in %s; see the\n", 
-                   db_filename);
-          fprintf (stderr, "kpathsea: manual for how to generate ls-R.\n");
-        }
-
-#ifdef DEBUG
-      if (KPSE_DEBUG_P (KPSE_DEBUG_HASH))
-        {
-          /* Don't make this a debugging bit, since the output is so
-             voluminous, and being able to specify -1 is too useful.
-             Instead, let people who want it run the program under
-             a debugger and change the variable that way.  */
-          boolean print_hash_table = false;
-
-          DEBUGF3 ("%u entries (in %d directories) read from %s.\n",
-                   file_count, dir_count, db_filename);
-          if (print_hash_table)
-            {
-              DEBUGF ("Hash table built from ls-R:");
-              hash_print (*table);
-            }
-          fflush (stderr);
-        }
-#endif
-    }
-
-  free (db_filename);
-  return db_file != NULL;
-}
-
-
-/* Insert FNAME into the hash table.  This is for files that get built
-   during a run.  We wouldn't want to reread all of ls-R, even if it got
-   rebuilt.  */
-
-void
-db_insert P1C(const_string, passed_fname)
-{
-  /* We should always have called `kpse_db_search' before this.  */
-  assert (db.size > 0);
-  
-  /* But we might not have found ls-R; in that case, we'll have cleared
-     the buckets (but left the size).  */
-  if (db.buckets)
-    {
-      const_string dir_part;
-      string fname = xstrdup (passed_fname);
-      string baseptr = (string) basename (fname);
-      const_string file_part = xstrdup (baseptr);
-      
-      *baseptr = '\0';  /* Chop off the filename.  */
-      dir_part = fname; /* That leaves the dir, with the trailing /.  */
-
-      hash_insert (&db, file_part, dir_part);
-    }
-}
-
-/* Return true if FILENAME could be in PATH_ELT, i.e., if the directory
-   part of FILENAME matches PATH_ELT.  Have to consider // wildcards, but
-   $ and ~ expansion have already been done.  */
-     
-static boolean
-match P2C(const_string, filename,  const_string, path_elt)
-{
-  const_string original_filename = filename;
-  boolean matched = false;
-  boolean done = false;
-  
-  for (; !done && *filename && *path_elt; filename++, path_elt++)
-    {
-      if (*filename == *path_elt) /* normal character match */
-        ;
-
-      else if (IS_DIR_SEP (*path_elt)  /* at // */
-               && original_filename < filename && IS_DIR_SEP (path_elt[-1]))
-        {
-          path_elt++; /* get past second / */
-          if (*path_elt == 0)
-            { /* Have a trailing //, which matches anything. We
-                 could make this part of the other case, but it seems
-                 pointless to do the extra work.  */
-              matched = true;
-              done = true;
-            }
-          else
-            { /* intermediate //, have to match rest of PATH_ELT */
-              for (; !matched && *filename; filename++)
-                { /* Try matching at each possible character.  */
-                  if (*filename == *path_elt)
-                    matched = match (filename, path_elt);
-                }
-            }
-        }
-      
-      else /* normal character nonmatch, quit */
-        done = true;
-    }
-  
-  /* If we've reached the end of PATH_ELT, and we're at the last
-     component of FILENAME, we've matched.  */
-  if (!matched && *path_elt == 0 && IS_DIR_SEP (*filename))
-    {
-      filename++;
-      while (*filename && !IS_DIR_SEP (*filename))
-        filename++;
-      matched = *filename == 0;
-    }
-
-  return matched;
-}
-
-/* Don't bother implementing a search path for the database itself.  We
-   get multiple databases, sort of, with the $TEXMF value for DB_DIR.  */
-
-str_list_type *
-kpse_db_search P3C(const_string, name,  const_string, orig_path_elt,
-                   boolean, all)
-{
-  string *db_dirs, *orig_dirs;
-  const_string last_slash;
-  string path_elt;
-  boolean done;
-  str_list_type *ret;
-  
-  /* Hash up the database if this is the first call.  */
-  if (db.size == 0)
-    {
-      db = hash_create (7603); /* What the heck, sparse is ok.  */
-      if (!db_build (&db))
-        { /* If db can't be built, leave `size' nonzero (so we don't
-             rebuild it), but clear `buckets' (so we don't look in it).  */
-          free (db.buckets);
-          db.buckets = NULL;
-        }
-    }
-  
-  /* If we failed to build the database, quit.  */
-  if (db.buckets == NULL)
-    return NULL;
-  
-  /* When tex-glyph.c calls us looking for, e.g., dpi600/cmr10.pk, we
-     won't find it unless we change NAME to just `cmr10.pk' and append
-     `/dpi600' to PATH_ELT.  We are justified in using a literal `/'
-     here, since that's what tex-glyph.c unconditionally uses in
-     DPI_BITMAP_SPEC.  But don't do anything if the / begins NAME; that
-     should never happen.  */
-  last_slash = strrchr (name, '/');
-  if (last_slash && last_slash != name)
-    {
-      unsigned len = last_slash - name + 1;
-      string dir_part = xmalloc (len);
-      strncpy (dir_part, name, len - 1);
-      dir_part[len - 1] = 0;
-      path_elt = concat3 (orig_path_elt, "/", dir_part);
-      name = last_slash + 1;
-    }
-  else
-    path_elt = (string) orig_path_elt;
-
-  /* We have a db.  Look up NAME.  */
-  orig_dirs = db_dirs = hash_lookup (db, name);
-
-  done = false;
-  ret = XTALLOC1 (str_list_type);
-  *ret = str_list_init ();
-  
-  /* For each filename found, see if it matches the path element.  For
-     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, name);
-      
-      if (match (db_file, path_elt) && kpse_readable_file (db_file))
-        {
-          str_list_add (ret, db_file);
-          if (!all) done = true;
-        }
-      else
-        free (db_file);
-      
-      /* On to the next directory, if any.  */
-      db_dirs++;
-    }
-
-  /* This is just the space for the pointers, not the strings.  */
-  if (orig_dirs && *orig_dirs) free (orig_dirs);
-  
-  /* If we had to break up NAME, free the temporary PATH_ELT.  */
-  if (path_elt != orig_path_elt) free (path_elt);
-  return ret;
-}
deleted file mode 100644
--- a/kpathsea/db.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* db.h: lookups in an externally built db file.
-
-Copyright (C) 1994 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_DB_H
-#define KPATHSEA_DB_H
-
-#include <kpathsea/c-proto.h>
-#include <kpathsea/types.h>
-#include <kpathsea/str-list.h>
-
-/* It's not an error if this doesn't exist; we just go ahead and search
-   the actual directories.  See the `Filename database' node in the
-   kpathsea documentation for details. The variable reference here is
-   expanded by kpathsea. This lets you have different databases for
-   different TeX hierarchies (only one at a time, though!) without
-   having to change anything.  */
-#ifndef KPSE_DB_DIR
-#define KPSE_DB_DIR "$TEXMF"
-#endif
-#ifndef KPSE_DB_NAME
-#define KPSE_DB_NAME "ls-R"
-#endif
-
-/* The expansion of DB_DIR; set by `read_files' in cnf.c, used by
-   `elt_in_db' in pathsearch.c.  */
-extern string kpse_db_dir;
-
-/* Return list of matches for NAME in the ls-R file matching PATH.  If
-   ALL is set, return (null-terminated list) of all matches, else just
-   the first.  If no matches, return a pointer to an empty list.  If the
-   database can't be read, returns NULL.  */
-extern str_list_type *kpse_db_search P3H(const_string name, 
-                                         const_string path, boolean all);
-
-/* Insert the filename FNAME into the database.  */
-extern void db_insert P1H(const_string fname);
-
-#endif /* not KPATHSEA_DB_H */
deleted file mode 100644
--- a/kpathsea/debug.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* debug.c: Help the user discover what's going on.
-
-Copyright (C) 1993, 94 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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>
-
-#ifdef DEBUG
-
-unsigned kpathsea_debug = 0;
-
-/* If the real definitions of fopen or fclose are macros, we lose -- the
-   #undef won't restore them. */
-
-FILE *
-fopen P2C(const_string, filename,  const_string, mode)
-{
-#undef fopen
-  FILE *ret = fopen (filename, mode);
-
-  if (KPSE_DEBUG_P (KPSE_DEBUG_FOPEN))
-    DEBUGF3 ("fopen(%s, %s) => 0x%lx\n", filename, mode, (unsigned long) ret);
-
-  return ret;
-}
-
-int
-fclose P1C(FILE *, f)
-{
-#undef fclose
-  int ret = fclose (f);
-  
-  if (KPSE_DEBUG_P (KPSE_DEBUG_FOPEN))
-    DEBUGF2 ("fclose(0x%lx) => %d\n", (unsigned long) f, ret);
-
-  return ret;
-}
-
-#endif /* DEBUG */
deleted file mode 100644
--- a/kpathsea/debug.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* debug.h: Runtime tracing.
-
-Copyright (C) 1993, 94 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_DEBUG_H
-#define KPATHSEA_DEBUG_H
-
-/* If NO_DEBUG is defined, skip all this.  */
-#ifndef NO_DEBUG
-
-#include <kpathsea/c-proto.h>
-#include <kpathsea/c-std.h>
-#include <kpathsea/types.h>
-
-/* OK, we'll have tracing support.  */
-#define DEBUG
-
-/* Bit vector defining what we should trace.  */
-extern unsigned kpathsea_debug;
-
-/* Set a bit.  */
-#define KPSE_DEBUG_SET(bit) kpathsea_debug |= 1 << (bit)
-
-/* Test if a bit is on.  */
-#define KPSE_DEBUG_P(bit) (kpathsea_debug & (1 << (bit)))
-
-#define KPSE_DEBUG_STAT 0		/* stat calls */
-#define KPSE_DEBUG_HASH 1		/* hash lookups */
-#define KPSE_DEBUG_FOPEN 2		/* fopen/fclose calls */
-#define KPSE_DEBUG_PATHS 3		/* search path initializations */
-#define KPSE_DEBUG_EXPAND 4		/* path element expansion */
-#define KPSE_DEBUG_SEARCH 5		/* searches */
-
-/* A printf for the debugging.  */
-#define DEBUGF_START() do { fputs ("kdebug:", stderr)
-#define DEBUGF_END()        fflush (stderr); } while (0)
-
-#define DEBUGF(str)							\
-  DEBUGF_START (); fputs (str, stderr); DEBUGF_END ()
-#define DEBUGF1(str, e1)						\
-  DEBUGF_START (); fprintf (stderr, str, e1); DEBUGF_END ()
-#define DEBUGF2(str, e1, e2)						\
-  DEBUGF_START (); fprintf (stderr, str, e1, e2); DEBUGF_END ()
-#define DEBUGF3(str, e1, e2, e3)					\
-  DEBUGF_START (); fprintf (stderr, str, e1, e2, e3); DEBUGF_END ()
-#define DEBUGF4(str, e1, e2, e3, e4)					\
-  DEBUGF_START (); fprintf (stderr, str, e1, e2, e3, e4); DEBUGF_END ()
-
-#undef fopen
-#define fopen kpse_fopen_trace
-extern FILE *fopen P2H(const_string filename, const_string mode);
-#undef fclose
-#define fclose kpse_fclose_trace
-extern int fclose P1H(FILE *);
-
-#endif /* not NO_DEBUG */
-
-#endif /* not KPATHSEA_DEBUG_H */
deleted file mode 100644
--- a/kpathsea/default.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* default.h: Declare default path expander.
-
-Copyright (C) 1993, 94 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_DEFAULT_H
-#define KPATHSEA_DEFAULT_H
-
-#include <kpathsea/types.h>
-#include <kpathsea/c-proto.h>
-
-
-/* Replace a leading or trailing or doubled : in PATH with DFLT.  If
-   no extra colons, return PATH.  Only one extra colon is replaced.
-   DFLT may not be NULL.  */
-
-extern string kpse_expand_default P2H(const_string path, const_string dflt);
-
-#endif /* not KPATHSEA_DEFAULT_H */
deleted file mode 100644
--- a/kpathsea/dir.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* dir.c: directory operations.
-
-Copyright (C) 1992, 93, 94 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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-dir.h>
-#include <kpathsea/c-stat.h>
-#include <kpathsea/hash.h>
-
-
-/* Return true if FN is a directory or a symlink to a directory,
-   false if not. */
-
-boolean
-dir_p P1C(const_string, fn)
-{
-  struct stat stats;
-  return stat (fn, &stats) == 0 && S_ISDIR (stats.st_mode);
-}
-
-
-/* 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. */
-
-int
-dir_links P1C(const_string, fn)
-{
-  static hash_table_type link_table;
-  string *hash_ret;
-  long ret;
-  
-  if (link_table.size == 0)
-    link_table = hash_create (457);
-
-#ifdef DEBUG
-  /* This is annoying, but since we're storing integers as pointers, we
-     can't print them as strings.  */
-  if (KPSE_DEBUG_P (KPSE_DEBUG_HASH))
-    kpse_debug_hash_lookup_int = true;
-#endif
-
-  hash_ret = hash_lookup (link_table, fn);
-  
-#ifdef DEBUG
-  if (KPSE_DEBUG_P (KPSE_DEBUG_HASH))
-    kpse_debug_hash_lookup_int = false;
-#endif
-
-  /* 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
-    {
-      struct stat stats;
-      ret = stat (fn, &stats) == 0 && S_ISDIR (stats.st_mode)
-            ? stats.st_nlink : -1;
-
-      /* It's up to us to copy the value.  */
-      hash_insert (&link_table, xstrdup (fn), (const_string) ret);
-      
-#ifdef DEBUG
-      if (KPSE_DEBUG_P (KPSE_DEBUG_STAT))
-        DEBUGF2 ("dir_links(%s) => %ld\n", fn, ret);
-#endif
-    }
-
-  return ret;
-}
deleted file mode 100644
--- a/kpathsea/elt-dirs.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/* elt-dirs.c: Translate a path element to its corresponding director{y,ies}.
-
-Copyright (C) 1993, 94 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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-pathch.h>
-#include <kpathsea/expand.h>
-#include <kpathsea/fn.h>
-#include <kpathsea/pathsearch.h>
-#include <kpathsea/xopendir.h>
-
-/* To avoid giving prototypes for all the routines and then their real
-   definitions, we give all the subroutines first.  The entry point is
-   the last routine in the file.  */
-
-/* Make a copy of DIR (unless it's null) and save it in L.  Ensure that
-   DIR ends with a DIR_SEP for the benefit of later searches.  */
-
-static void
-dir_list_add P2C(str_llist_type *, l,  const_string, dir)
-{
-  string saved_dir
-    = IS_DIR_SEP (dir[strlen (dir) - 1])
-      ? xstrdup (dir)
-      : concat (dir, DIR_SEP_STRING);
-  
-  str_llist_add (l, saved_dir);
-}
-
-
-/* If DIR is a directory, add it to the list L.  */
-
-static void
-checked_dir_list_add P2C(str_llist_type *, l,  const_string, dir)
-{
-  if (dir_p (dir))
-    dir_list_add (l, dir);
-}
-
-/* The cache.  Typically, several paths have the same element; for
-   example, /usr/local/lib/texmf/fonts//.  We don't want to compute the
-   expansion of such a thing more than once.  Even though we also cache
-   the dir_links call, that's not enough -- without this path element
-   caching as well, the execution time doubles.  */
-
-typedef struct
-{
-  const_string key;
-  str_llist_type *value;
-} cache_entry;
-
-static cache_entry *the_cache = NULL;
-static unsigned cache_length = 0;
-
-
-/* Associate KEY with VALUE.  We implement the cache as a simple linear
-   list, since it's unlikely to ever be more than a dozen or so elements
-   long.  We don't bother to check here if PATH has already been saved;
-   we always add it to our list.  We copy KEY but not VALUE; not sure
-   that's right, but it seems to be all that's needed.  */
-
-static void
-cache P2C(const_string, key,  str_llist_type *, value)
-{
-  cache_length++;
-  XRETALLOC (the_cache, cache_length, cache_entry);
-  the_cache[cache_length - 1].key = xstrdup (key);
-  the_cache[cache_length - 1].value = value;
-}
-
-
-/* To retrieve, just check the list in order.  */
-
-static str_llist_type *
-cached P1C(const_string, key)
-{
-  unsigned p;
-  
-  for (p = 0; p < cache_length; p++)
-    {
-      if (STREQ (the_cache[p].key, key))
-        return the_cache[p].value;
-    }
-  
-  return NULL;
-}
-
-/* Handle the magic path constructs.  */
-
-/* Declare recursively called routine.  */
-static void expand_elt P3H(str_llist_type *, const_string, unsigned);
-
-
-/* POST is a pointer into the original element (which may no longer be
-   ELT) to just after the doubled DIR_SEP, perhaps to the null.  Append
-   subdirectories of ELT (up to ELT_LENGTH, which must be a /) to
-   STR_LIST_PTR.  */
-
-static void
-do_subdir P4C(str_llist_type *, str_list_ptr,  const_string, elt,
-              unsigned, elt_length,  const_string, post)
-{
-  DIR *dir;
-  struct dirent *e;
-  fn_type name;
-  
-  /* Some old compilers don't allow aggregate initialization.  */
-  name = fn_copy0 (elt, elt_length);
-  
-  assert (IS_DIR_SEP (elt[elt_length - 1]));
-  
-  /* If we can't open it, quit.  */
-  dir = opendir (FN_STRING (name));
-  if (dir == NULL)
-    {
-      fn_free (&name);
-      return;
-    }
-  
-  /* Include top level before subdirectories, if nothing to match.  */
-  if (*post == 0)
-    dir_list_add (str_list_ptr, FN_STRING (name));
-  else
-    { /* If we do have something to match, see if it exists.  For
-         example, POST might be `pk/ljfour', and they might have a
-         directory `$TEXMF/fonts/pk/ljfour' that we should find.  */
-      fn_str_grow (&name, post);
-      if (dir_p (FN_STRING (name)))
-        dir_list_add (str_list_ptr, FN_STRING (name));
-      fn_shrink_to (&name, elt_length);
-    }
-
-  while ((e = readdir (dir)) != NULL)
-    { /* If it begins with a `.', never mind.  (This allows ``hidden''
-         directories that the algorithm won't find.)  */
-      if (e->d_name[0] != '.')
-        {
-          int links;
-          
-          /* Construct the potential subdirectory name.  */
-          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));
-
-          if (links >= 0)
-            { 
-              unsigned potential_len = FN_LENGTH (name);
-              
-              /* It's a directory, so append the separator.  */
-              fn_str_grow (&name, DIR_SEP_STRING);
-              
-              if (*post != 0)
-                { 
-                  fn_str_grow (&name, post);
-                  /* Unfortunately we can't check if the new element is
-                     a leaf directory, because we don't have a directory
-                     name here, we just have a path spec. This means we
-                     may descend into a leaf directory cm/pk, if the
-                     spec is ...fonts//pk//.  */
-                  expand_elt (str_list_ptr, FN_STRING (name), potential_len);
-                  fn_shrink_to (&name, potential_len);
-                }
-              
-              /* 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.
-                 
-                 The #ifdef here makes all this configurable at
-                 compile-time, so that if we're using VMS directories or
-                 some such, we can still find subdirectories, even if it
-                 is much slower.  */
-#ifdef UNIX_ST_NLINK
-              if (links > 2)
-#endif
-                /* All criteria are met; find subdirectories.  */
-                do_subdir (str_list_ptr, FN_STRING (name),
-                           potential_len, post);
-#ifdef UNIX_ST_NLINK
-              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));
-#endif
-            }
-
-          /* Remove the directory entry we just checked from `name'.  */
-          fn_shrink_to (&name, elt_length);
-        }
-    }
-  
-  fn_free (&name);
-  xclosedir (dir);
-}
-
-
-/* Assume ELT is non-empty and non-NULL.  Return list of corresponding
-   directories (with no terminating NULL entry) in STR_LIST_PTR.  Start
-   looking for magic constructs at START.  */
-
-static void
-expand_elt P3C(str_llist_type *, str_list_ptr,  const_string, elt,
-               unsigned, start)
-{
-  boolean found_special = false;
-  const_string dir = elt + start;
-  
-  while (*dir != 0)
-    {
-      if (IS_DIR_SEP (*dir))
-        {
-          /* If two consecutive directory separators, find subdirectories.  */
-          if (IS_DIR_SEP (dir[1]))
-            {
-              do_subdir (str_list_ptr, elt, dir - elt + 1, dir + 2);
-              found_special = true;
-            }
-#if 0
-/* Maybe eventually I'll implement this, but probably not.  */
-          /* If /?, make following component optional.  */
-          else if (dir[1] == '?')
-            do_optional (str_list_ptr, elt, dir - elt + 1, dir + 2);
-#endif
-          /* No special stuff at this slash.  Keep going.  */
-        }
-      
-      dir++;
-    }
-  
-  if (!found_special)
-    /* When we reach the end of ELT, it will be a normal filename.  */
-    checked_dir_list_add (str_list_ptr, elt);
-}
-
-/* Here is the entry point.  Returns directory list for ELT.  */
-
-str_llist_type *
-kpse_element_dirs P1C(const_string, elt)
-{
-  str_llist_type *ret;
-
-  /* If given nothing, return nothing.  */
-  if (!elt)
-    return NULL;
-
-  /* If we've already cached the answer for ELT, return it.  */
-  ret = cached (elt);
-  if (ret)
-    return ret;
-
-  /* We're going to have a real directory list to return.  */
-  ret = XTALLOC1 (str_llist_type);
-  *ret = NULL;
-  
-  /* If ELT is the empty string, just return cwd.  */
-  if (*elt == 0)
-    { /* Some old compilers do not support aggregate initialization.  */
-      char cwd[3];
-      cwd[0] = '.';
-      cwd[1] = DIR_SEP;
-      cwd[2] = 0;
-      
-      checked_dir_list_add (ret, cwd);
-    }
-
-  /* OK, so much for the trivial cases.  We handle the hard case in
-     a subroutine.  */
-  else
-    {
-      /* If the path starts with ~ or ~user, expand it.  Do this
-         before calling `expand_subdir' or `add_directory', so that
-         we don't expand the same ~ over and over.  */
-      string dir = kpse_expand (elt);
-
-      expand_elt (ret, dir, 0);
-
-      free (dir);
-    }
-
-  /* Remember the directory list we just found, in case future calls are
-     made with the same ELT.  */
-  cache (elt, ret);
-
-#ifdef DEBUG
-  if (KPSE_DEBUG_P (KPSE_DEBUG_EXPAND))
-    {
-      DEBUGF1 ("path element %s =>", elt);
-      if (ret)
-        {
-          str_llist_elt_type *e;
-          for (e = *ret; e; e = STR_LLIST_NEXT (*e))
-            fprintf (stderr, " %s", STR_LLIST (*e));
-        }
-      putc ('\n', stderr);
-      fflush (stderr);
-    }
-#endif
-
-  return ret;
-}
-
-#ifdef TEST
-
-void
-print_element_dirs (const_string elt)
-{
-  str_llist_type *dirs;
-  
-  printf ("Directories of %s:\t", elt ? elt : "(null)");
-  fflush (stdout);
-  
-  dirs = kpse_element_dirs (elt);
-  
-  if (!dirs)
-    printf ("(null)");
-  else
-    {
-      str_llist_elt_type *dir;
-      for (dir = *dirs; dir; dir = STR_LLIST_NEXT (*dir))
-        {
-          string d = STR_LLIST (*dir);
-          printf ("%s ", *d ? d : "`'");
-        }
-    }
-  
-  putchar ('\n');
-}
-
-int
-main ()
-{
-  /* DEBUG_SET (DEBUG_STAT); */
-
-  /* All lists end with NULL.  */
-  print_element_dirs (NULL);	/* */
-  print_element_dirs ("");	/* ./ */
-  print_element_dirs ("/k");	/* */
-  print_element_dirs (".//");	/* ./ ./archive/ */
-  print_element_dirs (".//archive");	/* ./ ./archive/ */
-  print_element_dirs ("/tmp/fonts//");	/* no need to stat anything */
-  print_element_dirs ("/usr/local/lib/tex/fonts//");      /* lots */
-  print_element_dirs ("/usr/local/lib/tex/fonts//times"); /* just one */
-  print_element_dirs ("/usr/local/lib/tex/fonts//"); /* lots again [cache] */
-  print_element_dirs ("~karl");		/* tilde expansion */
-  print_element_dirs ("$karl");		/* variable expansion */  
-  print_element_dirs ("~${LOGNAME}");	/* both */  
-  
-  return 0;
-}
-
-#endif /* TEST */
-
-
-/*
-Local variables:
-test-compile-command: "gcc -g -I. -I.. -DTEST elt-dirs.c kpathsea.a"
-End:
-*/
deleted file mode 100644
--- a/kpathsea/expand.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* expand.c: general expansion.
-
-Copyright (C) 1993, 94 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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-pathch.h>
-#include <kpathsea/expand.h>
-#include <kpathsea/pathsearch.h>
-#include <kpathsea/tilde.h>
-#include <kpathsea/variable.h>
-
-
-/* Do variable expansion so ~${USER} will work.  (Besides, it's what the
-   shells do.)  */
-
-string
-kpse_expand P1C(const_string, s)
-{
-  string var_expansion = kpse_var_expand (s);
-  string tilde_expansion = kpse_tilde_expand (var_expansion);
-  
-  /* `kpse_var_expand' always gives us new memory; `kpse_tilde_expand'
-     doesn't, necessarily.  So be careful that we don't free what we are
-     about to return.  */
-  if (tilde_expansion != var_expansion)
-    free (var_expansion);
-  
-  return tilde_expansion;
-}
-
-
-/* Be careful to not waste all the memory we allocate for each element.  */
-
-string
-kpse_path_expand P1C(const_string, path)
-{
-  string elt;
-  string ret = xmalloc (1); /* so we can free it */
-  *ret = 0;
-  
-  for (elt = kpse_path_element (path); elt; elt = kpse_path_element (NULL))
-    {
-      string save_ret = ret;
-      string elt_exp = kpse_expand (elt);
-      ret = concat3 (ret, elt_exp, ENV_SEP_STRING);
-      free (elt_exp);
-      free (save_ret);
-    }
-    
-  /* Waste the last byte.  */
-  ret[strlen (ret) - 1] = 0;
-  
-  return ret;
-}
deleted file mode 100644
--- a/kpathsea/expand.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* expand.h: general expansion.
-
-Copyright (C) 1993, 94 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_EXPAND_H
-#define KPATHSEA_EXPAND_H
-
-#include <kpathsea/c-proto.h>
-#include <kpathsea/types.h>
-
-/* 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);
-
-/* 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_path_expand P1H(const_string path);
-
-#endif /* not KPATHSEA_EXPAND_H */
deleted file mode 100644
--- a/kpathsea/extend-fname.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* extend-fname.c: give a filename a suffix, if necessary.
-
-Copyright (C) 1992, 93 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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>
-
-
-/* We may or may not return NAME.  It's up to the caller not to assume
-   the return value is modifiable.  */
-
-string 
-extend_filename P2C(const_string, name, const_string, default_suffix)
-{
-  string new_s;
-  const_string suffix = find_suffix (name);
-
-  new_s = suffix == NULL ? concat3 (name, ".", default_suffix)
-                         : (string) name;
-  return new_s;
-}
deleted file mode 100644
--- a/kpathsea/file-p.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* file-p.c: file predicates.
-
-Copyright (C) 1992, 93, 94 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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/xstat.h>
-
-
-/* Test whether FILENAME1 and FILENAME2 are actually the same file.  If
-   stat fails on either of the names, we return false, without error.  */
-
-boolean
-same_file_p P2C(const_string, filename1,  const_string, filename2)
-{
-    struct stat sb1, sb2;
-    /* These are put in variables only so the results can be inspected
-       under gdb.  */
-    int r1 = stat (filename1, &sb1);
-    int r2 = stat (filename2, &sb2);
-
-    return r1 == 0 && r2 == 0 ? SAME_FILE_P (sb1, sb2) : false;
-}
deleted file mode 100644
--- a/kpathsea/find-suffix.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* find-suffix.c: return the stuff after a dot.
-
-Copyright (C) 1992, 93 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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-pathch.h>
-
-
-/* Return pointer to first character after `.' in last directory element
-   of NAME.  If the name is `foo' or `/foo.bar/baz', we have no extension.  */
-
-string
-find_suffix P1C(const_string, name)
-{
-  const_string slash_pos;
-  string dot_pos = strrchr (name, '.');
-  
-  if (dot_pos == NULL)
-    return NULL;
-  
-  for (slash_pos = name + strlen (name) + 1;
-       slash_pos > dot_pos && !IS_DIR_SEP (*slash_pos);
-       slash_pos--)
-    ;
-  
-  return slash_pos > dot_pos ? NULL : dot_pos + 1;
-}
-
deleted file mode 100644
--- a/kpathsea/fn.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* fn.c: arbitrarily long filenames (or just strings).
-
-Copyright (C) 1993 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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/fn.h>
-
-
-/* /usr/local/lib/texmf/fonts/public/cm/pk/ljfour/cmr10.300pk is 58
-   chars, so ASCII `K' seems a good choice. */
-#define CHUNK_SIZE 75
-
-
-fn_type
-fn_init P1H(void)
-{
-  fn_type ret;
-  
-  FN_ALLOCATED (ret) = FN_LENGTH (ret) = 0;
-  FN_STRING (ret) = NULL;
-  
-  return ret;
-}
-
-
-fn_type
-fn_copy0 P2C(const_string, s,  unsigned, len)
-{
-  fn_type ret;
-  
-  FN_ALLOCATED (ret) = CHUNK_SIZE > len ? CHUNK_SIZE : len + 1;
-  FN_STRING (ret) = xmalloc (FN_ALLOCATED (ret));
-  
-  strncpy (FN_STRING (ret), s, len);
-  FN_STRING (ret)[len] = 0;
-  FN_LENGTH (ret) = len + 1;
-  
-  return ret;
-}
-
-/* Don't think we ever try to free something that might usefully be
-   empty, so give fatal error if nothing allocated.  */
-
-void
-fn_free P1C(fn_type *, f)
-{
-  assert (FN_STRING (*f) != NULL);
-  free (FN_STRING (*f));
-  FN_STRING (*f) = NULL;
-  FN_ALLOCATED (*f) = 0;
-  FN_LENGTH (*f) = 0;
-}
-
-/* An arithmetic increase seems more reasonable than geometric.  We
-   don't increase the length member since it may be more convenient for
-   the caller to add than subtract when appending the stuff that will
-   presumably follow.  */
-
-static void
-grow P2C(fn_type *, f,  unsigned, len)
-{
-  while (FN_LENGTH (*f) + len > FN_ALLOCATED (*f))
-    {
-      FN_ALLOCATED (*f) += CHUNK_SIZE;
-      XRETALLOC (FN_STRING (*f), FN_ALLOCATED (*f), char);
-    }
-}
-
-
-void
-fn_1grow P2C(fn_type *, f,  char, c)
-{
-  grow (f, 1);
-  FN_STRING (*f)[FN_LENGTH (*f)] = c;
-  FN_LENGTH (*f)++;
-}
-
-
-void
-fn_grow P3C(fn_type *, f,  address, source,  unsigned, len)
-{
-  grow (f, len);
-  strncpy (FN_STRING (*f) + FN_LENGTH (*f), source, len);
-  FN_LENGTH (*f) += len;
-}
-
-
-void
-fn_str_grow P2C(fn_type *, f,  const_string, s)
-{
-  unsigned more_len = strlen (s);
-  grow (f, more_len);
-  strcat (FN_STRING (*f), s);
-  FN_LENGTH (*f) += more_len;
-}
-
-
-void
-fn_shrink_to P2C(fn_type *, f,  unsigned, loc)
-{
-  assert (FN_LENGTH (*f) > loc);
-  FN_STRING (*f)[loc] = 0;
-  FN_LENGTH (*f) = loc + 1;
-}
deleted file mode 100644
--- a/kpathsea/fn.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* fn.h: arbitrarily long filenames (or just strings).
-
-Copyright (C) 1993 Karl Berry.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef KPATHSEA_FN_H
-#define KPATHSEA_FN_H
-
-#include <kpathsea/c-proto.h>
-#include <kpathsea/types.h>
-
-/* Arbitrarily long filenames; it's inconvenient to use obstacks here,
-   because we want to maintain a null terminator.  Also used for
-   dynamically growing strings even when the null byte isn't necessary,
-   e.g., in `variable.c', since I don't want to pass obstacks around
-   everywhere, and one can't free parts of an obstack arbitrarily.  */
-
-typedef struct
-{
-  string str;
-  unsigned allocated;
-  unsigned length; /* includes the terminating null byte, if any */
-} fn_type;
-
-#define FN_STRING(fn) ((fn).str)
-#define FN_ALLOCATED(fn) ((fn).allocated)
-#define FN_LENGTH(fn) ((fn).length)
-
-
-/* Create a new empty fn.  */
-extern 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);
-
-/* 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);
-
-/* Append the character C to the fn F.  Don't append trailing null.  */
-extern 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);
-
-/* 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);
-
-/* 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);
-
-#endif /* not KPATHSEA_FN_H */
deleted file mode 100644
--- a/kpathsea/fontmap.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* fontmap.c: read a file for additional font names.
-
-Copyright (C) 1993, 94 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-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-fopen.h>
-#include <kpathsea/fontmap.h>
-#include <kpathsea/hash.h>
-#include <kpathsea/line.h>
-#include <kpathsea/pathsearch.h>
-#include <kpathsea/str-list.h>
-
-
-/* Look up KEY in MAP; if it's not found, remove any suffix from KEY and
-   try again.  */
-
-string *
-map_lookup P2C(hash_table_type, map,  const_string, key)
-{
-  string suffix = find_suffix (key);
-  string *ret = hash_lookup (map, key);
-  
-  if (!ret)
-    {
-      /* OK, the original KEY didn't work.  Let's check for the KEY without
-         an extension -- perhaps they gave foobar.tfm, but the mapping only
-         defines `foobar'.  */
-      if (suffix)
-        {
-          string base_key = remove_suffix (key);
-          
-          ret = hash_lookup (map, base_key);
-
-          free (base_key);
-        }
-    }
-
-  /* Append the original suffix, if we had one.  */
-  if (ret && suffix)
-    while (*ret)
-      {
-       *ret = extend_filename (*ret, suffix);
-       ret++;
-      }
-
-  return ret;
-}
-
-/* Open and read the mapping file MAP_FILENAME, putting its entries into
-   MAP. Comments begin with % and continue to the end of the line.  Each
-   line of the file defines an entry: the first word is the real
-   filename (e.g., `ptmr'), the second word is the alias (e.g.,
-   `Times-Roman'), and any subsequent words are ignored.  .tfm is added
-   if either the filename or the alias have no extension.  This is the
-   same order as in Dvips' psfonts.map; unfortunately, we can't have TeX
-   read that same file, since most of the real filenames start with an
-   `r', because of the virtual fonts Dvips uses.  */
-
-static void
-map_file_parse P2C(hash_table_type *, map,  const_string, map_filename)
-{
-  extern FILE *xfopen ();	/* In xfopen.c.  */
-  char *l;
-  unsigned map_lineno = 0;
-  FILE *f = xfopen (map_filename, FOPEN_R_MODE);
-  
-  while ((l = read_line (f)) != NULL)
-    {
-      string filename;
-      string comment_loc = strchr (l, '%');
-      
-      map_lineno++;
-      
-      /* Ignore anything after a %.  */
-      if (comment_loc)
-        *comment_loc = 0;
-      
-      /* If we don't have any filename, that's ok, the line is blank.  */
-      filename = strtok (l, " \t");
-      if (filename)
-        {
-          string alias = strtok (NULL, " \t");
-          
-          /* But if we have a filename and no alias, something's wrong.  */
-          if (alias == NULL || *alias == 0)
-            fprintf (stderr, "%s:%u: Alias missing for filename `%s'.\n",
-                     map_filename, map_lineno, filename);
-          else
-            { /* We've got everything.  Insert the new entry.  */
-              hash_insert (map, xstrdup (alias), xstrdup (filename));
-            }
-        }
-      
-      free (l);
-    }
-  
-  xfclose (f, map_filename);
-}
-
-/* Search for all the MAP_NAME's in PATH.  */
-
-#define MAP_NAME "texfonts.map"
-
-hash_table_type
-map_create P1C(const_string, path)
-{
-  string *filenames = kpse_all_path_search (path, MAP_NAME);
-  hash_table_type map; /* some old compilers ... */
-  map = hash_create (751);
-  
-  while (*filenames)
-    {
-      map_file_parse (&map, *filenames);
-      filenames++;
-    }
-
-  return map;
-}
deleted file mode 100644
--- a/kpathsea/fontmap.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* fontmap.h: declarations for reading a file to define additional font names.
-
-Copyright (C) 1993, 94 Free Software Foundation, Inc.
-
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-#ifndef FONTMAP_H
-#define FONTMAP_H
-
-#include <kpathsea/c-proto.h>
-#include <kpathsea/hash.h>
-#include <kpathsea/types.h>
-
-
-/* Parse the file `texfonts.map' in each of the directories in PATH and
-   return the resulting structure.  Entries in earlier files override
-   later files.  */
-extern hash_table_type map_create P1H(const_string path);
-
-
-/* Look up KEY in MAP, and return a null-terminated list of all matching
-   entries.  If none, return NULL.  */
-extern string *map_lookup P2H(hash_table_type map, const_string key);
-
-#endif /* not FONTMAP_H */
deleted file mode 100644
--- a/kpathsea/freedom.texi
+++ /dev/null
@@ -1,268 +0,0 @@
-@c Copyright (C) 1992 Karl Berry.
-@c For copying conditions, see the file copying.texi.
-
-@node Freedom
-@appendix Regain your programming freedom
-
-@cindex freedom, programming
-Until a few years ago, programmers in the United States could write any
-program they wished.  This freedom has now been taken away by two
-developments: software patents, which grant the patent holder an
-absolute monopoly on some programming technique, and user interface
-copyright, which forbid compatible implementations of an existing user
-interface.
-
-In Europe, especially through the GATT treaty, things are rapidly
-approaching the same pass.
-
-@menu
-* Software patents::            Algorithm monopolies.
-* User interface copyright::    Forbidding upward-compatibility.
-* What to do?::                 What to do?
-@end menu
-
-
-@node Software patents, User interface copyright,  , Freedom
-@section Software patents
-
-@cindex patents, software
-@cindex software patents
-
-The U.S. Patent and Trademark Office has granted numerous software
-patents on software techniques.  Patents are an absolute
-monopoly---independent reinvention is precluded.  This monopoly lasts
-for seventeen years, i.e., forever (with respect to computer science).
-
-One patent relevant to @TeX{} is patent 4,956,809, issued to the Mark
-Williams company on September 11, 1990, applied for in 1982, which
-covers (among other things)
-@quotation
-representing in a standardized order
-consisting of a standard binary structure file stored on auxiliary
-memory or transported on a communications means, said standardized
-order being different from a different order used on at least one
-of the different computers;
-
-Converting in each of the different computers binary data read from an
-auxiliary data storage or communications means from the standardized
-order to the natural order of the respective host computer after said
-binary data are read from said auxiliary data storage or
-communications means and before said binary data are used by the
-respective host computer; and
-
-Converting in each of the different computers binary data written into
-auxiliary data storage or communications means from the natural order
-of the respective host computer to the standardized order prior to
-said writing.
-@end quotation
-
-@noindent @dots{} in other words, storing data on disk in
-a machine-independent order, as the DVI, TFM, GF, and PK file formats
-specify.  Even though @TeX{} is ``prior art'' in this respect, the
-patent was granted (the patent examiners not being computer scientists,
-even less computer typographers).  Since there is a strong presumption
-in the courts of a patent's validity once it has been granted, there is
-a good chance that users or implementors of @TeX{} could be successfully
-sued on the issue.
-
-As another example, the X window system, which was intended to be able
-to be used freely by everyone, is now being threatened by two patents:
-4,197,590 on the use of exclusive-or to redraw cursors, held by Cadtrak,
-a litigation company (this has been upheld twice in court); and
-4,555,775, held by AT&T, on the use of backing store to redraw windows
-quickly.
-
-Here is one excerpt from a recent mailing by the League for Programming
-Freedom (@pxref{What to do?}) which I feel sums up the situation rather
-well.  It comes from an article in @cite{Think} magazine, issue #5,
-1990.  The comments after the quote were written by Richard Stallman.
-
-@quotation
-    ``You get value from patents in two ways,'' says Roger Smith, IBM
-    Assistant General Counsel, intellectual property law.  ``Through fees,
-    and through licensing negotiations that give IBM access to other
-    patents.
-
-    ``The IBM patent portfolio gains us the freedom to do what we need to
-    do through cross-licensing---it gives us access to the inventions of
-    others that are the key to rapid innovation.  Access is far more
-    valuable to IBM than the fees it receives from its 9,000 active
-    patents.  There's no direct calculation of this value, but it's many
-    times larger than the fee income, perhaps an order of magnitude
-    larger.''
-@end quotation
-
-This information should dispel the belief that the patent system will
-``protect'' a small software developer from competition from IBM.  IBM
-can always find patents in its collection which the small developer is
-infringing, and thus obtain a cross-license.
-
-However, the patent system does cause trouble for the smaller
-companies which, like IBM, need access to patented techniques in order
-to do useful work in software.  Unlike IBM, the smaller companies do
-not have 9,000 patents and cannot usually get a cross-license.  No
-matter how hard they try, they cannot have enough patents to do this.
-
-Only the elimination of patents from the software field can enable
-most software developers to continue with their work.
-
-The value IBM gets from cross-licensing is a measure of the amount of
-harm that the patent system would do to IBM if IBM could not avoid it.
-IBM's estimate is that the trouble could easily be ten times the good
-one can expect from one's own patents---even for a company with 9,000
-of them.
-
-
-@node User interface copyright, What to do?, Software patents, Freedom
-@section User interface copyright
-
-@cindex rms
-@cindex user interface copyright
-@cindex interface copyright
-(This section is copied from the GCC manual, by Richard Stallman.)
-
-@quotation
-@i{This section is a political message from the League for Programming
-Freedom to the users of the GNU font utilities.  It is included here as
-an expression of support for the League on my part.}
-@end quotation
-
-Apple, Lotus and Xerox are trying to create a new form of
-legal monopoly: a copyright on a class of user interfaces.  These
-monopolies would cause serious problems for users and developers of
-computer software and systems.
-
-Until a few years ago, the law seemed clear: no one could restrict
-others from using a user interface; programmers were free to implement
-any interface they chose.  Imitating interfaces, sometimes with changes,
-was standard practice in the computer field.  The interfaces we know
-evolved gradually in this way; for example, the Macintosh user interface
-drew ideas from the Xerox interface, which in turn drew on work done at
-Stanford and SRI.  1-2-3 imitated VisiCalc, and dBase imitated a
-database program from JPL.
-
-Most computer companies, and nearly all computer users, were happy with
-this state of affairs.  The companies that are suing say it does not
-offer ``enough incentive'' to develop their products, but they must have
-considered it ``enough'' when they made their decision to do so.  It
-seems they are not satisfied with the opportunity to continue to compete
-in the marketplace---not even with a head start.
-
-If Xerox, Lotus, and Apple are permitted to make law through
-the courts, the precedent will hobble the software industry:
-
-@itemize @bullet
-@item
-Gratuitous incompatibilities will burden users.  Imagine if each
-car manufacturer had to arrange the pedals in a different order.
-
-@item
-Software will become and remain more expensive.  Users will be
-``locked in'' to proprietary interfaces, for which there is no real
-competition.
-
-@item
-Large companies have an unfair advantage wherever lawsuits become
-commonplace.  Since they can easily afford to sue, they can intimidate
-small companies with threats even when they don't really have a case.
-
-@item
-User interface improvements will come slower, since incremental
-evolution through creative imitation will no longer be permitted.
-
-@item
-Even Apple, etc., will find it harder to make improvements if
-they can no longer adapt the good ideas that others introduce, for
-fear of weakening their own legal positions.  Some users suggest that
-this stagnation may already have started.
-
-@item
-If you use GNU software, you might find it of some concern that user
-interface copyright will make it hard for the Free Software Foundation
-to develop programs compatible with the interfaces that you already
-know.
-@end itemize
-
-
-@node What to do?,  , User interface copyright, Freedom
-@section What to do?
-
-(This section is copied from the GCC manual, by Richard Stallman.)
-
-To protect our freedom from lawsuits like these, a group of programmers
-and users have formed a new grass-roots political organization, the
-League for Programming Freedom.
-
-The purpose of the League is to oppose new monopolistic practices such
-as user-interface copyright and software patents; it calls for a return
-to the legal policies of the recent past, in which these practices were
-not allowed.  The League is not concerned with free software as an
-issue, and not affiliated with the Free Software Foundation.
-
-The League's membership rolls include John McCarthy, inventor of Lisp,
-Marvin Minsky, founder of the Artificial Intelligence lab, Guy L.
-Steele, Jr., author of well-known books on Lisp and C, as well as
-Richard Stallman, the developer of GNU CC.  Please join and add your
-name to the list.  Membership dues in the League are $42 per year for
-programmers, managers and professionals; $10.50 for students; $21 for
-others.
-
-The League needs both activist members and members who only pay their
-dues.
-
-To join, or for more information, phone (617) 492-0023 or write to:
-
-@display
-League for Programming Freedom
-1 Kendall Square #143
-P.O. Box 9171
-Boston, MA  02111-1307
-@end display
-
-You can also send electronic mail to @code{league@@prep.ai.mit.edu}.
-
-Here are some suggestions from the League for things you can do to
-protect your freedom to write programs:
-
-@itemize @bullet
-@item
-Don't buy from Xerox, Lotus or Apple.  Buy from their competitors or
-from the defendants they are suing.
-
-@item
-Don't develop software to work with the systems made by these companies.
-
-@item
-Port your existing software to competing systems, so that you encourage
-users to switch.
-
-@item
-Write letters to company presidents to let them know their conduct
-is unacceptable.
-
-@item
-Tell your friends and colleagues about this issue and how it threatens
-to ruin the computer industry.
-
-@item
-Above all, don't work for the look-and-feel plaintiffs, and don't
-accept contracts from them.
-
-@item
-Write to Congress to explain the importance of this issue.
-
-@display
-House Subcommittee on Intellectual Property
-2137 Rayburn Bldg
-Washington, DC 20515
-
-Senate Subcommittee on Patents, Trademarks and Copyrights
-United States Senate
-Washington, DC 20510
-@end display
-
-(These committees have received lots of mail already; let's give them
-even more.)
-@end itemize
-
-Express your opinion!  You can make a difference.
deleted file mode 100644
--- a/kpathsea/getopt.c
+++ /dev/null
@@ -1,748 +0,0 @@
-/* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
-   "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
-   	Free Software Foundation, Inc.
-
-   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 the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program 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 General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  */
-
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
-   Ditto for AIX 3.2 and <stdlib.h>.  */
-#ifndef _NO_PROTO
-#define _NO_PROTO
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#if !defined (__STDC__) || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
-
-
-/* This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef	__GNU_LIBRARY__
-/* Don't include stdlib.h for non-GNU C libraries because some of them
-   contain conflicting prototypes for getopt.  */
-#include <stdlib.h>
-#endif	/* GNU C library.  */
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
-   but it behaves differently for the user, since it allows the user
-   to intersperse the options with the other arguments.
-
-   As `getopt' works, it permutes the elements of ARGV so that,
-   when it is done, all the options precede everything else.  Thus
-   all application programs are extended to handle flexible argument order.
-
-   Setting the environment variable POSIXLY_CORRECT disables permutation.
-   Then the behavior is completely standard.
-
-   GNU application programs can use a third alternative mode in which
-   they can distinguish the relative order of options and other arguments.  */
-
-#include "getopt.h"
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-char *optarg = NULL;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns EOF, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-/* XXX 1003.2 says this must be 1 before any call.  */
-int optind = 0;
-
-/* The next char to be scanned in the option-element
-   in which the last option character we returned was found.
-   This allows us to pick up the scan where we left off.
-
-   If this is zero, or a null string, it means resume the scan
-   by advancing to the next ARGV-element.  */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
-   for unrecognized options.  */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
-   This must be initialized on some systems to avoid linking in the
-   system's own getopt implementation.  */
-
-int optopt = '?';
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
-   If the caller did not specify anything,
-   the default is REQUIRE_ORDER if the environment variable
-   POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-   REQUIRE_ORDER means don't recognize them as options;
-   stop option processing when the first non-option is seen.
-   This is what Unix does.
-   This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using `+' as the first character
-   of the list of option characters.
-
-   PERMUTE is the default.  We permute the contents of ARGV as we scan,
-   so that eventually all the non-options are at the end.  This allows options
-   to be given in any order, even with programs that were not written to
-   expect this.
-
-   RETURN_IN_ORDER is an option available to programs that were written
-   to expect options and other ARGV-elements in any order and that care about
-   the ordering of the two.  We describe each non-option ARGV-element
-   as if it were the argument of an option with character code 1.
-   Using `-' as the first character of the list of option characters
-   selects this mode of operation.
-
-   The special argument `--' forces an end of option-scanning regardless
-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return EOF with `optind' != ARGC.  */
-
-static enum
-{
-  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-/* Value of POSIXLY_CORRECT environment variable.  */
-static char *posixly_correct;
-
-#ifdef	__GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
-   because there are many ways it can cause trouble.
-   On some systems, it contains special magic macros that don't work
-   in GCC.  */
-#include <string.h>
-#define	my_index	strchr
-#else
-
-/* Avoid depending on library functions or files
-   whose names are inconsistent.  */
-
-char *getenv ();
-
-static char *
-my_index (str, chr)
-     const char *str;
-     int chr;
-{
-  while (*str)
-    {
-      if (*str == chr)
-	return (char *) str;
-      str++;
-    }
-  return 0;
-}
-
-/* If using GCC, we can safely declare strlen this way.
-   If not using GCC, it is ok not to declare it.  */
-#ifdef __GNUC__
-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
-   That was relevant to code that was here before.  */
-#if !defined (__STDC__) || !__STDC__
-/* gcc with -traditional declares the built-in strlen to return int,
-   and has done so at least since version 2.4.5. -- rms.  */
-extern int strlen (const char *);
-#endif /* not __STDC__ */
-#endif /* __GNUC__ */
-
-#endif /* not __GNU_LIBRARY__ */
-
-/* Handle permutation of arguments.  */
-
-/* Describe the part of ARGV that contains non-options that have
-   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
-   `last_nonopt' is the index after the last of them.  */
-
-static int first_nonopt;
-static int last_nonopt;
-
-/* Exchange two adjacent subsequences of ARGV.
-   One subsequence is elements [first_nonopt,last_nonopt)
-   which contains all the non-options that have been skipped so far.
-   The other is elements [last_nonopt,optind), which contains all
-   the options processed since those non-options were skipped.
-
-   `first_nonopt' and `last_nonopt' are relocated so that they describe
-   the new indices of the non-options in ARGV after they are moved.  */
-
-static void
-exchange (argv)
-     char **argv;
-{
-  int bottom = first_nonopt;
-  int middle = last_nonopt;
-  int top = optind;
-  char *tem;
-
-  /* Exchange the shorter segment with the far end of the longer segment.
-     That puts the shorter segment into the right place.
-     It leaves the longer segment in the right place overall,
-     but it consists of two parts that need to be swapped next.  */
-
-  while (top > middle && middle > bottom)
-    {
-      if (top - middle > middle - bottom)
-	{
-	  /* Bottom segment is the short one.  */
-	  int len = middle - bottom;
-	  register int i;
-
-	  /* Swap it with the top part of the top segment.  */
-	  for (i = 0; i < len; i++)
-	    {
-	      tem = argv[bottom + i];
-	      argv[bottom + i] = argv[top - (middle - bottom) + i];
-	      argv[top - (middle - bottom) + i] = tem;
-	    }
-	  /* Exclude the moved bottom segment from further swapping.  */
-	  top -= len;
-	}
-      else
-	{
-	  /* Top segment is the short one.  */
-	  int len = top - middle;
-	  register int i;
-
-	  /* Swap it with the bottom part of the bottom segment.  */
-	  for (i = 0; i < len; i++)
-	    {
-	      tem = argv[bottom + i];
-	      argv[bottom + i] = argv[middle + i];
-	      argv[middle + i] = tem;
-	    }
-	  /* Exclude the moved top segment from further swapping.  */
-	  bottom += len;
-	}
-    }
-
-  /* Update records for the slots the non-options now occupy.  */
-
-  first_nonopt += (optind - last_nonopt);
-  last_nonopt = optind;
-}
-
-/* Initialize the internal data when the first call is made.  */
-
-static const char *
-_getopt_initialize (optstring)
-     const char *optstring;
-{
-  /* Start processing options with ARGV-element 1 (since ARGV-element 0
-     is the program name); the sequence of previously skipped
-     non-option ARGV-elements is empty.  */
-
-  first_nonopt = last_nonopt = optind = 1;
-
-  nextchar = NULL;
-
-  posixly_correct = getenv ("POSIXLY_CORRECT");
-
-  /* Determine how to handle the ordering of options and nonoptions.  */
-
-  if (optstring[0] == '-')
-    {
-      ordering = RETURN_IN_ORDER;
-      ++optstring;
-    }
-  else if (optstring[0] == '+')
-    {
-      ordering = REQUIRE_ORDER;
-      ++optstring;
-    }
-  else if (posixly_correct != NULL)
-    ordering = REQUIRE_ORDER;
-  else
-    ordering = PERMUTE;
-
-  return optstring;
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
-   given in OPTSTRING.
-
-   If an element of ARGV starts with '-', and is not exactly "-" or "--",
-   then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If `getopt'
-   is called repeatedly, it returns successively each of the option characters
-   from each of the option elements.
-
-   If `getopt' finds another option character, it returns that character,
-   updating `optind' and `nextchar' so that the next call to `getopt' can
-   resume the scan with the following option character or ARGV-element.
-
-   If there are no more option characters, `getopt' returns `EOF'.
-   Then `optind' is the index in ARGV of the first ARGV-element
-   that is not an option.  (The ARGV-elements have been permuted
-   so that those that are not options now come last.)
-
-   OPTSTRING is a string containing the legitimate option characters.
-   If an option character is seen that is not listed in OPTSTRING,
-   return '?' after printing an error message.  If you set `opterr' to
-   zero, the error message is suppressed but we still return '?'.
-
-   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
-   so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in `optarg'.  Two colons mean an option that
-   wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in `optarg', otherwise `optarg' is set to zero.
-
-   If OPTSTRING starts with `-' or `+', it requests different methods of
-   handling the non-option ARGV-elements.
-   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
-   Long-named options begin with `--' instead of `-'.
-   Their names may be abbreviated as long as the abbreviation is unique
-   or is an exact match for some defined option.  If they have an
-   argument, it follows the option name in the same ARGV-element, separated
-   from the option name by a `=', or else the in next ARGV-element.
-   When `getopt' finds a long-named option, it returns 0 if that option's
-   `flag' field is nonzero, the value of the option's `val' field
-   if the `flag' field is zero.
-
-   The elements of ARGV aren't really const, because we permute them.
-   But we pretend they're const in the prototype to be compatible
-   with other systems.
-
-   LONGOPTS is a vector of `struct option' terminated by an
-   element containing a name which is zero.
-
-   LONGIND returns the index in LONGOPT of the long-named option found.
-   It is only valid when a long-named option has been found by the most
-   recent call.
-
-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
-   long-named options.  */
-
-int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-     const struct option *longopts;
-     int *longind;
-     int long_only;
-{
-  optarg = NULL;
-
-  if (optind == 0)
-    optstring = _getopt_initialize (optstring);
-
-  if (nextchar == NULL || *nextchar == '\0')
-    {
-      /* Advance to the next ARGV-element.  */
-
-      if (ordering == PERMUTE)
-	{
-	  /* If we have just processed some options following some non-options,
-	     exchange them so that the options come first.  */
-
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
-	    exchange ((char **) argv);
-	  else if (last_nonopt != optind)
-	    first_nonopt = optind;
-
-	  /* Skip any additional non-options
-	     and extend the range of non-options previously skipped.  */
-
-	  while (optind < argc
-		 && (argv[optind][0] != '-' || argv[optind][1] == '\0'))
-	    optind++;
-	  last_nonopt = optind;
-	}
-
-      /* The special ARGV-element `--' means premature end of options.
-	 Skip it like a null option,
-	 then exchange with previous non-options as if it were an option,
-	 then skip everything else like a non-option.  */
-
-      if (optind != argc && !strcmp (argv[optind], "--"))
-	{
-	  optind++;
-
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
-	    exchange ((char **) argv);
-	  else if (first_nonopt == last_nonopt)
-	    first_nonopt = optind;
-	  last_nonopt = argc;
-
-	  optind = argc;
-	}
-
-      /* If we have done all the ARGV-elements, stop the scan
-	 and back over any non-options that we skipped and permuted.  */
-
-      if (optind == argc)
-	{
-	  /* Set the next-arg-index to point at the non-options
-	     that we previously skipped, so the caller will digest them.  */
-	  if (first_nonopt != last_nonopt)
-	    optind = first_nonopt;
-	  return EOF;
-	}
-
-      /* If we have come to a non-option and did not permute it,
-	 either stop the scan or describe it to the caller and pass it by.  */
-
-      if ((argv[optind][0] != '-' || argv[optind][1] == '\0'))
-	{
-	  if (ordering == REQUIRE_ORDER)
-	    return EOF;
-	  optarg = argv[optind++];
-	  return 1;
-	}
-
-      /* We have found another option-ARGV-element.
-	 Skip the initial punctuation.  */
-
-      nextchar = (argv[optind] + 1
-		  + (longopts != NULL && argv[optind][1] == '-'));
-    }
-
-  /* Decode the current option-ARGV-element.  */
-
-  /* Check whether the ARGV-element is a long option.
-
-     If long_only and the ARGV-element has the form "-f", where f is
-     a valid short option, don't consider it an abbreviated form of
-     a long option that starts with f.  Otherwise there would be no
-     way to give the -f short option.
-
-     On the other hand, if there's a long option "fubar" and
-     the ARGV-element is "-fu", do consider that an abbreviation of
-     the long option, just like "--fu", and not "-f" with arg "u".
-
-     This distinction seems to be the most useful approach.  */
-
-  if (longopts != NULL
-      && (argv[optind][1] == '-'
-	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
-    {
-      char *nameend;
-      const struct option *p;
-      const struct option *pfound = NULL;
-      int exact = 0;
-      int ambig = 0;
-      int indfound;
-      int option_index;
-
-      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
-	/* Do nothing.  */ ;
-
-      /* Test all long options for either exact match
-	 or abbreviated matches.  */
-      for (p = longopts, option_index = 0; p->name; p++, option_index++)
-	if (!strncmp (p->name, nextchar, nameend - nextchar))
-	  {
-	    if (nameend - nextchar == strlen (p->name))
-	      {
-		/* Exact match found.  */
-		pfound = p;
-		indfound = option_index;
-		exact = 1;
-		break;
-	      }
-	    else if (pfound == NULL)
-	      {
-		/* First nonexact match found.  */
-		pfound = p;
-		indfound = option_index;
-	      }
-	    else
-	      /* Second or later nonexact match found.  */
-	      ambig = 1;
-	  }
-
-      if (ambig && !exact)
-	{
-	  if (opterr)
-	    fprintf (stderr, "%s: option `%s' is ambiguous\n",
-		     argv[0], argv[optind]);
-	  nextchar += strlen (nextchar);
-	  optind++;
-	  return '?';
-	}
-
-      if (pfound != NULL)
-	{
-	  option_index = indfound;
-	  optind++;
-	  if (*nameend)
-	    {
-	      /* Don't test has_arg with >, because some C compilers don't
-		 allow it to be used on enums.  */
-	      if (pfound->has_arg)
-		optarg = nameend + 1;
-	      else
-		{
-		  if (opterr)
-		    {
-		      if (argv[optind - 1][1] == '-')
-			/* --option */
-			fprintf (stderr,
-				 "%s: option `--%s' doesn't allow an argument\n",
-				 argv[0], pfound->name);
-		      else
-			/* +option or -option */
-			fprintf (stderr,
-			     "%s: option `%c%s' doesn't allow an argument\n",
-			     argv[0], argv[optind - 1][0], pfound->name);
-		    }
-		  nextchar += strlen (nextchar);
-		  return '?';
-		}
-	    }
-	  else if (pfound->has_arg == 1)
-	    {
-	      if (optind < argc)
-		optarg = argv[optind++];
-	      else
-		{
-		  if (opterr)
-		    fprintf (stderr, "%s: option `%s' requires an argument\n",
-			     argv[0], argv[optind - 1]);
-		  nextchar += strlen (nextchar);
-		  return optstring[0] == ':' ? ':' : '?';
-		}
-	    }
-	  nextchar += strlen (nextchar);
-	  if (longind != NULL)
-	    *longind = option_index;
-	  if (pfound->flag)
-	    {
-	      *(pfound->flag) = pfound->val;
-	      return 0;
-	    }
-	  return pfound->val;
-	}
-
-      /* Can't find it as a long option.  If this is not getopt_long_only,
-	 or the option starts with '--' or is not a valid short
-	 option, then it's an error.
-	 Otherwise interpret it as a short option.  */
-      if (!long_only || argv[optind][1] == '-'
-	  || my_index (optstring, *nextchar) == NULL)
-	{
-	  if (opterr)
-	    {
-	      if (argv[optind][1] == '-')
-		/* --option */
-		fprintf (stderr, "%s: unrecognized option `--%s'\n",
-			 argv[0], nextchar);
-	      else
-		/* +option or -option */
-		fprintf (stderr, "%s: unrecognized option `%c%s'\n",
-			 argv[0], argv[optind][0], nextchar);
-	    }
-	  nextchar = (char *) "";
-	  optind++;
-	  return '?';
-	}
-    }
-
-  /* Look at and handle the next short option-character.  */
-
-  {
-    char c = *nextchar++;
-    char *temp = my_index (optstring, c);
-
-    /* Increment `optind' when we start to process its last character.  */
-    if (*nextchar == '\0')
-      ++optind;
-
-    if (temp == NULL || c == ':')
-      {
-	if (opterr)
-	  {
-	    if (posixly_correct)
-	      /* 1003.2 specifies the format of this message.  */
-	      fprintf (stderr, "%s: illegal option -- %c\n", argv[0], c);
-	    else