change ipc default to enabled, remove obsolete files

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

3 files changed, 0 insertions, 612 deletions

diff --git a/Build/source/texk/xdvik/Makefile.in.orig b/Build/source/texk/xdvik/Makefile.in.orig
deleted file mode 100644
index 96f0b6014ee..00000000000
--- a/Build/source/texk/xdvik/Makefile.in.orig
+++ /dev/null
@@ -1,243 +0,0 @@
-# @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.
-# ps_def = @PS_DEF@ -DXSERVER_INFO -DNEW_MENU_CREATION
-# ps_def = @PS_DEF@ -DRGB_ANTI_ALIASING
-ps_def = @PS_DEF@
-prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBT1CPPFLAGS) $(LIBKPATHSEACPPFLAGS) $(ps_def) \
--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/configure.in.orig b/Build/source/texk/xdvik/configure.in.orig
deleted file mode 100644
index 4925e9c1f30..00000000000
--- a/Build/source/texk/xdvik/configure.in.orig
+++ /dev/null
@@ -1,311 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-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)
-
-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/kpathsea.ac.orig b/Build/source/texk/xdvik/kpathsea.ac.orig
deleted file mode 100644
index d59113f1219..00000000000
--- a/Build/source/texk/xdvik/kpathsea.ac.orig
+++ /dev/null
@@ -1,58 +0,0 @@
-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)