imported xdvik-22.84.15

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

40 files changed, 1566 insertions, 2443 deletions

diff --git a/Build/source/texk/xdvik/CHANGES b/Build/source/texk/xdvik/CHANGES
index 1a9ef8c3464..6d35196a501 100644
--- a/Build/source/texk/xdvik/CHANGES
+++ b/Build/source/texk/xdvik/CHANGES
@@ -9,6 +9,13 @@ Versions containing major changes are marked as `beta'; these
 may contain undetected bugs. Such versions shouldn't be used
 by distributors.
 
+   * 22.84.15:
+	+ Fixed #2067614: Re-introduced default binding for key 0
+	  which had been forgotten in previous changes
+	+ Fixed #1502137 (compiler warnings on 64bit systems)
+	+ Fixed some typos in the man page (ubuntu ticket #202435, see
+          https://bugs.launchpad.net/ubuntu/+source/texlive-bin/+bug/202435)
+
    * 22.84.14:
 	+ Added action "mouse-modes()" to allow customization of
 	  mode specific mouse bindings.
diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL
index 27d03223769..16d8cdef259 100644
--- a/Build/source/texk/xdvik/ChangeLog.TL
+++ b/Build/source/texk/xdvik/ChangeLog.TL
@@ -1,6 +1,10 @@
 ChangeLog: Changes for xdvik (teTeX / TeX Live)
 ===============================================
 
+2009-03-31
+	Imported ftp://tug.org/tex/xdvik-22.84.15.tar.gz and
+	adapted to new TeX Live build system (Automake & Co.).
+
 2008-07-01
 	Imported ftp://tug.org/tex/xdvik-22.84.14.tar.gz and
 	adapted to new TeX Live build system (autoconf-2.59+).
diff --git a/Build/source/texk/xdvik/INSTALL b/Build/source/texk/xdvik/INSTALL
deleted file mode 100644
index a642493ba31..00000000000
--- a/Build/source/texk/xdvik/INSTALL
+++ /dev/null
@@ -1,132 +0,0 @@
-
-Compiling and Installing Xdvik
-==============================
-
-Xdvik is the kpathsea-enhanced version of xdvi. The program
-invocation name is still `xdvi' for compatibility reasons.
-
-Please submit bug reports, suggestions etc. to the sourceforge
-xdvik project page:
-
-	http://sourceforge.net/projects/xdvi/
-
-
-Note for users of older versions of teTeX (<= teTeX-1.0):
-=========================================================
-
-   Please consult  the README file in the texk/xdvik/texmf-alt/
-   directory of the source distribution.
-
-
-Note for users of non-teTeX installations:
-==========================================
-
-   Please consult the files texk/xdvik/texmf-alt/README and
-   texk/xdvik/README.t1fonts for information on how to configure
-   xdvik for direct Type1 font rendering.
-
-
-1. Required Software
-
-   - X11R5 or newer and the Xt libraries
-
-   and one of:
-
-   - Xaw (Athena widgets)
-
-   - Motif >= 1.2 or newer
-     LessTif has a few bugs and restrictions that will result in limited
-     functionality (see the file texk/xdvik/LESSTIF-BUGS for details).
-     For best results, use OpenMotif 2.x.
-
-   You need both the headers and the runtime libraries to compile and run
-   xdvik (note that some Linux distributors put the headers into separate
-   `X development' pacakges).
-
-2. Configuring:
-
-   In the top-level directory (the directory in which this INSTALL
-   file is located), invoke:
-
-	./configure
-
-   You can also specify a toolkit via the --with-x-toolkit option
-   (the default is to check if Motif is available and use it if it is):
-
-       ./configure --with-x-toolkit=xaw [other-options]
-
-   will compile with Xaw (Athena widgets) instead. You can set
-   the search paths for Motif header/library files with the
-   --with-motif-include and --with-motif-libdir options.
-
-   If configure gives you errors about the main texmf tree not being
-   found, specify its directory via the `--datadir' option.
-   On a standard teTeX system, use the output of the command:
-
-	kpsewhich --expand-path='$TEXMFMAIN'
-
-   *without* the `texmf' component as value for `--datadir'
-   (/usr/share or /usr/local/teTeX/share are possible values).
-
-   For all configuration options available, see the output of:
-       ./configure --help
-
-
-
-3. Compiling:
-
-   In the top-level directory, invoke:
-
-        make
-
-   This should compile the executable texk/xdvik/xdvi-TOOLKIT.bin,
-   where TOOLKIT is the value of the `--with-x-toolkit' specified
-   in the configure step, e.g. `xaw' or `motif' (the default).
-
-   If you set the environment variable XDVIINPUTS to the path
-   containing the files xdvi.cfg and ps2pk.map, you should be
-   able to test xdvi without actually installing it.
-
-
-
-4. Installation:
-
-   Usually, the binary xdvi-TOOLKIT.bin is invoked by a shell wrapper
-   `xdvi' which sets XDVIINPUTS and some other variables, like the X
-   search path.
-
-   If you only want to upgrade an existing version of xdvik, it should
-   be sufficient to copy xdvi-TOOLKIT.bin into a directory in your PATH
-   and check that the shell wrapper invokes the correct toolkit version.
-   (You may also want to update the man page from xdvi.1). These files
-   are located in the texk/xdvik subdirectory.
-
-   To install a new version from scratch, invoke:
-
-	make install
-
-   in the top-level directory to install all executable and data files.
-   This will not install the files in the texk/kpathsea subdirectory,
-   which is not required if you already have a working TeX installation
-   (and actually could overwrite your existing setup). If you don't have
-   kpathsea installed yet, you'll need to install it manually; basically
-   by doing `cd texk/kpathsea; make install'. Please see the file
-   texk/kpathsea/INSTALL for more information.
-
-
-
-5. Setup:
-
-   Make sure that the XDVIINPUTS variable (set in the system-wide
-   texmf.cnf file or in the environment, e.g. in your .profile)
-   contains the path to the directory DATADIR/texmf/xdvi, and
-   to the file ps2pk.map (usually in DATADIR/texmf/dvips);
-   e.g. by setting:
-
-	export XDVIINPUTS='.;$TEXMF/{xdvi,dvips}//'
-
-   If xdvik is still generating PK versions of fonts that you think
-   you have Type1 versions of, please consult texk/xdvik/README.t1fonts
-   for more information on how to configure xdvik correctly for Type1
-   fonts.
-
diff --git a/Build/source/texk/xdvik/Makefile.am b/Build/source/texk/xdvik/Makefile.am
index 8ddb7caeadb..ca95bf19088 100644
--- a/Build/source/texk/xdvik/Makefile.am
+++ b/Build/source/texk/xdvik/Makefile.am
@@ -198,16 +198,28 @@ EXTRA_DIST = \
 	xserver-info.c \
 	xserver-info.h
 
-## Original files from xdvik-$(XDVIK_VERSION)
+## Original files from xdvik-22.84.14
 ##
 EXTRA_DIST += \
-	Makefile.in-$(XDVIK_VERSION) \
-	acconfig.h-$(XDVIK_VERSION) \
-	acinclude.m4-$(XDVIK_VERSION) \
-	aclocal.m4-$(XDVIK_VERSION) \
-	configure.in-$(XDVIK_VERSION) \
-	kpathsea.ac-$(XDVIK_VERSION) \
-	withenable.ac-$(XDVIK_VERSION)
+	Makefile.in-22.84.14 \
+	acconfig.h-22.84.14 \
+	acinclude.m4-22.84.14 \
+	aclocal.m4-22.84.14 \
+	configure.in-22.84.14 \
+	kpathsea.ac-22.84.14 \
+	withenable.ac-22.84.14
+
+## Original files from xdvik-22.84.15
+##
+EXTRA_DIST += \
+	Makefile.in-22.84.15 \
+	acconfig.h-22.84.15 \
+	aclocal.m4-22.84.15 \
+	configure.in-22.84.15 \
+	gui/Makefile.in-22.84.15 \
+	kpathsea.ac-22.84.15 \
+	tests/Makefile.in-22.84.15 \
+	withenable.ac-22.84.15
 
 ## Eventually delete these files
 ##
diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in
index 010233990dd..42a164db087 100644
--- a/Build/source/texk/xdvik/Makefile.in
+++ b/Build/source/texk/xdvik/Makefile.in
@@ -43,7 +43,7 @@ DIST_COMMON = $(am__configure_deps) \
 	../../build-aux/config.sub ../../build-aux/depcomp \
 	../../build-aux/install-sh ../../build-aux/ltmain.sh \
 	../../build-aux/missing ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap INSTALL
+	../../build-aux/ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
@@ -246,10 +246,13 @@ EXTRA_DIST = BUGS CHANGES ChangeLog.TL FAQ LESSTIF-BUGS README.t1fonts \
 	translations.h util.c util.h version.h vf.c x_util.c x_util.h \
 	xdvi-config.h xdvi-debug.h xdvi-search.el xdvi-sh.in xdvi.1.in \
 	xdvi.c xdvi.h xdvi.icon xdvizilla xdvizilla.1 xserver-info.c \
-	xserver-info.h Makefile.in-$(XDVIK_VERSION) \
-	acconfig.h-$(XDVIK_VERSION) acinclude.m4-$(XDVIK_VERSION) \
-	aclocal.m4-$(XDVIK_VERSION) configure.in-$(XDVIK_VERSION) \
-	kpathsea.ac-$(XDVIK_VERSION) withenable.ac-$(XDVIK_VERSION) \
+	xserver-info.h Makefile.in-22.84.14 acconfig.h-22.84.14 \
+	acinclude.m4-22.84.14 aclocal.m4-22.84.14 \
+	configure.in-22.84.14 kpathsea.ac-22.84.14 \
+	withenable.ac-22.84.14 Makefile.in-22.84.15 \
+	acconfig.h-22.84.15 aclocal.m4-22.84.15 configure.in-22.84.15 \
+	gui/Makefile.in-22.84.15 kpathsea.ac-22.84.15 \
+	tests/Makefile.in-22.84.15 withenable.ac-22.84.15 \
 	Makefile.in.orig configure.in.orig gui/Makefile.in.orig \
 	kpathsea.ac.orig tests/Makefile.in.orig withenable.ac.orig
 all: c-auto.h
diff --git a/Build/source/texk/xdvik/Makefile.in-22.84.15 b/Build/source/texk/xdvik/Makefile.in-22.84.15
new file mode 100644
index 00000000000..b0bfdd8b4d3
--- /dev/null
+++ b/Build/source/texk/xdvik/Makefile.in-22.84.15
@@ -0,0 +1,243 @@
+# @configure_input@
+# Makefile for xdvik 
+#
+
+kpse_include ../make/paths.mk
+kpse_include ../make/common.mk
+### hack to prevent linking with kpathsea by default
+kpathsea=
+kpse_include ../make/programs.mk
+kpse_include ../make/cross.mk
+
+all_subdirs = gui tests
+
+CPP = @CPP@
+
+# Make `#include <X11/...>' and `-lX...' work.
+# This matches web2c (needed only for Metafont).
+x_cppflags=@X_CFLAGS@ @iconv_includes@
+x_ldflags=@X_LIBS@ @x_linker_options@ @iconv_libpath@
+x_pre_libs=@X_PRE_LIBS@
+x_extra_libs=@X_EXTRA_LIBS@ @iconv_libs@
+x_tool_libs=@x_tool_libs@
+x_xmu_lib=@x_xmu_lib@
+x_xpm_libs=@x_xpm_libs@
+# -lXp and -lXext
+x_ext_lib=@x_ext_lib@
+
+LDLIBT1=@LDLIBT1@
+LIBT1CPPFLAGS=@LIBT1CPPFLAGS@
+LIBT1DEP=@LIBT1DEP@
+LIBT1DIR=../../libs/t1lib
+LIBTYPE1DIR=$(LIBT1DIR)/../type1
+LIBT1SRCDIR=$(srcdir)/$(LIBT1DIR)
+
+# additional flags for kpathsea
+LDLIBKPATHSEA=@LDLIBKPATHSEA@
+LIBKPATHSEACPPFLAGS=@LIBKPATHSEACPPFLAGS@
+LIBKPATHSEADEP=@LIBKPATHSEADEP@
+
+# Follow the library order used in X11R6 itself.
+# It seems that on Cygwin, libXaw needs _XpmReadFileToPixmap, so we put
+# x_xpm_libs after the tool_libs -- but before -lX11, since on MacOSX it
+# uses XGrabServer and XUngrabServer, which would otherwise be
+# unresolved with static libraries.
+# Xmu needs to come before Xt and after the toolkit libs.
+x_link = $(LDLIBT1) $(LDLIBKPATHSEA) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs)
+
+TESTS=./tests/run_tests
+TESTS_DEP=$(TESTS)
+
+# various xdvik GUI elements
+LIBGUI=./gui/libgui.a
+LIBGUIDEP=$(LIBGUI)
+
+
+# Extra xdvi-specific compiler options.
+# xdvi_defs = @PS_DEF@ -DXSERVER_INFO -DNEW_MENU_CREATION
+# xdvi_defs = @PS_DEF@ -DRGB_ANTI_ALIASING
+xdvi_defs = @PS_DEF@ -DXDVI_KPSE_PROG_NAME=@wrapper_script@
+prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBT1CPPFLAGS) $(LIBKPATHSEACPPFLAGS) $(xdvi_defs) \
+-I$(srcdir)/gui $(x_cppflags)
+
+# Note: to be able to use one depend.mk file for both Motif/Xaw (which
+# is needed since only maintainers are supposed to invoke `make depend')
+# we include *all* object files and have tests for #ifdef MOTIF/XAW inside
+# the files.
+objects = \
+    browser.o \
+    dl_list.o \
+    dvi-draw.o \
+    dvi-init.o \
+    dvisel.o \
+    encodings.o \
+    events.o \
+    exit-handlers.o \
+    filehist.o \
+    font-open.o \
+    gf.o \
+    string_list.o \
+    hypertex.o \
+    image-magick.o \
+    main.o \
+    mime.o \
+    my-snprintf.o \
+    my-vsnprintf.o \
+    pagehist.o \
+    pk.o \
+    print-internal.o \
+    psdps.o \
+    psgs.o \
+    psheader.o \
+    psnews.o \
+    read-mapfile.o \
+    search-internal.o \
+    special.o \
+    string-utils.o \
+    tfmload.o \
+    util.o \
+    vf.o \
+    xdvi.o \
+    xserver-info.o \
+    x_util.o
+
+# t1mapper or its man page are currently not being installed, since they
+# aren't needed on most current (teTeX) systems
+perlprog = t1mapper
+manpage = xdvi
+
+default all: libguibuild @final_exec_name@ $(manpage).1
+
+$(LIBGUI):
+	cd gui; $(MAKE) $(makeargs) libgui.a
+
+$(TESTS):
+	cd tests; $(MAKE) $(makeargs)
+
+### we need this additional target so that libgui is always checked to be up-to-date ...
+libguibuild:
+	cd gui; $(MAKE) $(makeargs) libgui.a
+
+test:
+	cd tests; $(MAKE) $(makeargs) test
+
+test_verbose:
+	cd tests; $(MAKE) $(makeargs) test_verbose
+
+@final_exec_name@: $(LIBKPATHSEADEP) $(objects) $(LIBT1DEP) $(LIBGUIDEP)
+	$(kpathsea_link) $(objects) $(LIBGUI) $(x_link) $(LOADLIBES)
+
+squeeze.o: squeeze.c
+	$(build_compile) -c $<
+squeeze: squeeze.o
+	$(build_link_command) squeeze.o
+
+psheader.c: psheader.txt squeeze
+	./squeeze $(srcdir)/psheader.txt $@
+
+$(manpage).1: xdvi.1.in sedscript
+	sed -f sedscript <$(srcdir)/xdvi.1.in >$@
+
+sedscript: mksedscript c-auto.h
+	$(SHELL) $(srcdir)/mksedscript $(srcdir) pkpath sizes vfpath \
+	figpath headerpath $(DEFS) $(prog_cflags) >$@
+
+install: install-exec install-data
+uninstall: uninstall-exec uninstall-data
+
+install-exec: @final_exec_name@
+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+	$(INSTALL_LIBTOOL_PROG) @final_exec_name@ $(bindir)
+	$(INSTALL_SCRIPT) xdvi-sh $(scriptdir)/@wrapper_script@
+	rm -f $(scriptdir)/o@wrapper_script@
+	ln -s @wrapper_script@ $(scriptdir)/o@wrapper_script@
+
+uninstall-exec:
+	for p in @final_exec_name@; do rm -f $(bindir)/$$p; done
+	for p in @wrapper_script@ o@wrapper_script@; do rm -f $(scriptdir)/$$p; done
+
+install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) 
+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps
+	$(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext)
+	rm -f $(man1dir)/o$(manpage).$(manext)
+	ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext)
+	$(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi
+	$(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps
+	if \
+	    grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
+	    || test ! -r $(texmf)/xdvi/xdvi.cfg; \
+	then \
+	    $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi/xdvi.cfg; \
+	else \
+	    true; \
+	fi
+
+uninstall-data:
+	rm -f $(man1dir)/$(manpage).$(manext) \
+		$(texmf)/xdvi/pixmaps/toolbar.xpm $(texmf)/xdvi/pixmaps/toolbar2.xpm \
+		$(texmf)/xdvi/XDvi
+	if \
+	    head -n 1 $(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
+	    || test ! -r $(texmf)/xdvi/xdvi.cfg; \
+	then \
+	    rm -f $(texmf)/xdvi/xdvi.cfg; \
+		else \
+	    true; \
+	fi
+	rmdir $(texmf)/xdvi/pixmaps
+
+distname = xdvik
+program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \
+  MOTIF
+version_files = xdvi.c
+
+pre-dist-$(distname):
+post-dist-$(distname):
+	cd $(top_distdir); rm -f xdvik/psheader.c
+
+kpse_include ../make/dist.mk
+kpse_include ../make/config.mk
+
+info dvi check:
+
+kpse_include ../make/clean.mk
+
+mostlyclean::
+	test ! -r gui/Makefile || test ! -r tests/Makefile \
+	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
+clean::
+	test ! -r gui/Makefile || test ! -r tests/Makefile \
+	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
+distclean::
+	test ! -r gui/Makefile || test ! -r tests/Makefile \
+	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
+extraclean::
+	test ! -r gui/Makefile || test ! -r tests/Makefile \
+	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
+maintainer-clean::
+	test ! -r gui/Makefile || test ! -r tests/Makefile \
+	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
+
+depend::
+	test ! -r gui/Makefile || test ! -r tests/Makefile \
+	  || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done
+
+clean::
+	rm -f $(manpage).1 *.flc @final_exec_name@
+
+distclean::
+	rm -f psheader.c sedscript $(manpage).1 *.flc *~ @final_exec_name@ xdvi-sh
+	test -f $(LIBTYPE1DIR)/Makefile && { cd $(LIBTYPE1DIR); $(MAKE) distclean; } || true
+	test -f $(LIBT1DIR)/Makefile && { cd $(LIBT1DIR); $(MAKE) distclean; } || true
+
+$(LIBT1DIR)/libt1.a:
+	cd $(LIBT1DIR); $(MAKE) $(makeargs) libt1.a
+
+$(LIBTYPE1DIR)/libtype1.a:
+	cd $(LIBTYPE1DIR); $(MAKE) $(makeargs) libtype1.a
+
+
+kpse_include ../make/tkpathsea.mk
+kpse_include ../make/rdepend.mk
+kpse_include depend.mk
diff --git a/Build/source/texk/xdvik/acconfig.h-22.84.15 b/Build/source/texk/xdvik/acconfig.h-22.84.15
new file mode 100644
index 00000000000..91db58ec0cf
--- /dev/null
+++ b/Build/source/texk/xdvik/acconfig.h-22.84.15
@@ -0,0 +1,386 @@
+/* regenerate c-auto.in from acconfig.h with:
+   /usr/bin/autoheader -m ../etc/autoconf
+   then run:
+   /usr/bin/autoconf -m ../etc/autoconf
+*/
+/* c-auto.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if using alloca.c.  */
+#undef C_ALLOCA
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+   This function is required for alloca.c support on those systems.  */
+#undef CRAY_STACKSEG_END
+
+/* Define if you have alloca, as a function or macro.  */
+#undef HAVE_ALLOCA
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
+#undef HAVE_ALLOCA_H
+
+/* Define if you don't have vprintf but do have _doprnt.  */
+#undef HAVE_DOPRNT
+
+/* Define if you have the ANSI # stringizing operator in cpp. */
+#undef HAVE_STRINGIZE
+
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+#undef HAVE_SYS_WAIT_H
+
+/* Define if you have <vfork.h>.  */
+#undef HAVE_VFORK_H
+
+/* Define if you have the vprintf function.  */
+#undef HAVE_VPRINTF
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef pid_t
+
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+#undef size_t
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+#undef STACK_DIRECTION
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define vfork as fork if vfork does not work.  */
+#undef vfork
+
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+#undef WORDS_BIGENDIAN
+
+/* Define if the X Window System is missing or not being used.  */
+#undef X_DISPLAY_MISSING
+
+/* Define if using alloca.c.  */
+#undef C_ALLOCA
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+   This function is required for alloca.c support on those systems.  */
+#undef CRAY_STACKSEG_END
+
+/* Define if you have alloca, as a function or macro.  */
+#undef HAVE_ALLOCA
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
+#undef HAVE_ALLOCA_H
+
+/* Define if you don't have vprintf but do have _doprnt.  */
+#undef HAVE_DOPRNT
+
+/* Define if you have the ANSI # stringizing operator in cpp. */
+#undef HAVE_STRINGIZE
+
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+#undef HAVE_SYS_WAIT_H
+
+/* Define if you have <vfork.h>.  */
+#undef HAVE_VFORK_H
+
+/* Define if you have the vprintf function.  */
+#undef HAVE_VPRINTF
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef pid_t
+
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+#undef size_t
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+#undef STACK_DIRECTION
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define vfork as fork if vfork does not work.  */
+#undef vfork
+
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+#undef WORDS_BIGENDIAN
+
+/* Define if the X Window System is missing or not being used.  */
+#undef X_DISPLAY_MISSING
+
+/* c-auto.in.  Generated from configure.in by autoheader.  */
+/* Define to determine the integer type to be used in bitmaps.  The type used
+   will be "unsigned BMTYPE".  */
+#define BMTYPE int
+
+/* Define to the length (in bytes) of the above type.  */
+#define BMBYTES 4
+
+/* Define if your system has STREAMS (and if X uses it).  */
+#undef HAVE_STREAMS
+
+/* Define if you are using SunOS 4.x.  */
+#undef SUNOS4
+
+/* Define if you are using Linux 2.1.xxx -- 2.2.8,
+   or if you find it necessary.  */
+#undef FLAKY_SIGPOLL
+
+/* Define if your system has <poll.h> and poll().  */
+#undef HAVE_POLL
+
+/* Define to use the Xaw toolkit.  */
+#undef XAW
+
+/* Define to use the Motif toolkit.  */
+#undef MOTIF
+
+/* Define to enable greyscale anti-aliasing for shrunken bitmaps.  */
+#undef GREY
+
+/* Define to enable support for color specials.  */
+#undef COLOR
+
+/* Define to enable gf format files (in addition to pk format).  */
+#undef USE_GF
+
+/* Define to use A4 as the default paper size.  */
+#undef A4
+
+/* Define to use hypertex */
+#undef HTEX
+
+/* Define to use ImageMagick */
+#undef MAGICK
+
+/* ??? */ 
+#undef LDT1LIB
+
+/* Define to compile in t1lib */
+#undef T1LIB
+
+/* Define to compile in t1lib */
+#undef T1LIB
+
+/* Define if your C compiler can do string concatenation */
+#undef HAVE_CC_CONCAT
+
+/* Define if the memicmp() function is in <string.h> */
+#undef HAVE_MEMICMP
+
+/* Define to point to the default command to use for printing (optional).  */
+#undef DEFAULT_DVIPS_PATH
+
+/* Define to point to the default command to use for printing (optional).  */
+#undef DEFAULT_PS2PDF_PATH
+
+/* Define if you have an old version of the Xaw library */
+#undef HAVE_OLD_XAW
+
+/* Define if you want to use the Xpm library */
+#undef USE_XPM
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#undef HAVE_ALLOCA
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+#undef HAVE_ALLOCA_H
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+#undef HAVE_DOPRNT
+
+/* Define to 1 if cpp supports the ANSI # stringizing operator. */
+#undef HAVE_STRINGIZE
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#undef HAVE_SYS_WAIT_H
+
+/* Define to 1 if you have the <vfork.h> header file. */
+#undef HAVE_VFORK_H
+
+/* Define to 1 if you have the `vprintf' function. */
+#undef HAVE_VPRINTF
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
+/* Define to 1 if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
+
+/* Define as `fork' if `vfork' does not work. */
+#undef vfork
+
+/* Define if you have the uint32_t type. */
+#undef HAVE_UINT32_T
+
+/* Define if you have the fchdir function.  */
+#undef HAVE_FCHDIR
+
+/* Define if you have the ftruncate function.  */
+#undef HAVE_FTRUNCATE
+
+/* Define if you have the getcwd function.  */
+#undef HAVE_GETCWD
+
+/* Define if you have the getpwnam function.  */
+#undef HAVE_GETPWNAM
+
+/* Define if you have the getpwuid function.  */
+#undef HAVE_GETPWUID
+
+/* Define if you have the getuid function.  */
+#undef HAVE_GETUID
+
+/* Define if you have the isinf function.  */
+#undef HAVE_ISINF
+
+/* Define if you have the lstat function.  */
+#undef HAVE_LSTAT
+
+/* Define if you have the memcpy function.  */
+#undef HAVE_MEMCPY
+
+/* Define if you have the mkstemp function.  */
+#undef HAVE_MKSTEMP
+
+/* Define if you have the realpath function.  */
+#undef HAVE_REALPATH
+
+/* Define if you have the setenv function.  */
+#undef HAVE_SETENV
+
+/* Define if you have the sigaction function.  */
+#undef HAVE_SIGACTION
+
+/* Define if you have the snprintf function.  */
+#undef HAVE_SNPRINTF
+
+/* Define if you have the strchr function.  */
+#undef HAVE_STRCHR
+
+/* Define if you have the strerror function.  */
+#undef HAVE_STRERROR
+
+/* Define if you have the ulltostr function.  */
+#undef HAVE_ULLTOSTR
+
+/* Define if you have the vsnprintf function.  */
+#undef HAVE_VSNPRINTF
+
+/* Define if the vsnprintf function works.  */
+#undef HAVE_GOOD_VSNPRINTF
+
+/* Define if your system allows setsid() within vfork().  */
+#undef HAVE_GOOD_SETSID_VFORK
+
+/* Define if your system allows multiple definitions of functions.  */
+#undef LD_ALLOWS_MULTIPLE_DEFINITIONS
+
+/* Define if you have the waitpid function.  */
+#undef HAVE_WAITPID
+
+/* Define if you have the <X11/Xmu/Editres.h> header file.  */
+#undef HAVE_X11_XMU_EDITRES_H
+
+/* Define if you have the <X11/Xosdefs.h> header file.  */
+#undef HAVE_X11_XOSDEFS_H
+
+/* Define if you have the <X11/xpm.h> header file.  */
+#undef HAVE_X11_XPM_H
+
+/* Define if you have the <Xm/XpmP.h> header file.  */
+#undef HAVE_XM_XPMP_H
+
+/* Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8).  */
+#undef HAVE_XPM_H
+
+/* Define if you have the <iconv.h> header file.  */
+#undef HAVE_ICONV_H
+
+/* Define if you have the iconv function.  */
+#undef HAVE_ICONV
+
+/* Define the type of the iconv input string (char ** or const char **) */
+#undef ICONV_CHAR_PPTR_TYPE
+
+/* Define if you have the <ieeefp.h> header file.  */
+#undef HAVE_IEEEFP_H
+
+/* Define if you have the <netdb.h> header file.  */
+#undef HAVE_NETDB_H
+
+/* Define if you have the <regex.h> header file.  */
+#undef HAVE_REGEX_H
+
+/* Define if you have the <select.h> header file.  */
+#undef HAVE_SELECT_H
+
+/* Define if you have the <sys/bsdtypes.h> header file.  */
+#undef HAVE_SYS_BSDTYPES_H
+
+/* Define if you have the <sys/fcntl.h> header file.  */
+#undef HAVE_SYS_FCNTL_H
+
+/* Define if you have the <sys/param.h> header file.  */
+#undef HAVE_SYS_PARAM_H
+
+/* Define if you have the <sys/select.h> header file.  */
+#undef HAVE_SYS_SELECT_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if the CODESET argument to nl_langinfo works.  */
+#undef HAVE_WORKING_NL_LANGINFO_CODESET
+
+/* Define to use Xaw panner. */
+#undef USE_XAW_PANNER
+
+/* Define to use libXp. */
+#undef HAVE_LIB_XP
+
diff --git a/Build/source/texk/xdvik/aclocal.m4-22.84.15 b/Build/source/texk/xdvik/aclocal.m4-22.84.15
new file mode 100644
index 00000000000..dc4510bfb9c
--- /dev/null
+++ b/Build/source/texk/xdvik/aclocal.m4-22.84.15
@@ -0,0 +1,18 @@
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_include([../m4/kpse_cross.m4])
+m4_include([../m4/kpse_inc.m4])
+m4_include([../m4/kpse_maint.m4])
+m4_include([../m4/kpse_subdirs.m4])
+m4_include([acinclude.m4])
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 52eab1afa54..bbcd980328b 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xdvik for TeX Live 22.84.14.
+# Generated by GNU Autoconf 2.63 for xdvik for TeX Live 22.84.15.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xdvik for TeX Live'
 PACKAGE_TARNAME='xdvik-for-tex-live'
-PACKAGE_VERSION='22.84.14'
-PACKAGE_STRING='xdvik for TeX Live 22.84.14'
+PACKAGE_VERSION='22.84.15'
+PACKAGE_STRING='xdvik for TeX Live 22.84.15'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 
 ac_unique_file="xdvi.c"
@@ -1484,7 +1484,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xdvik for TeX Live 22.84.14 to adapt to many kinds of systems.
+\`configure' configures xdvik for TeX Live 22.84.15 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1555,7 +1555,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xdvik for TeX Live 22.84.14:";;
+     short | recursive ) echo "Configuration of xdvik for TeX Live 22.84.15:";;
    esac
   cat <<\_ACEOF
 
@@ -1666,7 +1666,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xdvik for TeX Live configure 22.84.14
+xdvik for TeX Live configure 22.84.15
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1680,7 +1680,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xdvik for TeX Live $as_me 22.84.14, which was
+It was created by xdvik for TeX Live $as_me 22.84.15, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -6773,7 +6773,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xdvik-for-tex-live'
- VERSION='22.84.14'
+ VERSION='22.84.15'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13182,7 +13182,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-xdvik for TeX Live config.lt 22.84.14
+xdvik for TeX Live config.lt 22.84.15
 configured by $0, generated by GNU Autoconf 2.63.
 
 Copyright (C) 2008 Free Software Foundation, Inc.
@@ -14221,7 +14221,7 @@ ${top_builddir}/../../libs/t1lib/t1lib.h:
 fi
 
 
-XDVIK_VERSION=22.84.14
+XDVIK_VERSION=22.84.15
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -14667,7 +14667,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xdvik for TeX Live $as_me 22.84.14, which was
+This file was extended by xdvik for TeX Live $as_me 22.84.15, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14730,7 +14730,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-xdvik for TeX Live config.status 22.84.14
+xdvik for TeX Live config.status 22.84.15
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac
index f43fd506c7d..666a249e7d6 100644
--- a/Build/source/texk/xdvik/configure.ac
+++ b/Build/source/texk/xdvik/configure.ac
@@ -6,7 +6,7 @@ dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([xdvik_version], [22.84.14])
+m4_define([xdvik_version], [22.84.15])
 AC_INIT([xdvik for TeX Live], xdvik_version, [tex-k@tug.org])
 AC_PREREQ([2.63])
 AC_CONFIG_SRCDIR([xdvi.c])
diff --git a/Build/source/texk/xdvik/configure.in-22.84.15 b/Build/source/texk/xdvik/configure.in-22.84.15
new file mode 100644
index 00000000000..17c3d732bf6
--- /dev/null
+++ b/Build/source/texk/xdvik/configure.in-22.84.15
@@ -0,0 +1,316 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl e.g.:
+dnl /usr/bin/autoconf -I../etc/autoconf configure.in > configure        
+dnl the -I argument is neccessary to make the non-standard `ac_include'
+dnl extension (acsite.m4) available to autoconf.        
+AC_INIT(xdvi.c)
+AC_PREREQ(2.59)
+
+AC_CONFIG_HEADER([c-auto.h:c-auto.in], [date >stamp-auto])
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_PROG_LN_S
+AC_PROG_RANLIB
+
+dnl allow for  --program-suffix
+AC_ARG_PROGRAM
+
+sinclude(../kpathsea/withenable.ac)
+sinclude(../../withenable.ac)
+sinclude(kpathsea.ac)
+
+if test "x$with_mktexpk_default" = "xno"; then
+    AC_MSG_WARN(Xdvik doesn't implement the --without-mktexpk-default option!)
+fi
+
+if test "x$with_mktexmf_default" = "xno"; then
+    AC_MSG_WARN(Xdvik doesn't implement the --without-mktexmf-default option!)
+fi
+
+if test "x$with_mktextfm_default" = "xno"; then
+    AC_MSG_WARN(Xdvik doesn't implement the --without-mktextfm-default option!)
+fi
+
+if test "x$with_mkocp_default" = "xno"; then
+    AC_MSG_WARN(Xdvik doesn't implement the --without-mkocp-default option!)
+fi
+
+if test "x$with_mkofm_default" = "xno"; then
+    AC_MSG_WARN(Xdvik doesn't implement the --without-mkofm-default option!)
+fi
+
+AC_FUNC_VFORK
+AC_FUNC_VPRINTF
+dnl begin additions SU, 2000/03/07
+dnl AC_FUNC_VSNPRINTF
+XDVI_FUNC_WORKING_VSNPRINTF
+AC_FUNC_MEMICMP
+dnl AC_FUNC_REALPATH
+AC_FUNC_ALLOCA
+AC_C_STRINGIZE
+dnl end additions SU
+AC_FUNC_MEMCMP
+AC_HEADER_SYS_WAIT
+AC_TYPE_SIGNAL
+AC_C_BIGENDIAN
+dnl Put here by Thomas Esser for teTeX.  This causes some tests to be run
+dnl twice by the kps version.
+AC_PATH_XTRA
+AC_TYPE_SIZE_T
+
+dnl XDVI checks by Paul Vojta
+XDVI_FUNC_SETSID_IN_VFORK
+XDVI_CC_CONCAT
+XDVI_C_BITMAP_TYPE
+XDVI_SYS_STREAMS
+XDVI_SYS_SUNOS_4
+XDVI_SYS_OLD_LINUX
+XDVI_FUNC_POLL
+	
+dnl SU: added flags to turn on gcc warnings, taken from gnome/compiler-flags.m4 and put into aclocal.m4
+COMPILER_WARNINGS
+
+dnl SU: for `--allow-multiple-definition' linker flag on Cygwin	
+XDVI_LINKER_MULTIPLE_DEFNS
+
+AC_CHECK_HEADERS(stdint.h inttypes.h)
+AC_CHECK_TYPE(uint32_t, unsigned long)
+AC_CHECK_TYPE(ptrdiff_t, long)
+
+
+dnl These were probably missing from the test-set?
+dnl On the other hand, they are not used already, why start now? -janl
+dnl AC_TYPE_OFF_T
+dnl AC_HEADER_TIME
+
+AC_CHECK_FUNCS(mkstemp memcpy strerror waitpid sigaction strchr setenv ulltostr \
+		fchdir getcwd getpwnam getuid getpwuid \
+		iconv nl_langinfo \
+		lstat ftruncate snprintf vsnprintf realpath)
+
+dnl <sys/bsdtypes.h> is for ISC 4.0, to define fd_set in psgs.c.
+dnl regex.h is needed for regexp support in DVI search.    
+AC_CHECK_HEADERS(netdb.h sys/bsdtypes.h sys/param.h unistd.h sys/fcntl.h regex.h iconv.h langinfo.h)
+			 
+cppflags_save=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+AC_CHECK_HEADERS(X11/Intrinsic.h X11/Xosdefs.h X11/xpm.h Xm/XpmP.h)
+CPPFLAGS=$cppflags_save
+
+dnl For editres, we need to check both the header and define a linker option.
+cppflags_save=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+AC_CHECK_HEADERS(X11/Xmu/Editres.h X11/Xmu/Xmu.h, x_xmu_lib=-lXmu, x_xmu_lib=,
+[
+#ifdef HAVE_X11_INTRINSIC_H	  
+# include <X11/Intrinsic.h>
+#endif
+])
+AC_SUBST(x_xmu_lib)
+CPPFLAGS=$cppflags_save
+
+dnl For the bitmap size. -- I think this is in XDVI_C_BITMAP_TYPE now -janl
+dnl AC_CHECK_SIZEOF(long)
+
+sinclude(../kpathsea/xt.ac)
+sinclude(withenable.ac)
+sinclude(../../libs/t1lib/withenable.ac)
+sinclude(../../libs/t1lib/t1lib.ac)
+
+dnl check for Xaw version
+XDVI_OLD_XAW
+
+dnl nl_langinfo checks
+AC_MSG_CHECKING(if nl_langinfo(CODESET) is working)
+AC_TRY_LINK([#include <langinfo.h>], [char* cs = nl_langinfo(CODESET);],
+ [AC_DEFINE([HAVE_WORKING_NL_LANGINFO_CODESET], 1,
+   [Define if the CODESET argument to nl_langinfo works.])
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
+)
+
+dnl First, check for libXp and libXext:
+if test -z "$x_ext_lib"; then # allow envvar override
+  if test -n "$x_libraries"; then
+    XLFLAG="-L$x_libraries"
+  else
+    XLFLAG=
+  fi
+  AC_CHECK_LIB(Xp, XpQueryVersion,
+               x_ext_lib="-lXp -lXext", :, -lXext -lX11 $X_EXTRA_LIBS $XLFLAG)
+fi
+dnl
+dnl If libXp not found, try libXext only:
+dnl
+if test -z "$x_ext_lib"; then # previous test unsuccessful, or envvar override
+  if test -n "$x_libraries"; then
+    XLFLAG="-L$x_libraries"
+  else
+    XLFLAG=
+  fi
+  AC_CHECK_LIB(Xext, XextCreateExtension,
+               x_ext_lib=-lXext, :, -lX11 $X_EXTRA_LIBS $XLFLAG)
+fi
+AC_SUBST(x_ext_lib)
+
+dnl For --with-x-toolkit. Must be Xaw at least. If no --with-x-toolkit is given,
+dnl we try to check if Motif is available, and if yes, use it; else,
+dnl we use Xaw (--with-x-toolkit=xaw can be used to override this default).
+
+dnl Check whether -lXpm can be used	
+XDVI_FIND_XPM
+
+dnl Check which X toolkit to use
+prog_extension="xaw"
+motif_include=
+motif_libdir=
+AC_ARG_WITH([motif-include],
+[  --with-motif-include=DIR
+                          Specify the location of Motif include files],
+[motif_include="$withval"])
+AC_ARG_WITH([motif-libdir],
+[  --with-motif-libdir=DIR
+                          Specify the location of Motif libraries],
+[motif_libdir="$withval"])
+
+if test "x$with_xdvi_x_toolkit" = xxaw3d; then
+   prog_extension="xaw3d"
+   x_tool_libs="-lXaw3d"
+elif test "x$with_xdvi_x_toolkit" = xneXtaw; then
+   prog_extension="nextaw"
+   x_tool_libs="-lneXtaw"
+elif test "x$with_xdvi_x_toolkit" = xmotif; then
+dnl Motif with no fallback
+dnl XDVI_FIND_MOTIF also defines $prog_extension, AC_DEFINE(toolkit) and $x_tool_libs
+   XDVI_FIND_MOTIF(none, "$motif_include", "$motif_libdir")
+elif test "x$with_xdvi_x_toolkit" = xxaw; then
+   prog_extension="xaw"
+   AC_DEFINE([XAW], 1, [Define to use the Xaw toolkit.])
+   x_tool_libs="-lXaw"
+else
+dnl Motif with xaw as fallback
+dnl XDVI_FIND_MOTIF also defines $prog_extension, AC_DEFINE(toolkit) and $x_tool_libs
+   XDVI_FIND_MOTIF(Xaw, "$motif_include", "$motif_libdir")
+fi
+AC_SUBST(x_tool_libs)
+
+AC_ARG_WITH([iconv-libdir],
+[  --with-iconv-libdir=DIR
+                          Specify the location of iconv library (librecode.so)],
+[if test XXX"$withval" != "XXX"; then
+    iconv_libpath="-L$withval"
+    iconv_libs="-lrecode"
+else
+    iconv_libpath=
+    iconv_libs=	    
+fi], [
+dnl On non-Linux systems, -liconv is needed. Check for both iconv_open and libiconv_open.
+iconv_libpath=
+iconv_libs=	
+AC_CHECK_LIB(iconv, iconv_open, iconv_libs=-liconv,
+		    AC_CHECK_LIB(iconv, libiconv_open, iconv_libs=-liconv,iconv_libs=,)
+		    ,)     
+])
+if test XXX"$iconv_libs" != "XXX"; then
+   AC_DEFINE(HAVE_ICONV)
+fi    	
+AC_SUBST(iconv_libpath)
+AC_SUBST(iconv_libs)
+
+AC_ARG_WITH([iconv-include],
+[  --with-iconv-include=DIR
+                          Specify the location of iconv header (iconv.h)],
+[if test XXX"$withval" != "XXX"; then
+    iconv_includes="-I$withval"
+fi],[
+iconv_includes=
+])
+AC_SUBST(iconv_includes)
+
+XDVI_ICONV_CHAR_PPTR_TYPE
+
+dnl We try to perform the $program_transform_name replacement already
+dnl here, and AC_SUBST the final names into the Makefile; this makes
+dnl the compilation commands more readable and causes less problems with
+dnl backtick magic inside other commands.
+dnl
+dnl For some reason, the doubling of $$ and \\ must be reverted here:
+my_program_transform_name=`echo $program_transform_name | sed 's,\\$\\$,$,g' | sed 's,\\\\\\\\,\\\\,g'`
+exec_name="xdvi-$prog_extension"
+final_exec_name=`echo $exec_name | sed "$my_program_transform_name"`
+dnl OBSOLETE?? exec_link=`echo xdvi.bin | sed "$my_program_transform_name"`		
+wrapper_script=`echo xdvi | sed "$my_program_transform_name"`		
+AC_SUBST(exec_name)
+AC_SUBST(final_exec_name)
+dnl OBSOLETE?? AC_SUBST(exec_link)
+AC_SUBST(wrapper_script)
+
+dnl
+dnl Tests for different application setup features follow.
+dnl
+
+dnl For --with-ps.
+test -z "$PS_DEF" && PS_DEF=-DPS_GS
+test "$PS_DEF" = no && PS_DEF=
+AC_SUBST(PS_DEF)dnl
+dnl
+dnl If we're on Solaris and we want DPS, then add the extra compilation stuff
+dnl to get it.
+if echo "$PS_DEF" | grep PS_DPS >/dev/null; then
+   if test "`(uname) 2>/dev/null`" = SunOS \
+      && uname -r | grep '^5' >/dev/null; then
+    AC_MSG_RESULT(adding DPS includes and libraries for Solaris)
+    X_CFLAGS="$X_CFLAGS -I/usr/openwin/include/X11"
+    AC_CHECK_LIB(sunmath, isinf, ac_sunmath=-lsunmath, ac_sunmath="")
+    X_LIBS="$X_LIBS -R/usr/openwin/lib /usr/openwin/lib/libdps.so $ac_sunmath"
+    dnl We only need isinf and ieeefp.h to work around a Solaris bug in
+    dnl -ldps; see psdps.c.  isinf is in -lsunmath.
+    AC_CHECK_FUNCS(isinf)
+    AC_CHECK_HEADERS(ieeefp.h)
+  else
+    dnl SunOS 4.x is simpler.
+    AC_MSG_RESULT(adding DPS includes and libraries for SunOS 4.x)
+    X_LIBS="$X_LIBS -ldps"
+  fi
+elif echo "$PS_DEF" | grep PS_NEWS >/dev/null; then
+    AC_MSG_RESULT(adding NeWS libraries)
+    X_LIBS="$X_LIBS -lxview -lcps -lolgx -lxvps"
+fi
+
+XDVI_ARG_STRING([default-dvips-path],
+[  --with-default-dvips-path=CMD
+                          Use CMD as default DVI to PS converter],
+[DEFAULT_DVIPS_PATH], ["dvips"],
+[Define to point to the default command to use for printing (optional).])
+
+XDVI_ARG_STRING([default-ps2pdf-path],
+[  --with-default-ps2pdf-path=CMD
+                          Use CMD as default PS to PDF converter],
+[DEFAULT_PS2PDF_PATH], ["ps2pdf"],
+[Define to point to the default command to use for printing (optional).])
+
+dnl ImageMagick support
+PS_DEF="$PS_DEF $MAGICK_DEF"
+if echo "$PS_DEF" | grep MAGICK >/dev/null; then
+    AC_MSG_RESULT(adding ImageMagick libraries)
+    X_EXTRA_LIBS="$X_EXTRA_LIBS `Magick-config --libs`"
+fi
+
+# needed for web2c later than 7.3.4:
+AC_CHECK_LIB(m, main)
+AC_C_CONST()
+
+# If you're cross-compiling, these macros set up the variables in
+# ../make/cross.mk: BUILDCC, BUILDCFLAGS, BUILDCCLD etc.  These are
+# near the end so people have some chance of seeing them.
+KPSE_CROSS_BUILD_VAR(CC, cc)
+KPSE_CROSS_BUILD_VAR(CFLAGS, $(BUILDXCFLAGS))
+KPSE_CROSS_BUILD_VAR(CPPFLAGS, $(BUILDXCPPFLAGS))
+KPSE_CROSS_BUILD_VAR(LDFLAGS, $(BUILDXLDFLAGS))
+KPSE_CROSS_BUILD_VAR(CCLD, $(BUILDCC))
+
+KPSE_CONFIG_FILES([Makefile gui/Makefile tests/Makefile])
+AC_CONFIG_FILES([xdvi-sh])
+AC_OUTPUT
diff --git a/Build/source/texk/xdvik/events.c b/Build/source/texk/xdvik/events.c
index 1a5024953cd..ee7ae16779b 100644
--- a/Build/source/texk/xdvik/events.c
+++ b/Build/source/texk/xdvik/events.c
@@ -704,14 +704,14 @@ home(wide_bool scrl)
 
 	if (coord > resource.sidemargin_int / mane.shrinkfactor)
 	    coord = resource.sidemargin_int / mane.shrinkfactor;
-	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, (XtPointer) (m_window_x + coord));
+	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, cast_int_to_XtPointer(m_window_x + coord));
     }
     if (globals.widgets.y_bar != NULL) {
 	int coord = (globals.page.h - mane.height) / 2;
 
 	if (coord > resource.topmargin_int / mane.shrinkfactor)
 	    coord = resource.topmargin_int / mane.shrinkfactor;
-	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, (XtPointer) (m_window_y + coord));
+	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, cast_int_to_XtPointer(m_window_y + coord));
     }
 # endif /* MOTIF */
     if (!scrl) {
@@ -754,10 +754,10 @@ home_bottom(wide_bool scrl)
 
 	if (coord > resource.sidemargin_int / mane.shrinkfactor)
 	    coord = resource.sidemargin_int / mane.shrinkfactor;
-	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, (XtPointer) (m_window_x + coord));
+	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, cast_int_to_XtPointer(m_window_x + coord));
     }
     if (globals.widgets.y_bar != NULL)
-	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, (XtPointer)(m_window_y + (globals.page.h - mane.height)));
+	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, cast_int_to_XtPointer(m_window_y + (globals.page.h - mane.height)));
 #endif /* MOTIF */
     XMapWindow(DISP, mane.win);
     /* Wait for the server to catch up---this eliminates flicker. */
@@ -862,7 +862,7 @@ get_geom(void)
 	    curr_scroll = d - m_window_x;
 	    if (m_x_scroll > curr_scroll) {
 		TRACE_GUI((stderr, "======== diff: %d", m_x_scroll - curr_scroll));
-		XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, (XtPointer)(m_x_scroll - curr_scroll));
+		XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, cast_int_to_XtPointer(m_x_scroll - curr_scroll));
 	    }
 #endif
 	}
@@ -875,7 +875,7 @@ get_geom(void)
 	    curr_scroll = d - m_window_y;
 	    if (m_y_scroll > curr_scroll) {
 		TRACE_GUI((stderr, "======== diff: %d", m_y_scroll - curr_scroll));
-		XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, (XtPointer)(m_y_scroll - curr_scroll));
+		XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, cast_int_to_XtPointer(m_y_scroll - curr_scroll));
 	    }
 #endif
 	}
@@ -1882,9 +1882,9 @@ Act_center(Widget w, XEvent *event,
     y = event->xkey.y - mane.height / 2;
     /* The clip widget gives a more exact value. */
     if (globals.widgets.x_bar != NULL)
-	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, (XtPointer) x);
+	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, cast_int_to_XtPointer(x));
     if (globals.widgets.y_bar != NULL)
-	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, (XtPointer) y);
+	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, cast_int_to_XtPointer(y));
     XWarpPointer(DISP, None, None, 0, 0, 0, 0, -x, -y);
 #endif
 #ifdef USE_PANNER
@@ -1993,8 +1993,8 @@ Act_left(Widget w, XEvent *event,
 #else
     if (globals.widgets.x_bar != NULL)
 	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc,
-			(XtPointer) (*num_params == 0 ? (-2 * (int)mane.width / 3)
-				     : (int)(-my_atof(*params) * mane.width)));
+			cast_int_to_XtPointer(*num_params == 0 ? (-2 * (int)mane.width / 3)
+					      : (int)(-my_atof(*params) * mane.width)));
     else {
 	xdvi_bell();
 /* 	statusline_info(STATUS_SHORT, "Horizontal scrolling not possible"); */
@@ -2029,8 +2029,8 @@ Act_right(Widget w, XEvent *event,
 #else
     if (globals.widgets.x_bar != NULL)
 	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc,
-			(XtPointer) (*num_params == 0 ? (2 * (int)mane.width / 3)
-				     : (int)(my_atof(*params) * mane.width)));
+			cast_int_to_XtPointer(*num_params == 0 ? (2 * (int)mane.width / 3)
+					      : (int)(my_atof(*params) * mane.width)));
     else {
 	xdvi_bell();
 /* 	statusline_info(STATUS_SHORT, "Horizontal scrolling not possible"); */
@@ -2063,8 +2063,8 @@ Act_up(Widget w, XEvent *event,
 #else
     if (globals.widgets.y_bar != NULL)
 	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
-			(XtPointer) (*num_params == 0 ? (-2 * (int)mane.height / 3)
-				     : (int)(-my_atof(*params) * mane.height)));
+			cast_int_to_XtPointer(*num_params == 0 ? (-2 * (int)mane.height / 3)
+					      : (int)(-my_atof(*params) * mane.height)));
     else {
 	xdvi_bell();
 /* 	statusline_info(STATUS_SHORT, "Vertical scrolling not possible"); */
@@ -2097,8 +2097,8 @@ Act_down(Widget w, XEvent *event,
 #else
     if (globals.widgets.y_bar != NULL)
 	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
-			(XtPointer) (*num_params == 0 ? (2 * (int)mane.height / 3)
-				     : (int)(my_atof(*params) * mane.height)));
+			cast_int_to_XtPointer(*num_params == 0 ? (2 * (int)mane.height / 3)
+					      : (int)(my_atof(*params) * mane.height)));
     else {
 	xdvi_bell();
 /* 	statusline_info(STATUS_SHORT, "Vertical scrolling not possible"); */
@@ -2137,9 +2137,9 @@ Act_down_or_next(Widget w, XEvent *event,
 	get_xy();
 	if (m_window_y > (int)mane.height - (int)globals.page.h) {
 	    XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
-			    (XtPointer) (*num_params ==
-					 0 ? (2 * (int)mane.height / 3)
-					 : (int)(my_atof(*params) * mane.height)));
+			    cast_int_to_XtPointer(*num_params ==
+						  0 ? (2 * (int)mane.height / 3)
+						  : (int)(my_atof(*params) * mane.height)));
 	    return;
 	}
     }
@@ -2188,9 +2188,9 @@ Act_up_or_previous(Widget w, XEvent *event,
 	get_xy();
 	if (m_window_y < 0) {
 	    XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
-			    (XtPointer) (*num_params ==
-					 0 ? (-2 * (int)mane.height / 3)
-					 : (int)(-my_atof(*params) * mane.height)));
+			    cast_int_to_XtPointer(*num_params ==
+						  0 ? (-2 * (int)mane.height / 3)
+						  : (int)(-my_atof(*params) * mane.height)));
 	    return;
 	}
     }
@@ -2353,7 +2353,7 @@ Act_mouse_modes(Widget w, XEvent *event,
 	    XDVI_WARNING((stderr, "Only %d parameters in X resource 'mouse-modes', should be %d",
 			  *num_params, resource.mouse_mode + 1));
 	    for (k = 0; k < *num_params; k++) {
-		XDVI_WARNING((stderr, "Param %d: `%s'", k + 1, params[k]));
+		XDVI_WARNING((stderr, "Param %d: `%s'", (int)(k + 1), params[k]));
 	    }
 	    return;
 	}
@@ -2362,9 +2362,9 @@ Act_mouse_modes(Widget w, XEvent *event,
 
     my_action = compile_action(params[mode_idx]);
     for (i = 0, ap = my_action; ap; ap = ap->next, i++) {
+	TRACE_EVENTS((stderr, "Action %d for mode %lu: '%s', %d args |%s| maps to proc |%p|",
+		      i, (unsigned long)mode_idx, ap->command, ap->num_params, ap->param, ap->proc));
 	String args[1];
-	TRACE_EVENTS((stderr, "Action %d for mode %d: '%s', %d args |%s| maps to proc |%p|",
-		      i, mode_idx, ap->command, ap->num_params, ap->param, ap->proc));
 	args[0] = ap->param;
 
 	/* now call the action proc directly */
@@ -2635,7 +2635,7 @@ static void h_restore_scroll_position(int orig_pos,
 	XtVaGetValues(globals.widgets.clip_widget, XtNx, get_pos, NULL);
 	curr_pos = -((*get_pos) - m_window_x);
 	if (curr_pos - orig_pos > 0) {
-	    XtCallCallbacks(scrollbar, XtNscrollProc, (XtPointer)(curr_pos - orig_pos));
+	    XtCallCallbacks(scrollbar, XtNscrollProc, cast_int_to_XtPointer(curr_pos - orig_pos));
 	}
 #endif /* MOTIF */
     }
@@ -3434,7 +3434,7 @@ drag_motion(XEvent * event)
 #else
 	if (globals.widgets.x_bar != NULL) {
 	    XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc,
-			    (XtPointer) (drag_last_x - event->xbutton.x_root));
+			    cast_int_to_XtPointer(drag_last_x - event->xbutton.x_root));
 	}
 #endif
 	drag_last_x = event->xbutton.x_root;
@@ -3448,7 +3448,7 @@ drag_motion(XEvent * event)
 #else
 	if (globals.widgets.y_bar != NULL) {
 	    XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
-			    (XtPointer) (drag_last_y - event->xbutton.y_root));
+			    cast_int_to_XtPointer(drag_last_y - event->xbutton.y_root));
 	}
 #endif
 	drag_last_y = event->xbutton.y_root;
@@ -3496,7 +3496,7 @@ Act_wheel(Widget w, XEvent *event,
     set_bar_value(globals.widgets.y_bar, dist - m_window_y, (int)(globals.page.h - mane.height));
 #else
     if (globals.widgets.y_bar != NULL)
-	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, (XtPointer) dist);
+	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, cast_int_to_XtPointer(dist));
 #endif
 
     wheel_button = event->xbutton.button;
@@ -5048,7 +5048,7 @@ read_events(unsigned int ret_mask)
 	    get_geom();
 
 	if (event.xany.window == magnifier.win && event.type == Expose) {
-	    handle_expose((Widget) NULL, (XtPointer) &magnifier, &event,
+	    handle_expose((Widget) NULL, (XtPointer)&magnifier, &event,
 			  (Boolean *) NULL);
 	    continue;
 	}
diff --git a/Build/source/texk/xdvik/gui/Makefile.in-22.84.15 b/Build/source/texk/xdvik/gui/Makefile.in-22.84.15
new file mode 100644
index 00000000000..125e595dfcb
--- /dev/null
+++ b/Build/source/texk/xdvik/gui/Makefile.in-22.84.15
@@ -0,0 +1,84 @@
+# @configure_input@
+# Makefile for xdvik 
+#
+# - 1999/05/08: janl: Removed submakes for libwww and kpathsea.  That's what
+#   the top makefile is for!
+#
+
+
+### NOTE: kpse_include paths must be relative to texk/xdvik, since that
+### is from where the configure is run!
+kpse_include ../make/paths.mk
+kpse_include ../make/library.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
+
+kpathsea_parent = ../..
+
+# additional flags for kpathsea
+LIBKPATHSEACPPFLAGS=@LIBKPATHSEACPPFLAGS@
+
+CPP = @CPP@
+RANLIB = @RANLIB@
+
+# Make `#include <X11/...>' and `-lX...' work.
+# This matches web2c (needed only for Metafont).
+x_cppflags = @X_CFLAGS@
+
+# Extra xdvi-specific compiler options.
+ps_def = @PS_DEF@ -DXSERVER_INFO
+prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBKPATHSEACPPFLAGS) -I.. -I$(srcdir)/.. $(x_cppflags) $(ps_def)
+
+# Note: to be able to use one depend.mk file for both Motif/Xaw (which
+# is needed since only maintainers are supposed to invoke `make depend')
+# we include *all* object files and have tests for #ifdef MOTIF/XAW inside
+# the files.
+objects = \
+    help-window.o \
+    message-window.o \
+    mag.o \
+    menu.o \
+    Panner.o \
+    pagesel.o \
+    print-dialog.o \
+    print-log.o \
+    search-dialog.o \
+    selection.o \
+    sfDir.o \
+    sfDraw.o \
+    sfPath.o \
+    sfSelFile.o \
+    statusline.o \
+    Tip.o \
+    topic-window.o \
+    xaw_bitmaps.o \
+    xaw_menu.o \
+    xicon.o \
+    xlwradio.o \
+    xm_colorsel.o \
+    xm_filesel.o \
+    xm_menu.o \
+    xm_prefs.o \
+    xm_prefs_appearance.o \
+    xm_prefs_fonts.o \
+    xm_prefs_page.o \
+    xm_prefs_scroll.o \
+    xm_prefs_helpers.o \
+    xm_toolbar.o
+
+libgui.a: $(objects)
+### hmm, I don't understand ar ... sometimes objects were NOT replaced.
+### Play it safe and always remove the archive before creating new one.
+	rm -f $@
+	$(AR) $(ARFLAGS) $@ $(objects)
+	$(RANLIB) $@
+
+kpse_include ../make/dist.mk
+kpse_include ../make/clean.mk
+
+clean::
+	rm -f *.o *.a
+
+c_auto_h_dir = ..
+kpse_include ../make/rdepend.mk
+kpse_include ./gui/depend.mk
diff --git a/Build/source/texk/xdvik/gui/Tip.c b/Build/source/texk/xdvik/gui/Tip.c
index 1033a54cc29..d0d7cd328a0 100644
--- a/Build/source/texk/xdvik/gui/Tip.c
+++ b/Build/source/texk/xdvik/gui/Tip.c
@@ -131,10 +131,10 @@ static XtResource resources[] = {
      XtRString, "fixed"},
     {XmNwaitPeriod, XmCWaitPeriod,
      XtRInt, sizeof(int), offset(tip.waitPeriod),
-     XtRImmediate, (XtPointer) 800},
+     XtRImmediate, (XtPointer)(ptrdiff_t)800},
     {XmNcancelWaitPeriod, XmCCancelWaitPeriod,
      XtRInt, sizeof(int), offset(tip.cwp),
-     XtRImmediate, (XtPointer) 250},
+     XtRImmediate, (XtPointer)(ptrdiff_t)250},
 };
 #undef offset
 
diff --git a/Build/source/texk/xdvik/gui/depend.mk b/Build/source/texk/xdvik/gui/depend.mk
deleted file mode 100644
index 29339a59251..00000000000
--- a/Build/source/texk/xdvik/gui/depend.mk
+++ /dev/null
@@ -1,1286 +0,0 @@
-Panner.o: Panner.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h
-Tip.o: Tip.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  Tip.h \
-  ../xdvi-debug.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h
-help-window.o: help-window.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../version.h \
-  message-window.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../x_util.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  ../util.h \
-  topic-window.h \
-  help-window.h
-mag.o: mag.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../c-openmx.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../events.h \
-  ../dvi-draw.h \
-  ../dvi-init.h \
-  statusline.h \
-  ../hypertex.h \
-  mag.h \
-  xm_toolbar.h \
-  xm_menu.h \
-  menu.h \
-  xaw_menu.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  pagesel.h
-menu.o: menu.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../events.h \
-  menu.h \
-  xm_menu.h \
-  xaw_menu.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h 
-message-window.o:  \
- message-window.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../util.h \
-  ../x_util.h \
-  message-window.h
-pagesel.o: pagesel.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  xm_toolbar.h \
-  xm_menu.h \
-  menu.h \
-  ../events.h \
-  xaw_menu.h \
-  ../x_util.h \
-  message-window.h \
-  pagesel.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  ../util.h \
-  ../dvi-init.h \
-  statusline.h \
-  print-dialog.h \
-  ../print-internal.h \
-  ../dvi-init.h \
-  ../search-internal.h \
-  search-dialog.h \
-  ../dvisel.h \
-  ../print-internal.h \
-  ../pagehist.h
-print-dialog.o: print-dialog.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../my-vsnprintf.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  print-dialog.h \
-  ../print-internal.h \
-  ../dvi-init.h \
-  print-log.h \
-  ../events.h \
-  ../dvi-init.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  ../util.h \
-  ../x_util.h \
-  message-window.h \
-  pagesel.h \
-  ../my-snprintf.h \
-  sfSelFile.h \
-  ../dvisel.h \
-  ../print-internal.h \
-  xlwradio.h \
-  statusline.h \
-  search-dialog.h \
-  ../search-internal.h \
-  search-dialog.h \
-  ../dvisel.h \
-  ../special.h 
-print-log.o: print-log.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../xdvi-debug.h \
-  print-dialog.h \
-  ../print-internal.h \
-  ../dvi-init.h \
-  print-log.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  ../util.h \
-  ../x_util.h \
-  xlwradio.h 
-search-dialog.o: search-dialog.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../events.h \
-  ../dvi-init.h \
-  search-dialog.h \
-  ../search-internal.h \
-  search-dialog.h \
-  ../dvisel.h \
-  ../dvi-init.h \
-  ../print-internal.h \
-  xlwradio.h \
-  statusline.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../string_list.h \
-  ../util.h \
-  message-window.h \
-  ../x_util.h \
-  xm_menu.h \
-  menu.h \
-  xaw_menu.h 
-selection.o: selection.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../events.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../encodings.h \
-  message-window.h \
-  selection.h \
-  statusline.h
-sfDir.o: sfDir.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h sfDir.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-stat.h 
-sfDraw.o: sfDraw.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  sfDraw.h \
-  sfDir.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  sfPath.h
-sfPath.o: sfPath.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  sfDir.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  sfDraw.h \
-  sfPath.h \
-  sfSelFile.h
-sfSelFile.o: sfSelFile.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../dvi-init.h \
-  message-window.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  sfDir.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  sfPath.h \
-  sfDraw.h \
-  sfSelFile.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  xlwradio.h \
-  ../x_util.h \
-  $(kpathsea_srcdir)/c-fopen.h 
-statusline.o: statusline.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../version.h \
-  statusline.h \
-  xm_menu.h \
-  menu.h \
-  ../events.h \
-  xaw_menu.h \
-  ../x_util.h \
-  ../pagehist.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../my-vsnprintf.h \
-  ../util.h 
-topic-window.o: topic-window.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../version.h \
-  topic-window.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../util.h \
-  ../x_util.h 
-xaw_bitmaps.o: xaw_bitmaps.c \
-  xaw_bitmaps.h
-xaw_menu.o: xaw_menu.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../c-openmx.h \
-  ../events.h \
-  ../dvi-draw.h \
-  ../dvi-init.h \
-  statusline.h \
-  pagesel.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../x_util.h \
-  xaw_menu.h \
-  menu.h \
-  xm_menu.h \
-  message-window.h \
-  ../my-snprintf.h \
-  ../filehist.h \
-  xaw_bitmaps.h
-xicon.o: xicon.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  xicon.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../xdvi-debug.h \
-  ../xdvi.icon \
-  ../pixmaps/xdvi32x32.xpm \
-  ../pixmaps/xdvi16x16.xpm \
-  ../pixmaps/xdvi48x48.xpm
-xlwradio.o: xlwradio.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../xdvi-debug.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  xaw_bitmaps.h \
-  xlwradioP.h \
-  xlwradio.h 
-xm_colorsel.o: xm_colorsel.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  Tip.h \
-  ../x_util.h \
-  xm_colorsel.h \
-  xm_prefsP.h \
-  xm_prefs.h \
-  ../events.h \
-  ../dvi-draw.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  topic-window.h \
-  ../version.h \
-  ../search-internal.h \
-  search-dialog.h \
-  ../dvisel.h \
-  ../dvi-init.h \
-  ../print-internal.h
-xm_filesel.o: xm_filesel.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  sfSelFile.h \
-  ../dvi.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../util.h \
-  ../events.h \
-  message-window.h \
-  ../dvi-init.h \
-  ../x_util.h 
-xm_menu.o: xm_menu.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  xm_menu.h \
-  menu.h \
-  ../events.h \
-  xaw_menu.h \
-  xm_toolbar.h \
-  ../my-snprintf.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../x_util.h \
-  ../version.h \
-  statusline.h \
-  ../pagehist.h \
-  ../dvi-init.h \
-  ../filehist.h \
-  ../c-openmx.h \
-  message-window.h
-xm_prefs.o: xm_prefs.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h \
-  xm_colorsel.h \
-  topic-window.h \
-  ../version.h \
-  message-window.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../events.h \
-  xm_prefsP.h \
-  xm_prefs.h \
-  xm_prefs_appearance.h \
-  xm_prefs_fonts.h \
-  xm_prefs_helpers.h \
-  xm_prefs_page.h \
-  xm_prefs_scroll.h \
-  ../dvi-draw.h \
-  ../search-internal.h \
-  search-dialog.h \
-  ../dvisel.h \
-  ../dvi-init.h \
-  ../print-internal.h \
-  statusline.h \
-  xm_toolbar.h \
-  xm_menu.h \
-  menu.h \
-  xaw_menu.h \
-  pagesel.h
-xm_prefs_appearance.o:  \
- xm_prefs_appearance.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h \
-  ../my-snprintf.h \
-  xm_colorsel.h \
-  topic-window.h \
-  ../version.h \
-  message-window.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../events.h \
-  xm_toolbar.h \
-  xm_menu.h \
-  menu.h \
-  xaw_menu.h \
-  statusline.h \
-  pagesel.h \
-  xm_prefsP.h \
-  xm_prefs_appearance.h
-xm_prefs_fonts.o:  \
- xm_prefs_fonts.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h \
-  xm_colorsel.h \
-  topic-window.h \
-  ../version.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../events.h \
-  ../hypertex.h \
-  ../my-snprintf.h \
-  xm_prefsP.h \
-  xm_prefs_fonts.h
-xm_prefs_helpers.o:  \
- xm_prefs_helpers.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h \
-  xm_colorsel.h \
-  topic-window.h \
-  ../version.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  ../util.h \
-  ../string_list.h \
-  message-window.h \
-  ../events.h \
-  xm_menu.h \
-  menu.h \
-  xaw_menu.h \
-  xm_prefsP.h \
-  xm_prefs.h \
-  xm_prefs_helpers.h
-xm_prefs_page.o: xm_prefs_page.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h \
-  xm_colorsel.h \
-  topic-window.h \
-  ../version.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../events.h \
-  statusline.h \
-  xm_prefsP.h \
-  xm_prefs_page.h \
-  ../my-snprintf.h
-xm_prefs_scroll.o:  \
- xm_prefs_scroll.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h \
-  xm_colorsel.h \
-  topic-window.h \
-  ../version.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../events.h \
-  ../dvi-init.h \
-  statusline.h \
-  xm_prefsP.h \
-  xm_prefs_scroll.h \
-  ../my-snprintf.h
-xm_toolbar.o: xm_toolbar.c \
-  ../xdvi-config.h \
-  $(kpathsea_dir)/c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  pagesel.h \
-  help-window.h \
-  message-window.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/expand.h \
-  statusline.h \
-  ../dvi-init.h \
-  ../events.h \
-  ../dvi-draw.h \
-  xm_menu.h \
-  menu.h \
-  xaw_menu.h \
-  xm_toolbar.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h \
-  ../x_util.h \
-  Tip.h \
-  ../c-openmx.h \
-  ../pixmaps/toolbar.xpm
diff --git a/Build/source/texk/xdvik/gui/depend.mk.orig b/Build/source/texk/xdvik/gui/depend.mk.orig
deleted file mode 100644
index 7b968b7c351..00000000000
--- a/Build/source/texk/xdvik/gui/depend.mk.orig
+++ /dev/null
@@ -1,559 +0,0 @@
-Panner.o: Panner.c ../xdvi-config.h ../c-auto.h ../xdvi.h ../xdvi-debug.h \
-  ../version.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../string-utils.h ../my-vsnprintf.h
-Tip.o: Tip.c ../xdvi-config.h ../c-auto.h ../xdvi.h ../xdvi-debug.h \
-  ../version.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  Tip.h \
-  ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h 
-help-window.o: help-window.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  message-window.h \
-  ../util.h $(kpathsea_srcdir)/c-stat.h $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h ../x_util.h ../string-utils.h \
-  ../my-vsnprintf.h topic-window.h help-window.h
-mag.o: mag.c \
-  ../xdvi-config.h ../c-auto.h \
-  ../c-openmx.h $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/systypes.h \
-  ../xdvi.h ../xdvi-debug.h ../version.h \
-  $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../events.h ../dvi-draw.h ../dvi-init.h statusline.h ../hypertex.h \
-  mag.h xm_toolbar.h xm_menu.h menu.h xaw_menu.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  pagesel.h
-menu.o: menu.c ../xdvi-config.h ../c-auto.h ../xdvi.h ../xdvi-debug.h \
-  ../version.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../events.h menu.h xm_menu.h xaw_menu.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h 
-message-window.o: message-window.c \
-  ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../string-utils.h ../my-vsnprintf.h \
-  ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h ../x_util.h message-window.h
-pagesel.o: pagesel.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  xm_toolbar.h xm_menu.h menu.h ../events.h xaw_menu.h ../x_util.h \
-  message-window.h pagesel.h ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../string-utils.h ../my-vsnprintf.h \
-  ../dvi-init.h statusline.h print-dialog.h ../print-internal.h \
-  ../search-internal.h search-dialog.h ../dvisel.h ../pagehist.h
-print-dialog.o: print-dialog.c \
-  ../xdvi-config.h ../c-auto.h ../xdvi.h ../xdvi-debug.h ../version.h \
-  $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../my-vsnprintf.h print-dialog.h \
-  ../print-internal.h ../dvi-init.h print-log.h ../events.h \
-  ../string-utils.h ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../x_util.h message-window.h pagesel.h \
-  ../my-snprintf.h sfSelFile.h ../dvisel.h xlwradio.h statusline.h \
-  search-dialog.h ../search-internal.h ../special.h 
-print-log.o: print-log.c \
-  ../xdvi-config.h ../c-auto.h ../xdvi.h ../xdvi-debug.h ../version.h \
-  $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  print-dialog.h ../print-internal.h ../dvi-init.h print-log.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h ../string-utils.h \
-  ../my-vsnprintf.h ../x_util.h xlwradio.h 
-search-dialog.o: search-dialog.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../events.h ../dvi-init.h search-dialog.h ../search-internal.h \
-  ../dvisel.h ../print-internal.h xlwradio.h statusline.h \
-  ../string-utils.h ../my-vsnprintf.h ../string_list.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  message-window.h ../x_util.h xm_menu.h menu.h \
-  xaw_menu.h 
-selection.o: selection.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../events.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../encodings.h message-window.h selection.h \
-  statusline.h
-sfDir.o: sfDir.c ../xdvi-config.h ../c-auto.h sfDir.h \
-  $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-stat.h 
-sfDraw.o: sfDraw.c ../xdvi-config.h ../c-auto.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  ../xdvi.h ../xdvi-debug.h ../version.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  sfDraw.h \
-  sfDir.h sfPath.h
-sfPath.o: sfPath.c ../xdvi-config.h ../c-auto.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  ../xdvi.h ../xdvi-debug.h ../version.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  sfDir.h \
-  sfDraw.h sfPath.h sfSelFile.h
-sfSelFile.o: sfSelFile.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../dvi-init.h message-window.h $(kpathsea_srcdir)/c-stat.h \
-  sfDir.h sfPath.h \
-  sfDraw.h sfSelFile.h ../util.h $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h xlwradio.h ../x_util.h 
-statusline.o: statusline.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  statusline.h xm_menu.h menu.h ../events.h xaw_menu.h ../x_util.h \
-  ../pagehist.h ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../my-vsnprintf.h 
-topic-window.o: topic-window.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  topic-window.h ../string-utils.h \
-  ../my-vsnprintf.h ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h ../x_util.h
-xaw_bitmaps.o: xaw_bitmaps.c xaw_bitmaps.h
-xaw_menu.o: xaw_menu.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../c-openmx.h ../events.h ../dvi-draw.h ../dvi-init.h statusline.h \
-  pagesel.h ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../x_util.h xaw_menu.h menu.h xm_menu.h \
-  message-window.h ../my-snprintf.h ../filehist.h
-xicon.o: xicon.c ../xdvi-config.h ../c-auto.h ../xdvi.h ../xdvi-debug.h \
-  ../version.h $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/config.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  xicon.h \
-  ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h \
-  ../xdvi.icon ../pixmaps/xdvi32x32.xpm ../pixmaps/xdvi16x16.xpm \
-  ../pixmaps/xdvi48x48.xpm
-xlwradio.o: xlwradio.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h xaw_bitmaps.h xlwradioP.h \
-  xlwradio.h
-xm_colorsel.o: xm_colorsel.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  Tip.h \
-  ../x_util.h xm_colorsel.h xm_prefsP.h xm_prefs.h ../events.h \
-  ../dvi-draw.h ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  topic-window.h ../search-internal.h \
-  search-dialog.h ../dvisel.h ../dvi-init.h ../print-internal.h 
-xm_filesel.o: xm_filesel.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  sfSelFile.h ../dvi.h ../string-utils.h ../my-vsnprintf.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h message-window.h ../dvi-init.h \
-  ../x_util.h 
-xm_menu.o: xm_menu.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  xm_menu.h \
-  menu.h ../events.h xaw_menu.h xm_toolbar.h ../my-snprintf.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../x_util.h statusline.h ../pagehist.h \
-  ../dvi-init.h ../filehist.h ../c-openmx.h message-window.h 
-xm_prefs.o: xm_prefs.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h xm_colorsel.h topic-window.h message-window.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h xm_prefsP.h xm_prefs.h \
-  xm_prefs_appearance.h xm_prefs_fonts.h xm_prefs_helpers.h \
-  xm_prefs_page.h xm_prefs_scroll.h ../dvi-draw.h ../search-internal.h \
-  search-dialog.h ../dvisel.h ../dvi-init.h ../print-internal.h \
-  statusline.h xm_toolbar.h xm_menu.h menu.h xaw_menu.h pagesel.h 
-xm_prefs_appearance.o: xm_prefs_appearance.c ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h ../my-snprintf.h xm_colorsel.h topic-window.h \
-  message-window.h ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h xm_toolbar.h xm_menu.h menu.h \
-  xaw_menu.h statusline.h pagesel.h xm_prefsP.h xm_prefs_appearance.h 
-xm_prefs_fonts.o: xm_prefs_fonts.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h xm_colorsel.h topic-window.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h ../hypertex.h ../my-snprintf.h \
-  xm_prefsP.h xm_prefs_fonts.h 
-xm_prefs_helpers.o: xm_prefs_helpers.c ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h xm_colorsel.h topic-window.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h ../string-utils.h \
-  ../my-vsnprintf.h ../string_list.h message-window.h xm_menu.h menu.h \
-  xaw_menu.h xm_prefsP.h xm_prefs.h xm_prefs_helpers.h 
-xm_prefs_page.o: xm_prefs_page.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h xm_colorsel.h topic-window.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h statusline.h xm_prefsP.h \
-  xm_prefs_page.h ../my-snprintf.h 
-xm_prefs_scroll.o: xm_prefs_scroll.c ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  ../x_util.h xm_colorsel.h topic-window.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../events.h ../dvi-init.h statusline.h \
-  xm_prefsP.h xm_prefs_scroll.h ../my-snprintf.h 
-xm_toolbar.o: xm_toolbar.c ../xdvi-config.h ../c-auto.h ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h \
-  pagesel.h \
-  help-window.h message-window.h $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/expand.h statusline.h ../dvi-init.h ../events.h \
-  ../dvi-draw.h xm_menu.h menu.h xaw_menu.h xm_toolbar.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  ../x_util.h Tip.h \
-  ../c-openmx.h ../pixmaps/toolbar.xpm 
diff --git a/Build/source/texk/xdvik/gui/message-window.c b/Build/source/texk/xdvik/gui/message-window.c
index 832bc80dbc7..a034c8cdbde 100644
--- a/Build/source/texk/xdvik/gui/message-window.c
+++ b/Build/source/texk/xdvik/gui/message-window.c
@@ -235,21 +235,24 @@ static XtActionsRec popdown_actions[] = {
 static void
 ok_action(Widget w, XtPointer client_data, XtPointer call_data)
 {
-    int idx = -1;
+    XtPointer p;
+    ptrdiff_t idx = -1;
     
     UNUSED(call_data);
     
 #if MOTIF
     UNUSED(client_data);
-    XtVaGetValues(w, XmNuserData, &idx, NULL);
+    XtVaGetValues(w, XmNuserData, &p, NULL);
+    idx = (ptrdiff_t)p;
     ASSERT(idx >= 0, "Couldn't get idx from XmNuserData!");
 #else
+    UNUSED(p);
     UNUSED(w);
-    idx = (int)client_data;
+    idx = (ptrdiff_t)client_data;
 #endif
     
 #if DEBUG
-    fprintf(stderr, "quit_action called for popup %d\n", idx);
+    fprintf(stderr, "ok_action called for popup %ld\n", idx);
 #endif
     ASSERT(idx >= 0 && idx < MAX_POPUPS, "Invalid widget index in ok_action()");
 
@@ -308,7 +311,8 @@ help_action(Widget w, XtPointer client_data, XtPointer call_data)
 static void
 cancel_action(Widget w, XtPointer client_data, XtPointer call_data)
 {
-    int idx = -1;
+    XtPointer p;
+    ptrdiff_t idx = -1;
     
     UNUSED(call_data);
 
@@ -319,16 +323,19 @@ cancel_action(Widget w, XtPointer client_data, XtPointer call_data)
 	/* invoked by the WM, get the messagebox child */
 	Widget child;
 	if (get_widget_by_name(&child, w, Xdvi_MESSAGE_DIALOG_NAME, True)) {
-	    XtVaGetValues(child, XmNuserData, &idx, NULL);
+	    XtVaGetValues(child, XmNuserData, &p, NULL);
+	    idx = (ptrdiff_t)p;
 	}
     }
     else {
-	XtVaGetValues(w, XmNuserData, &idx, NULL);
+	XtVaGetValues(w, XmNuserData, &p, NULL);
+	idx = (ptrdiff_t)p;
     }
     ASSERT(idx >= 0, "Couldn't get idx from XmNuserData!");
 #else
+    UNUSED(p);
     UNUSED(w);
-    idx = (int)client_data;
+    idx = (ptrdiff_t)client_data;
 #endif
     ASSERT(idx >= 0 && idx < MAX_POPUPS, "Invalid widget index in cancel_action()");
 
@@ -358,13 +365,15 @@ cancel_action(Widget w, XtPointer client_data, XtPointer call_data)
 static void
 not_ok_action(Widget w, XtPointer client_data, XtPointer call_data)
 {
-    /* Note: unmanage the parent of the button */
-    int idx = -1;
+    /* Note: unmanages the parent of the button */
+    XtPointer p;
+    ptrdiff_t idx = -1;
 
     UNUSED(client_data);
 
     UNUSED(call_data);
-    XtVaGetValues(w, XmNuserData, &idx, NULL);
+    XtVaGetValues(w, XmNuserData, &p, NULL);
+    idx = (ptrdiff_t)p;
     ASSERT(idx >= 0, "Couldn't get idx from XmNuserData!");
     ASSERT(idx >= 0 && idx < MAX_POPUPS, "Invalid widget index in ok_action()");
 
@@ -499,7 +508,7 @@ create_dialogs(popupMessageSizeHintT size,
 				  XmNdialogType, XmDIALOG_WARNING, /* default */
 				  XmNtraversalOn, True,
 				  XmNhighlightOnEnter, True,
-				  XmNuserData, cnt,
+				  XmNuserData, cast_int_to_XtPointer(cnt),
 				  XmNtranslations, XtParseTranslationTable(translations_str),
 				  NULL);
     free(translations_str);
@@ -617,7 +626,7 @@ create_dialogs(popupMessageSizeHintT size,
     XtOverrideTranslations(new_message_text, key_translations);
     
     XtInstallAllAccelerators(new_message_box, new_message_ok);
-    XtAddCallback(new_message_ok, XtNcallback, ok_action, (XtPointer)cnt);
+    XtAddCallback(new_message_ok, XtNcallback, ok_action, cast_int_to_XtPointer(cnt));
 
     /* we create additional buttons in any case,
        to make the sizing more consistent */
@@ -659,7 +668,7 @@ create_dialogs(popupMessageSizeHintT size,
     }
 
     if (cancel_button != NULL) {
-	XtAddCallback(new_message_not_ok, XtNcallback, cancel_action, (XtPointer)cnt);
+	XtAddCallback(new_message_not_ok, XtNcallback, cancel_action, cast_int_to_XtPointer(cnt));
     }
     else {
 	XtUnmanageChild(new_message_not_ok);
diff --git a/Build/source/texk/xdvik/gui/print-dialog.c b/Build/source/texk/xdvik/gui/print-dialog.c
index 87e70a99cc1..5b489e2b51e 100644
--- a/Build/source/texk/xdvik/gui/print-dialog.c
+++ b/Build/source/texk/xdvik/gui/print-dialog.c
@@ -395,7 +395,7 @@ text_print_vs_save_callback(Widget widget, XtPointer closure, XEvent *ev, Boolea
 	XmToggleButtonGadgetSetState(radio_printer, widget == to_printer, True);
 	XmToggleButtonGadgetSetState(radio_file, widget != to_printer, True);
 #else
-	XawToggleSetCurrent(radio_printer, widget == to_printer ? (XtPointer)TO_PRINTER : (XtPointer)TO_FILE);
+	XawToggleSetCurrent(radio_printer, widget == to_printer ? cast_int_to_XtPointer(TO_PRINTER) : cast_int_to_XtPointer(TO_FILE));
 #endif
     }
 }
@@ -421,7 +421,7 @@ text_page_range_callback(Widget widget, XtPointer closure, XEvent *ev, Boolean *
 	XmToggleButtonGadgetSetState(radio_selected, False, True);
 	XmToggleButtonGadgetSetState(radio_range, True, True);
 #else
-	XawToggleSetCurrent(radio_all, (XtPointer)PAGE_RANGE);
+	XawToggleSetCurrent(radio_all, cast_int_to_XtPointer(PAGE_RANGE));
 #endif
     }
 }
@@ -1729,10 +1729,10 @@ xaw_create_dialog(struct save_or_print_info *info)
     XSetWMProtocols(XtDisplay(info->shell), XtWindow(info->shell), &WM_DELETE_WINDOW, 1);
 	    
     if (pageinfo_have_marked_pages()) {
-	XawToggleSetCurrent(print_or_save_range_all_radio, (XtPointer)PAGE_MARKED);
+	XawToggleSetCurrent(print_or_save_range_all_radio, cast_int_to_XtPointer(PAGE_MARKED));
     }
     else if (info->page_selection == PAGE_MARKED) {
-	XawToggleSetCurrent(print_or_save_range_all_radio, (XtPointer)PAGE_ALL);
+	XawToggleSetCurrent(print_or_save_range_all_radio, cast_int_to_XtPointer(PAGE_ALL));
     }
 #undef HORIZONTAL_RESIZING_NO
 #undef HORIZONTAL_RESIZING_YES
@@ -2350,7 +2350,7 @@ notify_dialog(Widget w, pageRadioT *value_bak)
 	    XtVaSetValues(radio_marked, XmNsensitive, True, NULL);
 	    XmProcessTraversal(radio_marked, XmTRAVERSE_CURRENT);
 #else
-	    XawToggleSetCurrent(radio_all, (XtPointer)PAGE_MARKED);
+	    XawToggleSetCurrent(radio_all, cast_int_to_XtPointer(PAGE_MARKED));
 	    XtVaSetValues(radio_marked, XtNsensitive, True, NULL);
 #endif
 	}
diff --git a/Build/source/texk/xdvik/gui/search-dialog.c b/Build/source/texk/xdvik/gui/search-dialog.c
index e84e6c4ec40..000d0b05db4 100644
--- a/Build/source/texk/xdvik/gui/search-dialog.c
+++ b/Build/source/texk/xdvik/gui/search-dialog.c
@@ -927,7 +927,7 @@ create_search_window(struct search_settings *settings)
 						  NULL);
 	if (resource.search_history_size < 10) {
 	    /* usually the dropdown list shows 10 entries */
-	    XtVaSetValues(searchbox_input, XmNvisibleItemCount, resource.search_history_size);
+	    XtVaSetValues(searchbox_input, XmNvisibleItemCount, resource.search_history_size, NULL);
 	}
 	    
 	/* free Motif strings */
diff --git a/Build/source/texk/xdvik/gui/sfDraw.c b/Build/source/texk/xdvik/gui/sfDraw.c
index 4d693c8c4cf..b017116e0d4 100644
--- a/Build/source/texk/xdvik/gui/sfDraw.c
+++ b/Build/source/texk/xdvik/gui/sfDraw.c
@@ -30,6 +30,7 @@
 #include "kpathsea/config.h"
 #include "kpathsea/c-stat.h"
 #include "xdvi.h"
+#include "x_util.h"
 
 #include "sfDraw.h"
 #include "sfDir.h"
@@ -427,11 +428,11 @@ SFscrollTimer(XtPointer p, XtIntervalId *id)
 {
     SFDir *dir;
     int save;
-    int n;
+    ptrdiff_t n;
 
     UNUSED(id);
     
-    n = (int)p;
+    n = (ptrdiff_t)p;
 
     fprintf(stderr, "SFscrollTimer called!\n");
     
@@ -462,7 +463,7 @@ SFscrollTimer(XtPointer p, XtIntervalId *id)
     if (SFbuttonPressed) {
 	SFscrollTimerId = XtAppAddTimeOut(SFapp,
 					  SFscrollTimerInterval(),
-					  SFscrollTimer, (XtPointer) n);
+					  SFscrollTimer, (XtPointer)n);
     }
 }
 
@@ -501,7 +502,7 @@ SFnewInvertEntry(int n, XMotionEvent *event)
 		SFscrollTimerAdded = 1;
 		SFscrollTimerId = XtAppAddTimeOut(SFapp,
 						  SFscrollTimerInterval(),
-						  SFscrollTimer, (XtPointer) n);
+						  SFscrollTimer, cast_int_to_XtPointer(n));
 	    }
 	}
 
diff --git a/Build/source/texk/xdvik/gui/sfSelFile.c b/Build/source/texk/xdvik/gui/sfSelFile.c
index 4980362ec86..a5b2e19d58c 100644
--- a/Build/source/texk/xdvik/gui/sfSelFile.c
+++ b/Build/source/texk/xdvik/gui/sfSelFile.c
@@ -163,7 +163,7 @@ SFexposeList(Widget w, XtPointer n, XEvent *event, Boolean *cont)
 	return;
     }
 
-    SFdrawList((int)n, SF_DO_NOT_SCROLL);
+    SFdrawList((ptrdiff_t)n, SF_DO_NOT_SCROLL);
 }
 
 
@@ -557,9 +557,9 @@ SFcreateWidgets(Widget parent, struct filesel_callback *callback)
 						   selFileLists[n], arglist, i);
 
 	XtAddCallback(selFileVScrolls[n], XtNjumpProc,
-		      (XtCallbackProc)SFvFloatSliderMovedCallback, (XtPointer) n);
+		      (XtCallbackProc)SFvFloatSliderMovedCallback, cast_int_to_XtPointer(n));
 	XtAddCallback(selFileVScrolls[n], XtNscrollProc,
-		      (XtCallbackProc)SFvAreaSelectedCallback, (XtPointer) n);
+		      (XtCallbackProc)SFvAreaSelectedCallback, cast_int_to_XtPointer(n));
 
 	i = 0;
 	XtSetArg(arglist[i], XtNorientation, XtorientHorizontal);	i++;
@@ -573,9 +573,9 @@ SFcreateWidgets(Widget parent, struct filesel_callback *callback)
 						   selFileLists[n], arglist, i);
 
 	XtAddCallback(selFileHScrolls[n], XtNjumpProc,
-		      (XtCallbackProc)SFhSliderMovedCallback, (XtPointer) n);
+		      (XtCallbackProc)SFhSliderMovedCallback, cast_int_to_XtPointer(n));
 	XtAddCallback(selFileHScrolls[n], XtNscrollProc,
-		      (XtCallbackProc)SFhAreaSelectedCallback, (XtPointer) n);
+		      (XtCallbackProc)SFhAreaSelectedCallback, cast_int_to_XtPointer(n));
     }
 
     /* When opening a DVI file, offer to open in new window */
@@ -715,17 +715,17 @@ SFcreateWidgets(Widget parent, struct filesel_callback *callback)
 
     for (n = 0; n < 3; n++) {
 	XtAddEventHandler(selFileLists[n], ExposureMask, True,
-			  (XtEventHandler)SFexposeList, (XtPointer) n);
+			  (XtEventHandler)SFexposeList, cast_int_to_XtPointer(n));
 	XtAddEventHandler(selFileLists[n], EnterWindowMask, False,
-			  (XtEventHandler)SFenterList, (XtPointer) n);
+			  (XtEventHandler)SFenterList, cast_int_to_XtPointer(n));
 	XtAddEventHandler(selFileLists[n], LeaveWindowMask, False,
-			  (XtEventHandler)SFleaveList, (XtPointer) n);
+			  (XtEventHandler)SFleaveList, cast_int_to_XtPointer(n));
 	XtAddEventHandler(selFileLists[n], PointerMotionMask, False,
-			  (XtEventHandler)SFmotionList, (XtPointer) n);
+			  (XtEventHandler)SFmotionList, cast_int_to_XtPointer(n));
 	XtAddEventHandler(selFileLists[n], ButtonPressMask, False,
-			  (XtEventHandler)SFbuttonPressList, (XtPointer) n);
+			  (XtEventHandler)SFbuttonPressList, cast_int_to_XtPointer(n));
 	XtAddEventHandler(selFileLists[n], ButtonReleaseMask, False,
-			  (XtEventHandler)SFbuttonReleaseList, (XtPointer) n);
+			  (XtEventHandler)SFbuttonReleaseList, cast_int_to_XtPointer(n));
     }
 
     XtAddEventHandler(selFileField, KeyPressMask, False,
diff --git a/Build/source/texk/xdvik/gui/xaw_menu.c b/Build/source/texk/xdvik/gui/xaw_menu.c
index 9cc3700f4bd..24d1c39281c 100644
--- a/Build/source/texk/xdvik/gui/xaw_menu.c
+++ b/Build/source/texk/xdvik/gui/xaw_menu.c
@@ -253,9 +253,9 @@ panner_cb(Widget widget, XtPointer closure, XtPointer report_ptr)
 
     fprintf(stderr, "panner moved: %d, %d\n", report->slider_x, report->slider_y);
     if (globals.widgets.x_bar != NULL)
-	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, (XtPointer)(x - orig_x));
+	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, cast_int_to_XtPointer(x - orig_x));
     if (globals.widgets.y_bar != NULL)
-	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, (XtPointer)(y - orig_y));
+	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, cast_int_to_XtPointer(y - orig_y));
     orig_x = x;
     orig_y = y;
 }
diff --git a/Build/source/texk/xdvik/gui/xlwradio.c b/Build/source/texk/xdvik/gui/xlwradio.c
index 94240d25b33..c00e582da56 100644
--- a/Build/source/texk/xdvik/gui/xlwradio.c
+++ b/Build/source/texk/xdvik/gui/xlwradio.c
@@ -163,7 +163,7 @@ static XtActionsRec actionsList[] =
 
 static XtResource resources[] = {
     {XtNisRadio,  XtCIsRadio, XtRBoolean, sizeof(Boolean),
-     offset(isRadio), XtRImmediate, (XtPointer)True },
+     offset(isRadio), XtRImmediate, (XtPointer)(ptrdiff_t)True },
 };
 #undef offset
 
diff --git a/Build/source/texk/xdvik/gui/xm_menu.c b/Build/source/texk/xdvik/gui/xm_menu.c
index 6b5d766852a..1a117c24856 100644
--- a/Build/source/texk/xdvik/gui/xm_menu.c
+++ b/Build/source/texk/xdvik/gui/xm_menu.c
@@ -216,7 +216,7 @@ filehist_menu_add_entry(const char *filename)
 	if (num_children + 1 < 10) {
 	    XtVaSetValues(w, XmNmnemonic, buf[0], NULL);
 	}
-	XtAddCallback(w, XmNactivateCallback, filehist_select_cb, (XtPointer)(num_children + 1));
+	XtAddCallback(w, XmNactivateCallback, filehist_select_cb, cast_int_to_XtPointer(num_children + 1));
 
 	update_menu_labels(menu);
 	
@@ -248,7 +248,7 @@ filehist_submenu(int idx, const char *filename, int pageno, void *data)
     if (idx + 1 < 10) {
 	XtVaSetValues(w, XmNmnemonic, buf[0], NULL);
     }
-    XtAddCallback(w, XmNactivateCallback, filehist_select_cb, (XtPointer)idx);
+    XtAddCallback(w, XmNactivateCallback, filehist_select_cb, cast_int_to_XtPointer(idx));
 }
 
 
diff --git a/Build/source/texk/xdvik/gui/xm_prefs_helpers.c b/Build/source/texk/xdvik/gui/xm_prefs_helpers.c
index 03975ee478f..49b19c406a4 100644
--- a/Build/source/texk/xdvik/gui/xm_prefs_helpers.c
+++ b/Build/source/texk/xdvik/gui/xm_prefs_helpers.c
@@ -153,10 +153,12 @@ destroy_dialog_cb(Widget w, XtPointer client_data, XtPointer call_data)
 	/* Need to unselect the `Other...' entry from the list; to do this,
 	   we select the index from XmNuserData if it's >= 0, or the first item. */
 	int idx;
+	XtPointer p;
 	XtVaGetValues(browser_combo,
 		      XmNlist, &browser_list_w,
-		      XmNuserData, &idx,
+		      XmNuserData, &p,
 		      NULL);
+	idx = (int)p;
 	if (browser_list_w == 0)
 	    XDVI_ERROR((stderr, "couldn't get list component of combo box!\n"));
 	else {
@@ -460,7 +462,7 @@ h_selector(const char *prompt_name,
 #if USE_COMBOBOX
 	/* update the currently selected value */
 	XtVaGetValues(w, XmNselectedPosition, &i, NULL);
-	XtVaSetValues(w, XmNuserData, i, NULL);
+	XtVaSetValues(w, XmNuserData, cast_int_to_XtPointer(i), NULL);
 #endif
     }
 #if USE_COMBOBOX
@@ -750,7 +752,7 @@ h_create_command(const char *name,
 				 XmNitems, str_list,
 				 XmNitemCount, num,
 				 XmNvisibleItemCount, num > 10 ? 10 : num,
-				 XmNuserData, curr_index,
+				 XmNuserData, cast_int_to_XtPointer(curr_index),
 				 XmNarrowSize, Xdvi_COMBO_BOX_ARROW_SIZE,
 				 NULL);
     if (top != NULL) /* FIXME: This assumes we only have 2 items ... */
diff --git a/Build/source/texk/xdvik/kpathsea.ac-22.84.15 b/Build/source/texk/xdvik/kpathsea.ac-22.84.15
new file mode 100644
index 00000000000..d59113f1219
--- /dev/null
+++ b/Build/source/texk/xdvik/kpathsea.ac-22.84.15
@@ -0,0 +1,58 @@
+dnl Check if we want to compile against an installed kpathsea library
+
+EXTRA_LIBKPATHSEA_INCLUDE=
+EXTRA_LIBKPATHSEA_LIBDIR=
+
+if test "$with_system_kpathsea" = yes; then
+  if test "x$with_kpathsea_libdir" != x; then
+    EXTRA_LIBKPATHSEA_LIBDIR="-L$with_kpathsea_libdir"
+  fi
+  if test "x$with_kpathsea_include" != x; then
+    EXTRA_LIBKPATHSEA_INCLUDE="-I$with_kpathsea_include"
+  fi
+fi
+
+if test "$with_system_kpathsea" = yes; then
+  OLD_LDFLAGS=$LDFLAGS
+  OLD_CPP=$CPP
+  OLD_CPPFLAGS=$CPPFLAGS
+  OLD_LIBS=$LIBS
+  
+  LDFLAGS="$LDFLAGS $EXTRA_LIBKPATHSEA_LIBDIR"
+  CPP="$CPP $EXTRA_LIBKPATHSEA_INCLUDE"
+  CPPFLAGS="$EXTRA_LIBKPATHSEA_INCLUDE"
+
+  AC_MSG_CHECKING(whether kpathsea defines kpse_enc_format)
+  AC_TRY_COMPILE([#include "kpathsea/kpathsea.h"
+  ], [kpse_file_format_type mytype = kpse_enc_format;
+  ], have_good_kpathsea=yes, have_good_kpathsea=no)
+  if test $have_good_kpathsea = no; then
+    AC_MSG_RESULT(no)
+    AC_MSG_WARN(kpathsea library is not recent enough; will compile my own)
+    with_system_kpathsea=no
+  else
+    AC_MSG_RESULT(yes)
+  fi
+
+  LDFLAGS=$OLD_LDFLAGS
+  CPP=$OLD_CPP
+  CPPFLAGS=$OLD_CPPFLAGS
+  LIBS=$OLD_LIBS
+fi
+
+if test "$with_system_kpathsea" = yes; then
+  LIBKPATHSEACPPFLAGS="$EXTRA_LIBKPATHSEA_INCLUDE"
+  LDLIBKPATHSEA="$EXTRA_LIBKPATHSEA_LIBDIR -lkpathsea"
+  LIBKPATHSEADEP=
+  using_system_kpathsea=yes
+else
+  LIBKPATHSEACPPFLAGS='-I$(kpathsea_parent)'
+  LDLIBKPATHSEA='$(kpathsea_dir)/libkpathsea.la'
+  LIBKPATHSEADEP='$(kpathsea_dir)/libkpathsea.la'
+  using_system_kpathsea=no
+fi
+
+
+AC_SUBST(LIBKPATHSEACPPFLAGS)
+AC_SUBST(LDLIBKPATHSEA)
+AC_SUBST(LIBKPATHSEADEP)
diff --git a/Build/source/texk/xdvik/main.c b/Build/source/texk/xdvik/main.c
index 9154b507fa0..55434e4125b 100644
--- a/Build/source/texk/xdvik/main.c
+++ b/Build/source/texk/xdvik/main.c
@@ -21,6 +21,15 @@
 #include "t1lib.h"
 #endif /* T1LIB */
 
+#define STRINGIFY(x) #x
+#define TOSTRING(x) STRINGIFY(x)
+#ifndef XDVI_KPSE_PROG_NAME
+#define XDVI_KPSE_PROG_NAME xdvi
+#endif
+static const char *xdvi_kpse_prog_name = TOSTRING(XDVI_KPSE_PROG_NAME);
+#undef STRINGIFY
+#undef TOSTRING
+
 static char XtRBool3[] = "Bool3";	/* resource for Bool3 */
 
 /* get these before setting `application_resources' */
@@ -1162,9 +1171,10 @@ main(int argc, char **argv)
 	fprintf(stderr, "KPATHSEA_DEBUG = %d\n", kpathsea_debug);
 
     kpse_init_prog("XDVI", resource.pixels_per_inch, resource.mfmode, resource.alt_font);
-    
-    kpse_set_program_name(argv[0], "xdvi");
 
+    TRACE_FILES((stderr, "Initializing kpathsearch with program name '%s'",
+		 xdvi_kpse_prog_name));
+    kpse_set_program_name(argv[0], xdvi_kpse_prog_name);
     
     if (globals.debug & DBG_EXPAND) {
 	const char *texmfcnf = kpse_path_expand("$TEXMFCNF");
diff --git a/Build/source/texk/xdvik/mime.c b/Build/source/texk/xdvik/mime.c
index 60655f8a6eb..c0ee011bf05 100644
--- a/Build/source/texk/xdvik/mime.c
+++ b/Build/source/texk/xdvik/mime.c
@@ -135,13 +135,13 @@ struct mailcap_map {
 };
 
 static struct mailcap_map default_mailcap[] = {
-    {"audio/*", "showaudio %s", NULL, False, False},
-    {"image/*", "xv %s", NULL, False, False},
-    {"video/mpeg", "mpeg_play %s", NULL, False, False},
-    {"application/pdf", "acroread %s", NULL, False, False},
-    {"text/html", "netscape-raise  -remote 'openURL(%s,new-window)'", NULL, False, False},
-    {"application/postscript", "ghostview %s", NULL, False, False},
-    {"application/x-dvi", "xdvi %s", NULL, False, False},
+    {"audio/*", "showaudio %s", NULL, False, "%s"},
+    {"image/*", "xv %s", NULL, False, "%s"},
+    {"video/mpeg", "mpeg_play %s", NULL, False, "%s"},
+    {"application/pdf", "acroread %s", NULL, False, "%s"},
+    {"text/html", "netscape-raise  -remote 'openURL(%s,new-window)'", NULL, False, "%s"},
+    {"application/postscript", "ghostview %s", NULL, False, "%s"},
+    {"application/x-dvi", "xdvi %s", NULL, False, "%s"},
 };
 
 static struct mime_map *m_mimemap = NULL;
@@ -543,10 +543,18 @@ figure_viewer(const char *content_type, const char **format_string, Boolean *nee
 {
     int i;
 
-    /* special case so that xdvizilla isn't used, which would be
-       too dangerous since xdvizilla tries to unlink the DVI file by default.
+    /* Hardwire xdvi for this MIME type so that xdvizilla isn't used,
+       which would be too dangerous since xdvizilla tries to unlink
+       the DVI file by default.  There might be other DVI viewers, but
+       since the user invoking this from xdvi anyway ...
+       
        FIXME: A better way would be to always copy the original file, like
        e.g. Acroread does it; see comment in launch_program(), hypertex.c.
+
+       Furthermore, xdvizilla has been retired in the meantime.
+    */
+    /* FIXME: why do we actually need format_string - why not sprintf()
+       directly into the target?
     */
     if (strcmp(content_type, "application/x-dvi") == 0) {
 	*format_string = "%s";
diff --git a/Build/source/texk/xdvik/pk.c b/Build/source/texk/xdvik/pk.c
index b43d51c5c99..3f408390621 100644
--- a/Build/source/texk/xdvik/pk.c
+++ b/Build/source/texk/xdvik/pk.c
@@ -374,7 +374,7 @@ read_PK_index(struct font *fontp, wide_bool hushcs)
 	   than a short forward seek. Totally non-intuitive.  */
 	if (bytes_left > 0 && bytes_left < SHORTSEEK) {
 	    char *dummy = xmalloc(bytes_left);
-	    fread(dummy, 1, bytes_left, fontp->file);
+	    (void)fread(dummy, 1, bytes_left, fontp->file);
 	    free(dummy);
 	}
 	else
diff --git a/Build/source/texk/xdvik/print-internal.c b/Build/source/texk/xdvik/print-internal.c
index e20c266dc9f..cc6206fc56d 100644
--- a/Build/source/texk/xdvik/print-internal.c
+++ b/Build/source/texk/xdvik/print-internal.c
@@ -178,13 +178,7 @@ fork_dvips(char **argv, struct save_or_print_info *info, childProcT proc)
     print_child.pid = fork();
     if (print_child.pid == 0) {	/* if child */
 	/* change into dir of DVI file so that included image files etc. are found */
-	chdir(globals.dvi_file.dirname);
-
-	if (globals.debug & DBG_FILES) {
-	    char path[MAXPATHLEN];
-	    getcwd(path, MAXPATHLEN);
-	    /* fprintf(stderr, "Directory of running `%s': `%s'\n", argv[0], path); */
-	}
+	(void)chdir(globals.dvi_file.dirname);
 
 	/* make the input file pointer the STDIN of the dvips process */
 	if (info->page_selection == PAGE_MARKED) { /* printing selected pages from temporary file */
diff --git a/Build/source/texk/xdvik/tests/Makefile.in-22.84.15 b/Build/source/texk/xdvik/tests/Makefile.in-22.84.15
new file mode 100644
index 00000000000..bbb55dbfd0b
--- /dev/null
+++ b/Build/source/texk/xdvik/tests/Makefile.in-22.84.15
@@ -0,0 +1,119 @@
+# Makefile for xdvik 
+#
+# - 1999/05/08: janl: Removed submakes for libwww and kpathsea.  That's what
+#   the top makefile is for!
+#
+
+
+### NOTE: ac_include paths must be relative to texk/xdvik, since that
+### is from where the configure is run!
+kpse_include ../make/paths.mk
+kpse_include ../make/library.mk
+kpse_include ../make/common.mk
+kpse_include ../make/programs.mk
+kpse_include xdvi_objects.mk
+
+kpathsea_parent = ../..
+
+x_cppflags=@X_CFLAGS@ @iconv_includes@
+x_ldflags=@X_LIBS@ @x_linker_options@ @iconv_libpath@
+x_pre_libs=@X_PRE_LIBS@
+x_extra_libs=@X_EXTRA_LIBS@ @iconv_libs@
+x_tool_libs=@x_tool_libs@
+x_xmu_lib=@x_xmu_lib@
+x_xpm_libs=@x_xpm_libs@
+x_ext_lib=@x_ext_lib@
+
+x_link = $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs)
+
+LDLIBT1=@LDLIBT1@
+LIBT1CPPFLAGS=@LIBT1CPPFLAGS@
+LIBT1DEP=@LIBT1DEP@
+LIBT1DIR = ../../../libs/t1lib
+LIBTYPE1DIR = $(LIBT1DIR)/../type1
+LIBT1SRCDIR = $(srcdir)/$(LIBT1DIR)
+
+LIBGUI=../gui/libgui.a
+LIBGUIDEP=$(LIBGUI)
+
+CPP = @CPP@
+RANLIB = @RANLIB@
+
+# Make `#include <X11/...>' and `-lX...' work.
+# This matches web2c (needed only for Metafont).
+x_cppflags = @X_CFLAGS@
+
+# Extra xdvi-specific compiler options.
+ps_def = @PS_DEF@ -DXSERVER_INFO
+prog_cflags = @XTRA_WARN_CFLAGS@ -I.. -I$(srcdir)/.. $(x_cppflags) $(ps_def)
+
+# Note: to be able to use one depend.mk file for both Motif/Xaw (which
+# is needed since only maintainers are supposed to invoke `make depend')
+# we include *all* object files and have tests for #ifdef MOTIF/XAW inside
+# the files.
+objects = \
+    test_dl_list.o \
+    test_string_list.o \
+    test_string_utils.o \
+    test_util.o \
+    run_tests.o
+
+
+# This are the files from xdvi needed to link the tests
+xdvi_objects = \
+    ../browser.o \
+    ../dvi-draw.o \
+    ../dvi-init.o \
+    ../dvisel.o \
+    ../encodings.o \
+    ../events.o \
+    ../exit-handlers.o \
+    ../filehist.o \
+    ../font-open.o \
+    ../gf.o \
+    ../hypertex.o \
+    ../image-magick.o \
+    ../mime.o \
+    ../my-snprintf.o \
+    ../my-vsnprintf.o \
+    ../pagehist.o \
+    ../pk.o \
+    ../print-internal.o \
+    ../psdps.o \
+    ../psgs.o \
+    ../psheader.o \
+    ../psnews.o \
+    ../read-mapfile.o \
+    ../search-internal.o \
+    ../special.o \
+    ../string-utils.o \
+    ../string_list.o \
+    ../tfmload.o \
+    ../util.o \
+    ../dl_list.o \
+    ../vf.o \
+    ../xdvi.o \
+    ../xserver-info.o \
+    ../x_util.o
+
+default all: run_tests
+
+run_tests: $(objects) $(xdvi_objects) $(LIBT1DEP) $(LIBGUIDEP)
+	$(kpathsea_link) $(objects) $(xdvi_objects) $(LIBGUI) $(x_link) $(LOADLIBES)
+
+test: run_tests
+	./run_tests
+
+test_verbose: run_tests
+	./run_tests -v
+
+kpse_include ../make/dist.mk
+kpse_include ../make/clean.mk
+
+clean::
+	rm -f *.o *.a
+
+c_auto_h_dir = ..
+kpse_include ../make/rdepend.mk
+kpse_include ./gui/depend.mk
+kpse_include ./tests/depend.mk
diff --git a/Build/source/texk/xdvik/tests/depend.mk b/Build/source/texk/xdvik/tests/depend.mk
deleted file mode 100644
index 36f811c632a..00000000000
--- a/Build/source/texk/xdvik/tests/depend.mk
+++ /dev/null
@@ -1,245 +0,0 @@
-run_tests.o: run_tests.c \
-  run_tests.h \
-  ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../hypertex.h \
-  ../dvi-init.h \
-  ../special.h \
-  ../events.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h 
-test1.o: test1.c \
-  run_tests.h \
-  ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../hypertex.h \
-  ../dvi-init.h \
-  ../special.h \
-  ../events.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h 
-test_dl_list.o: test_dl_list.c \
-  run_tests.h \
-  ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../hypertex.h \
-  ../dvi-init.h \
-  ../special.h \
-  ../events.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../dl_list.h
-test_string_list.o:  \
- test_string_list.c \
-  run_tests.h \
-  ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../hypertex.h \
-  ../dvi-init.h \
-  ../special.h \
-  ../events.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  ../string_list.h
-test_string_utils.o:  \
- test_string_utils.c \
-  ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  run_tests.h \
-  ../hypertex.h \
-  ../dvi-init.h \
-  ../special.h \
-  ../events.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h 
-test_util.o: test_util.c \
-  run_tests.h \
-  ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h \
-  ../xdvi-config.h \
-  ../xdvi-debug.h \
-  ../xdvi.h \
-  ../version.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h \
-  $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h \
-  ../hypertex.h \
-  ../dvi-init.h \
-  ../special.h \
-  ../events.h \
-  ../string-utils.h \
-  ../my-vsnprintf.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  ../events.h \
-  ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/tex-file.h 
diff --git a/Build/source/texk/xdvik/tests/depend.mk.orig b/Build/source/texk/xdvik/tests/depend.mk.orig
deleted file mode 100644
index b8c28743aef..00000000000
--- a/Build/source/texk/xdvik/tests/depend.mk.orig
+++ /dev/null
@@ -1,93 +0,0 @@
-run_tests.o: run_tests.c \
-  run_tests.h ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h ../hypertex.h ../dvi-init.h ../special.h \
-  ../events.h ../string-utils.h ../my-vsnprintf.h \
-  $(kpathsea_srcdir)/tex-file.h ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h 
-test_dl_list.o: test_dl_list.c run_tests.h ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h ../hypertex.h ../dvi-init.h ../special.h \
-  ../events.h ../string-utils.h ../my-vsnprintf.h \
-  $(kpathsea_srcdir)/tex-file.h ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  ../dl_list.h
-test_string_list.o: test_string_list.c run_tests.h ../xdvi-config.h \
-  ../c-auto.h \
-  ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h ../hypertex.h ../dvi-init.h ../special.h \
-  ../events.h ../string-utils.h ../my-vsnprintf.h \
-  $(kpathsea_srcdir)/tex-file.h ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h \
-  ../string_list.h
-test_string_utils.o: test_string_utils.c ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h $(kpathsea_srcdir)/c-fopen.h run_tests.h \
-  ../hypertex.h ../dvi-init.h ../special.h ../events.h ../string-utils.h \
-  ../my-vsnprintf.h $(kpathsea_srcdir)/tex-file.h ../util.h \
-  $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h 
-test_util.o: test_util.c run_tests.h ../xdvi-config.h ../c-auto.h \
-  ../xdvi.h \
-  ../xdvi-debug.h ../version.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/config.h $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h $(kpathsea_srcdir)/systypes.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h $(kpathsea_srcdir)/lib.h $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathmx.h \
-  $(kpathsea_srcdir)/c-dir.h \
-  $(kpathsea_srcdir)/c-vararg.h \
-  $(kpathsea_srcdir)/c-fopen.h ../hypertex.h ../dvi-init.h ../special.h \
-  ../events.h ../string-utils.h ../my-vsnprintf.h \
-  $(kpathsea_srcdir)/tex-file.h ../util.h $(kpathsea_srcdir)/c-stat.h \
-  $(kpathsea_srcdir)/hash.h 
diff --git a/Build/source/texk/xdvik/translations.h b/Build/source/texk/xdvik/translations.h
index c8b6fe1bbd1..b276b79c7f5 100644
--- a/Build/source/texk/xdvik/translations.h
+++ b/Build/source/texk/xdvik/translations.h
@@ -8,6 +8,7 @@ static const char base_key_translations[] =
    (i.e. `alt ctrl' before `ctrl' before unmodified)
    `:' at start of description means that case matters
 */
+    "<Key>0:		digit(0)\n"
     "<Key>1:		digit(1)\n"
     "<Key>2:		digit(2)\n"
     "<Key>3:		digit(3)\n"
diff --git a/Build/source/texk/xdvik/util.c b/Build/source/texk/xdvik/util.c
index adf6c3cd839..323f271e1b5 100644
--- a/Build/source/texk/xdvik/util.c
+++ b/Build/source/texk/xdvik/util.c
@@ -581,7 +581,7 @@ my_realpath(const char *path, char *resolved)
 	(void)fchdir(fd);
 	close(fd);
 #else
-	chdir(cwd);
+	(void)chdir(cwd);
 #endif
 	return resolved;
     }
@@ -591,7 +591,7 @@ my_realpath(const char *path, char *resolved)
     (void)fchdir(fd);
     close(fd);
 #else
-    chdir(cwd);
+    (void)chdir(cwd);
 #endif
     return NULL;
 }
@@ -1466,7 +1466,7 @@ find_file(const char *filename, struct stat *statbuf, kpse_file_format_type path
 		    (void)fchdir(fd);
 		    close(fd);
 #else
-		    chdir(cwd);
+		    (void)chdir(cwd);
 #endif
 		    if (tmp[0] == '/') { /* is it an absolute path? */
 			pathname = xstrdup(tmp);
diff --git a/Build/source/texk/xdvik/version.h b/Build/source/texk/xdvik/version.h
index a00c4f1b42a..cfe76945d24 100644
--- a/Build/source/texk/xdvik/version.h
+++ b/Build/source/texk/xdvik/version.h
@@ -2,7 +2,7 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
-#define XDVI_VERSION "22.84.14"
+#define XDVI_VERSION "22.84.15"
 
 #ifdef MOTIF
 #define XDVI_GUI "(Motif toolkit)"
diff --git a/Build/source/texk/xdvik/withenable.ac-22.84.15 b/Build/source/texk/xdvik/withenable.ac-22.84.15
new file mode 100644
index 00000000000..90ee99eb086
--- /dev/null
+++ b/Build/source/texk/xdvik/withenable.ac-22.84.15
@@ -0,0 +1,156 @@
+dnl withenable.ac: --with and --enable options.
+
+# Check for toolkit options. This used to be --with-x-toolkit, but was changed
+# to remove clashes with metafont which accepts different values.
+# We allow `yes' as synonym for the default toolkit, for easier communication
+# with ../kpathsea/xt.ac.
+dnl
+dnl This defines --with-x implicitly (which is why we use that package
+dnl name below), so put it here, so it comes first in the --help output.
+dnl This reads best.
+dnl
+dnl Remember to add AC_PATH_XTRA when actually using X.
+dnl
+AC_ARG_WITH([xdvi-x-toolkit],
+[  --with-xdvi-x-toolkit=KIT
+			  Use toolkit KIT for xdvi (KIT=motif/xaw/xaw3d/neXtaw).
+			  If no --with-xdvi-x-toolkit option is used, use Motif
+                          if available, else Xaw.],
+[	  case "${withval}" in
+            next | nextaw | neXtaw )      val=neXtaw  ;;
+            xaw3d )                       val=xaw3d  ;;
+            x | xa | xaw )		  val=xaw ;;
+	    y | ye | yes )		  val=yes ;;
+            m | mo | mot | moti | motif ) val=motif ;;
+	    * )
+AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument \`$withval'; using xaw.])
+              val=xaw;;
+	  esac
+	  with_xdvi_x_toolkit=$val
+])
+
+
+# Check if the user wants to use Ghostscript, DPS or NeWS to
+# display PostScript.
+AC_ARG_WITH([ps],
+[  --with-ps=PS            Use PostScript (PS=no/yes/gs/dps/news, default gs)],
+[case $withval in
+  yes|gs) PS_DEF="$PS_DEF -DPS_GS";;
+      no) PS_DEF=no;;
+     dps) PS_DEF="$PS_DEF -DPS_DPS";;
+    news) PS_DEF="$PS_DEF -DPS_NEWS";;
+       *) AC_MSG_WARN([Unknown --with-ps argument \`$withval'; using gs.]);;
+ esac])
+
+AC_ARG_ENABLE([grey],
+[  --disable-grey          Disable greyscale anti-aliasing for shrunken bitmaps]
+,
+[if test "$enableval" = yes; then
+  AC_DEFINE([GREY], 1, [Define to enable greyscale anti-aliasing for shrunken bitmaps.])
+ else
+  echo DISABLED grey
+fi],
+AC_DEFINE([GREY], 1))
+
+AC_ARG_ENABLE([color],
+[  --disable-color         Disable support for color specials],
+[if test "$enableval" = yes; then
+  AC_DEFINE([COLOR], 1, [Define to enable support for color specials.])
+ else
+  echo DISABLED color
+fi],
+AC_DEFINE([COLOR], 1))
+
+dnl OBSOLETE AC_ARG_ENABLE([buttons],
+dnl OBSOLETE [  --disable-buttons       Disable buttons on the side of the window],
+dnl OBSOLETE [if test "$enableval" = yes; then
+dnl OBSOLETE   AC_DEFINE([BUTTONS], 1, [Define to enable buttons on the side of the window.])
+dnl OBSOLETE  else
+dnl OBSOLETE   echo DISABLED buttons
+dnl OBSOLETE fi],
+dnl OBSOLETE AC_DEFINE([BUTTONS], 1))
+
+dnl OBSOLETE AC_ARG_ENABLE([statusline],
+dnl OBSOLETE [  --disable-statusline    Disable statusline at bottom of window],
+dnl OBSOLETE [if test "$enableval" = yes; then
+dnl OBSOLETE   AC_DEFINE([STATUSLINE], 1, [Define to enable statusline at bottom of window.])
+dnl OBSOLETE  else
+dnl OBSOLETE   echo DISABLED statusline
+dnl OBSOLETE fi],
+dnl OBSOLETE AC_DEFINE([STATUSLINE], 1))
+
+AC_ARG_ENABLE([t1lib],
+[  --disable-t1lib         Do not use T1lib (direct rendering of Type1 fonts)],
+[if test "$enableval" = yes; then
+  T1LIB=1
+  LDT1LIB=../../libs/t1lib/lib/.libs/libt1.a
+  AC_DEFINE([LDT1LIB], 1, [Define to compile in t1lib (libtool)])
+  AC_DEFINE([T1LIB], 1, [Define to compile in t1lib])
+else
+  T1LIB=
+  LDT1LIB=
+  echo DISABLED t1lib
+fi],
+[T1LIB=1
+LDT1LIB=../../libs/t1lib/lib/.libs/libt1.a
+AC_DEFINE([LDT1LIB], 1)
+AC_DEFINE([T1LIB], 1)])
+
+AC_ARG_ENABLE([gf],
+[  --enable-gf             Enable gf format pixel files (in addition to pk)],
+[if test "$enableval" != no; then
+  AC_DEFINE([USE_GF], 1, [Define to enable gf format files (in addition to pk format).])
+  OPT_SRCS="$OPT_SRCS gf.c"
+  OPT_OBJS="$OPT_OBJS gf.o"
+fi])
+
+AC_ARG_ENABLE([a4],
+[  --disable-a4            Set default paper size to letter and default unit to inch],
+[if test "$enableval" = yes; then
+  AC_DEFINE([A4], 1, [Define to use A4 as the default paper size.])
+ else
+  echo Disabled a4/cm, using letter/in instead
+fi],
+[AC_DEFINE([A4], 1)])
+
+AC_ARG_ENABLE([magick],
+[  --enable-magick         Use ImageMagick to load/render image files.
+                          EXPERIMENTAL - DO NOT USE!],
+[if test "$enableval" != no; then
+  echo -n "checking for ImageMagick >= 5.3 ... "
+  if MAGICK_VER=`Magick-config --version 2>/dev/null`; then
+    echo $MAGICK_VER
+    set -- `echo $MAGICK_VER | sed -e 's/\./ /g'`
+    MAGICK_VER_MAJOR=$1
+    MAGICK_VER_MINOR=$2
+    if expr $MAGICK_VER_MAJOR \> 4 >/dev/null && \
+      (expr $MAGICK_VER_MAJOR \> 5 >/dev/null || \
+	expr $MAGICK_VER_MINOR \> 2 >/dev/null); then
+      MAGICK_CPP="-DMAGICK_VER_MAJOR=$MAGICK_VER_MAJOR -DMAGICK_VER_MINOR=$MAGICK_VER_MINOR `Magick-config --cppflags`"
+      # echo "CPP: $MAGICK_CPP"
+      MAGICK_LD="`Magick-config --libs`"
+      # echo "LD: $MAGICK_LD"
+      echo "ImageMagick support enabled"
+      MAGICK_INCLUDE=
+      MAGICK_LIBDIR=
+
+      if test "x$with_magick_include" != x; then
+          MAGIC_INCLUDE="-I$with_magick_include"
+      fi
+      if test "x$with_magick_libdir" != x; then
+          MAGIC_LIBDIR="-L$with_magick_libdir"
+      fi
+
+      X_EXTRA_LIBS="$X_EXTRA_LIBS $MAGIC_LIBDIR $MAGICK_LD"
+      X_CFLAGS="$X_CFLAGS $MAGIC_INCLUDE $MAGICK_CPP"
+      AC_DEFINE([MAGICK], 1, [Define to use ImageMagick])
+      #echo MAGICK_DEF=\"$MAGICK_DEF\"
+    else
+      echo "ImageMagick version too old - ImageMagick support disabled"
+    fi
+  else
+    echo "Can't run 'Magick-config' - ImageMagick support disabled"
+  fi
+fi])
+
+AC_SUBST(LDT1LIB)
diff --git a/Build/source/texk/xdvik/x_util.c b/Build/source/texk/xdvik/x_util.c
index e1c390e6e88..e2aabede685 100644
--- a/Build/source/texk/xdvik/x_util.c
+++ b/Build/source/texk/xdvik/x_util.c
@@ -126,7 +126,7 @@ scroll_page_if_needed(int x_min, int x_max, int y_min, int y_max)
 	XtVaGetValues(globals.widgets.y_bar, XmNvalue, &test_scroll, NULL);
 	(void)set_bar_value(globals.widgets.y_bar, test_scroll + need_v_scroll, (int)(globals.page.h - mane.height));
 #else
-	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, (XtPointer)need_v_scroll);
+	XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, cast_int_to_XtPointer(need_v_scroll));
 #endif
     }
 
@@ -136,7 +136,7 @@ scroll_page_if_needed(int x_min, int x_max, int y_min, int y_max)
 	XtVaGetValues(globals.widgets.x_bar, XmNvalue, &test_scroll, NULL);
 	(void)set_bar_value(globals.widgets.x_bar, test_scroll + need_h_scroll, (int)(globals.page.w - mane.width));
 #else
-	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, (XtPointer)need_h_scroll);
+	XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, cast_int_to_XtPointer(need_h_scroll));
 #endif
     }
 
@@ -1259,3 +1259,8 @@ Boolean window_is_mapped(Window w, Display *dpy)
     XWindowAttributes xwa;
     return XGetWindowAttributes(dpy, w, &xwa) && xwa.map_state == IsViewable;
 }
+
+XtPointer cast_int_to_XtPointer(int i)
+{
+    return (XtPointer)(ptrdiff_t)i;
+}
diff --git a/Build/source/texk/xdvik/x_util.h b/Build/source/texk/xdvik/x_util.h
index dea5f55ec91..3fe04c5d66c 100644
--- a/Build/source/texk/xdvik/x_util.h
+++ b/Build/source/texk/xdvik/x_util.h
@@ -141,4 +141,6 @@ extern Boolean clip_region_to_rect(XRectangle *rect);
 
 extern Boolean window_is_mapped(Window w, Display *dpy);
 
+extern XtPointer cast_int_to_XtPointer(int x);
+
 #endif
diff --git a/Build/source/texk/xdvik/xdvi.1.in b/Build/source/texk/xdvik/xdvi.1.in
index 75411f74f7c..c57752e45de 100644
--- a/Build/source/texk/xdvik/xdvi.1.in
+++ b/Build/source/texk/xdvik/xdvi.1.in
@@ -2075,7 +2075,7 @@ Moves to the page with the given number. If no page number is given, xdvi jumps
 .br
 If the option/resource
 .B useTeXpages
-is active, the numbers correspond the the actual page numbers in the TeX file;
+is active, the numbers correspond to the actual page numbers in the TeX file;
 otherwise, absolute page numbers (starting from 1) are used. In the latter case,
 the page numbers can be changed with the
 .RB ` P '
@@ -3111,7 +3111,7 @@ containing hyphens that are wrapped after the hyphen, and that replacing the
 newlines affects the interpretation of regular expressions as follows:
 The \fI.\fR pattern will also match newlines, and \fI^\fR and \fI$\fR won't match
 begin and end of lines any more. (Since currently there is no option for turning
-off the greediness of \fI*\fR and \fI+\fR, turing on this option will usually
+off the greediness of \fI*\fR and \fI+\fR, turning on this option will usually
 result in matches that are longer than desired.)
 .RE
 .PP