diff options
author | Karl Berry <karl@freefriends.org> | 2009-05-25 23:39:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-05-25 23:39:11 +0000 |
commit | 35fce91c124d54cbee464def9cfe78ed2b57b759 (patch) | |
tree | f17ddc7e4cd116a0a433900dd2d01fe60509e73b /Build/source/texk | |
parent | 64ea3583cea282dcc8ca3d73eee931f3e7a701a8 (diff) |
no longer build dvipdfm; dvipdfmx can fully emulate it now, as far as we know, so just make a symlink
git-svn-id: svn://tug.org/texlive/trunk@13471 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/README | 5 | ||||
-rwxr-xr-x | Build/source/texk/configure | 33 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/src/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/src/Makefile.in | 6 | ||||
-rw-r--r-- | Build/source/texk/withenable.ac | 1 |
7 files changed, 12 insertions, 44 deletions
diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index 4d6c0306aed..226a330fba9 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,7 @@ +2009-05-26 Karl Berry <karl@tug.org> + + * README: dvipdfm can now be emulated by dvipdfmx. + 2009-02-02 Karl Berry <karl@tug.org> * install-sh: rename from install.sh. diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 1ff90c9446b..064c6203de2 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -84,7 +84,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../texk/dvi2tty/ac/withenable.ac \ $(top_srcdir)/../texk/dvidvi/ac/withenable.ac \ $(top_srcdir)/../texk/dviljk/ac/withenable.ac \ - $(top_srcdir)/../texk/dvipdfm/ac/withenable.ac \ $(top_srcdir)/../texk/dvipdfmx/ac/withenable.ac \ $(top_srcdir)/../texk/dvipng/ac/withenable.ac \ $(top_srcdir)/../texk/dvipng/ac/dvipng.ac \ diff --git a/Build/source/texk/README b/Build/source/texk/README index 92cb870f66a..5ae7c5e1159 100644 --- a/Build/source/texk/README +++ b/Build/source/texk/README @@ -42,11 +42,6 @@ dvidvi - ? dviljk - maintained here, by Joachim Schrod -dvipdfm - checked 12apr09 - http://gaspra.kettering.edu/dvipdfm/dvipdfm-0.13.2d.tar.gz - ftp://ftp.kettering.edu/pub/outgoing/mwicks/dvipdfm/dvipdfm-0.13.2d.tar.gz - (until dvipdfmx is a 100% replacement we cannot drop it.) - dvipdfmx - checked 26may09 http://project.ktug.or.kr/dvipdfmx/snapshot/latest/ http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20090522.tar.gz diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 9957236e564..0b2c04daf95 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -729,7 +729,6 @@ enable_dtl enable_dvi2tty enable_dvidvi enable_dviljk -enable_dvipdfm enable_dvipdfmx enable_dvipng enable_debug @@ -815,7 +814,6 @@ dtl dvi2tty dvidvi dviljk -dvipdfm dvipdfmx dvipng dvipos @@ -1513,7 +1511,6 @@ Optional Features: --disable-dvi2tty do not build the dvi2tty package --disable-dvidvi do not build the dvidvi package --disable-dviljk do not build the dviljk package - --disable-dvipdfm do not build the dvipdfm package --disable-dvipdfmx do not build the dvipdfmx package --disable-dvipng do not build the dvipng package --disable-debug Compile without debug (-d) option @@ -2707,26 +2704,6 @@ test "x$enable_dviljk" = xno || { } -## texk/dvipdfm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm/ -## configure options and TL libraries required for dvipdfm -# Check whether --enable-dvipdfm was given. -if test "${enable_dvipdfm+set}" = set; then - enableval=$enable_dvipdfm; -fi -case $enable_dvipdfm in #( - yes|no);; #( - *) enable_dvipdfm=$enable_all_pkgs - { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipdfm=$enable_dvipdfm'" >&5 -$as_echo "$as_me: Assuming \`--enable-dvipdfm=$enable_dvipdfm'" >&6;} - ac_configure_args="$ac_configure_args '--enable-dvipdfm=$enable_dvipdfm'";; -esac - -test "x$enable_dvipdfm" = xno || { - need_kpathsea=yes - need_libpng=yes -} - - ## texk/dvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfmx/ ## configure options and TL libraries required for dvipdfmx # Check whether --enable-dvipdfmx was given. @@ -4283,16 +4260,6 @@ if test -x $srcdir/dviljk/configure; then fi -if test -x $srcdir/dvipdfm/configure; then - test "x$enable_dvipdfm" = xno || SUBTEXK="$SUBTEXK dvipdfm" - DIST_SUBTEXK="$DIST_SUBTEXK dvipdfm" - if false; then - subdirs="$subdirs dvipdfm" - - fi -fi - - if test -x $srcdir/dvipdfmx/configure; then test "x$enable_dvipdfmx" = xno || SUBTEXK="$SUBTEXK dvipdfmx" DIST_SUBTEXK="$DIST_SUBTEXK dvipdfmx" diff --git a/Build/source/texk/dvipdfmx/src/Makefile.am b/Build/source/texk/dvipdfmx/src/Makefile.am index 71abfbad42d..341b8807f05 100644 --- a/Build/source/texk/dvipdfmx/src/Makefile.am +++ b/Build/source/texk/dvipdfmx/src/Makefile.am @@ -42,13 +42,15 @@ LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) install-exec-hook: cd $(DESTDIR)$(bindir) && \ - rm -f ebb$(EXEEXT) extractbb$(EXEEXT) && \ + rm -f ebb$(EXEEXT) extractbb$(EXEEXT) dvipdfm$(EXEEXT) && \ $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \ - $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT) + $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT) && \ + $(LN_S) dvipdfmx$(EXEEXT) dvipdfm$(EXEEXT) uninstall-hook: rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT) rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT) ## Eventually delete these files ## diff --git a/Build/source/texk/dvipdfmx/src/Makefile.in b/Build/source/texk/dvipdfmx/src/Makefile.in index 29cad0b7010..42bc98da8b0 100644 --- a/Build/source/texk/dvipdfmx/src/Makefile.in +++ b/Build/source/texk/dvipdfmx/src/Makefile.in @@ -645,13 +645,15 @@ uninstall-am: uninstall-binPROGRAMS install-exec-hook: cd $(DESTDIR)$(bindir) && \ - rm -f ebb$(EXEEXT) extractbb$(EXEEXT) && \ + rm -f ebb$(EXEEXT) extractbb$(EXEEXT) dvipdfm$(EXEEXT) && \ $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \ - $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT) + $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT) && \ + $(LN_S) dvipdfmx$(EXEEXT) dvipdfm$(EXEEXT) uninstall-hook: rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT) rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/texk/withenable.ac b/Build/source/texk/withenable.ac index 64b858c7fb3..690443a3fc3 100644 --- a/Build/source/texk/withenable.ac +++ b/Build/source/texk/withenable.ac @@ -12,7 +12,6 @@ dtl dvi2tty dvidvi dviljk -dvipdfm dvipdfmx dvipng dvipos |