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

10 files changed, 32 insertions, 88 deletions

diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index 159aee94962..a65dd701b7b 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -78,7 +78,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/configure b/Build/source/configure
index de7db370608..30a32f4042c 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -966,7 +966,6 @@ enable_dtl
 enable_dvi2tty
 enable_dvidvi
 enable_dviljk
-enable_dvipdfm
 enable_dvipdfmx
 enable_dvipng
 enable_debug
@@ -1744,7 +1743,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
@@ -2967,26 +2965,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.
@@ -6143,13 +6121,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6146: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6124: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6149: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6127: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6152: output\"" >&5)
+  (eval echo "\"\$as_me:6130: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7355,7 +7333,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7358 "configure"' > conftest.$ac_ext
+  echo '#line 7336 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9301,11 +9279,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9304: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9282: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9308: \$? = $ac_status" >&5
+   echo "$as_me:9286: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9640,11 +9618,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9643: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9621: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9647: \$? = $ac_status" >&5
+   echo "$as_me:9625: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9745,11 +9723,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9748: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9726: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9752: \$? = $ac_status" >&5
+   echo "$as_me:9730: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9800,11 +9778,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9803: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9781: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9807: \$? = $ac_status" >&5
+   echo "$as_me:9785: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12600,7 +12578,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12603 "configure"
+#line 12581 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12696,7 +12674,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12699 "configure"
+#line 12677 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19130,11 +19108,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19133: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19111: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19137: \$? = $ac_status" >&5
+   echo "$as_me:19115: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19229,11 +19207,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19232: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19210: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19236: \$? = $ac_status" >&5
+   echo "$as_me:19214: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19281,11 +19259,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19284: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19262: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19288: \$? = $ac_status" >&5
+   echo "$as_me:19266: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 672577ac0df..9d89550fc1f 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -82,7 +82,6 @@ dtl
 dvi2tty
 dvidvi
 dviljk
-dvipdfm
 dvipdfmx
 dvipng
 dvipos
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