[5922] do not call findprog on a user-defined $TEX

[karl]

Revision: 5922
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5922
Author:   karl
Date:     2014-11-11 01:30:00 +0000 (Tue, 11 Nov 2014)
Log Message:
-----------
do not call findprog on a user-defined $TEX

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/util/texi2dvi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-11-10 18:01:28 UTC (rev 5921)
+++ trunk/ChangeLog     2014-11-11 01:30:00 UTC (rev 5922)
@@ -1,3 +1,8 @@
+2014-11-10  Karl Berry  <address@hidden>
+
+       * util/texi2dvi: do not call findprog on a user-defined $TEX.
+       Report from Per Mildner, 10 Nov 2014 12:26:08.
+
 2014-11-10  Jason Hood  <address@hidden>  (tiny change)
 
        * install-info/install-info.c (reformat_new_entries): respect

Modified: trunk/util/texi2dvi
===================================================================
--- trunk/util/texi2dvi 2014-11-10 18:01:28 UTC (rev 5921)
+++ trunk/util/texi2dvi 2014-11-11 01:30:00 UTC (rev 5922)
@@ -98,9 +98,6 @@
 # Pacify verbose cds.
 CDPATH=${ZSH_VERSION+.}$path_sep
 
-# If $TEX is set to a directory, don't use it.
-test -n "$TEX" && test -d "$TEX" && unset TEX
-
 # 
 ## --------------------- ##
 ## Auxiliary functions.  ##
@@ -1733,9 +1730,15 @@
 
 
 # We can't do much without tex.
-#
-if findprog ${TEX:-tex}; then :; else cat <<EOM
-You don't have a working TeX binary (${TEX:-tex}) installed anywhere in
+# End up with the TEX and PDFTEX variables set to what we are going to use.
+
+# If $TEX is set to a directory, don't use it.
+test -n "$TEX" && test -d "$TEX" && unset TEX
+
+# But otherwise, use $TEX if it is set.
+if test -z "$TEX"; then
+  if findprog tex; then :; else cat <<EOM >&2
+You don't have a working TeX binary (tex) installed anywhere in
 your PATH, and texi2dvi cannot proceed without one.  If you want to use
 this script, you'll need to install TeX (if you don't have it) or change
 your PATH or TEX environment variable (if you do).  See the --help
@@ -1744,20 +1747,19 @@
 For information about obtaining TeX, please see http://tug.org/texlive,
 or do a web search for TeX and your operating system or distro.
 EOM
-  exit 1
-fi
+    exit 1
+  fi
 
-
-# We want to use etex (or pdftex) if they are available, and the user
-# didn't explicitly specify.  We don't check for elatex and pdfelatex
-# because (as of 2003), the LaTeX team has asked that new distributions
-# use etex by default anyway.
-#
-# End up with the TEX and PDFTEX variables set to what we are going to use.
-if test -z "$TEX"; then
+  # We want to use etex (or pdftex) if they are available, and the user
+  # didn't explicitly specify.  We don't check for elatex and pdfelatex
+  # because (as of 2003), the LaTeX team has asked that new distributions
+  # use etex by default anyway.
+  #
   if findprog etex; then TEX=etex; else TEX=tex; fi
 fi
-#
+
+# For many years, the pdftex binary has included the e-tex extensions,
+# but just for those people with ancient TeX distributions ...
 if test -z "$PDFTEX"; then
   if findprog pdfetex; then PDFTEX=pdfetex; else PDFTEX=pdftex; fi
 fi