* Makefile.am (TESTS): Added else.test.

	* else.test: New file.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 2991812..f2ff446 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,8 @@
 Sun Sep 27 20:01:20 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * Makefile.am (TESTS): Added else.test.
+       * else.test: New file.
+
        * Makefile.am (TESTS): Added parse.test.
        * parse.test: New file.
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 83a53a9..9449c28 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,7 +32,7 @@ texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \
 java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
 lex2.test libobj8.test version3.test instdata.test exdir2.test \
 colon5.test library.test syntax.test cond4.test cond5.test recurs.test \
-ansi3.test cond6.test colon6.test texinfo7.test parse.test
+ansi3.test cond6.test colon6.test texinfo7.test parse.test else.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b73d701..b901e64 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -95,7 +95,7 @@ texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \
 java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
 lex2.test libobj8.test version3.test instdata.test exdir2.test \
 colon5.test library.test syntax.test cond4.test cond5.test recurs.test \
-ansi3.test cond6.test colon6.test texinfo7.test parse.test
+ansi3.test cond6.test colon6.test texinfo7.test parse.test else.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/tests/else.test b/tests/else.test
new file mode 100755 (executable)
index 0000000..a1cd725
--- /dev/null
+++ b/tests/else.test
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+# Test to make sure line numbers are correct in some error reports.
+
+. $srcdir/defs || exit 1
+
+echo 'AM_CONDITIONAL(FOO, true)' >> configure.in
+
+cat > Makefile.am << 'END'
+# flag to tell us if apache dir is a source distribution
+APACHE_DIR_IS_SRC = @APACHE_DIR_IS_SRC@
+
+# we only need to descend into the c dir if we're doing a 1.3 DSO configuration
+ifeq ("${APACHE_DIR_IS_SRC}","yes")
+SUBDIRS = java 
+else
+SUBDIRS = c java
+endif
+END
+
+$AUTOMAKE > out 2>&1 && exit 1
+grep :7: out