Merged revisions 1738-1754,1756 via svnmerge from

http://scons.tigris.org/svn/scons/branches/core

........
  r1741 | stevenknight | 2006-12-16 22:51:07 -0600 (Sat, 16 Dec 2006) | 1 line

  0.96.D527 - Give the f90 and f95 Tool modules knowledge of how to build source files of earlier Fortran versions.
........
  r1742 | stevenknight | 2006-12-16 23:22:54 -0600 (Sat, 16 Dec 2006) | 1 line

  0.96.D528 - Better handling of timestamp fallback if there's no md5 module.
........
  r1743 | stevenknight | 2006-12-17 00:21:31 -0600 (Sun, 17 Dec 2006) | 1 line

  0.96.D529 - Fix portability of new tests on systems that don't have TeX installed.
........
  r1744 | stevenknight | 2006-12-19 15:30:16 -0600 (Tue, 19 Dec 2006) | 1 line

  0.96.D530 - Eliminate the ListBuilder subclass in favor of using the Executor's target lists.
........
  r1745 | stevenknight | 2006-12-19 18:54:26 -0600 (Tue, 19 Dec 2006) | 1 line

  0.96.D531 - Eliminate of MultiStepBuilder as a separate Builder subclass.
........
  r1746 | garyo | 2006-12-21 13:21:08 -0600 (Thu, 21 Dec 2006) | 1 line

  Minor doc fix, thanks to Douglas Landgraf.
........
  r1747 | stevenknight | 2006-12-21 17:13:55 -0600 (Thu, 21 Dec 2006) | 1 line

  0.96.D533 - Add CFLAGS for options common to C/C++. (Gary Oberbrunner)
........
  r1748 | stevenknight | 2007-01-03 19:48:05 -0600 (Wed, 03 Jan 2007) | 1 line

  0.96.D534 - Fix signature storage when targets are retrieved from CacheDir().
........
  r1749 | stevenknight | 2007-01-04 16:48:47 -0600 (Thu, 04 Jan 2007) | 1 line

  0.96.D535 - Teach the lex and yacc tools about target files generated by different flex/bison options, and about Objective C suffixes. (Pupeno)
........
  r1750 | stevenknight | 2007-01-04 17:14:38 -0600 (Thu, 04 Jan 2007) | 1 line

  0.96.D536 - Refactor duplicate disambiguation logic in Entry.get_contents().
........
  r1751 | stevenknight | 2007-01-05 13:00:54 -0600 (Fri, 05 Jan 2007) | 1 line

  0.96.D537 - Fix lprof regression from 0.96.92.
........
  r1752 | stevenknight | 2007-01-05 20:43:48 -0600 (Fri, 05 Jan 2007) | 1 line

  0.96.D538 - Fix caching of Builder suffix matching (to fix lprof regression).
........
  r1753 | stevenknight | 2007-01-06 00:03:16 -0600 (Sat, 06 Jan 2007) | 1 line

  0.96.D539 - Fix --include-dir when using MinGW. (Paul)
........
  r1754 | stevenknight | 2007-01-06 00:24:53 -0600 (Sat, 06 Jan 2007) | 1 line

  0.96.D540 - Make bootstrap.py something useful to execute SCons out of a source directory.
........
  r1756 | stevenknight | 2007-01-06 21:32:11 -0600 (Sat, 06 Jan 2007) | 1 line

  0.96.D541 - Update the Copyright year string to include 2007. Automate updating the month+year string in man page title headers. Fix hard-coded __revision__ strings that crept into some older tests.
........

2 files changed, 17 insertions, 3 deletions

diff --git a/test/TEX/build_dir.py b/test/TEX/build_dir.py
index 146f6e1..4967533 100644
--- a/test/TEX/build_dir.py
+++ b/test/TEX/build_dir.py
@@ -35,13 +35,18 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
+latex = test.where_is('latex')
+if not latex:
+    test.skip_test("Could not find 'latex'; skipping test.\n")
+
 test.subdir(['docs'])
 
 
 test.write(['SConstruct'], """\
 import os
 
-env = Environment(ENV = { 'PATH' : os.environ['PATH'] })
+env = Environment(ENV = { 'PATH' : os.environ['PATH'] },
+                  TOOLS = ['tex', 'latex', 'dvipdf'])
 Export(['env'])
 
 SConscript(os.path.join('docs', 'SConscript'),
diff --git a/test/TEX/subdir-input.py b/test/TEX/subdir-input.py
index b92ab73..d16ba5f 100644
--- a/test/TEX/subdir-input.py
+++ b/test/TEX/subdir-input.py
@@ -38,11 +38,20 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
+latex = test.where_is('latex')
+if not latex:
+    test.skip_test("Could not find 'latex'; skipping test.\n")
+
+pdflatex = test.where_is('pdflatex')
+if not pdflatex:
+    test.skip_test("Could not find 'pdflatex'; skipping test.\n")
+
 test.subdir('sub')
 
 test.write('SConstruct', """\
-PDF( 'sub/x.tex' )
-DVI( 'sub/x.tex' )
+env = Environment(TOOLS = ['tex', 'pdftex'])
+env.PDF( 'sub/x.tex' )
+env.DVI( 'sub/x.tex' )
 """)
 
 test.write(['sub', 'x.tex'],