Always ignore comments when scanning a value

diff --git a/ChangeLog b/ChangeLog
index d5401a1a56b17c08aae5c28ca2a269ec51888689..3d8bd9e3fe8f8250da9a66ab6fc866c7b3bf3a73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep 30 08:31:51 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (variable_value_as_list): Just return if comment
+       seen.  Report from Mark Galassi.
+       (handle_options): Don't bother with explicit comment checking.
+
 Tue Sep 24 09:15:46 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (read_am_file): Cleaned up dejagnu variables.

diff --git a/Makefile.in b/Makefile.in
index 39f2f36d221220e9585e2c93230d4ed00df6087e..3e6bd043d2179c400c2974923b134190873aedeb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,20 +133,6 @@ uninstall-binSCRIPTS:
          rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
        done
 
-check-binSCRIPTS:
-       pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \
-         for opt in --help --version; do \
-           if test -f $$p; then :; \
-           else if test -f $(srcdir)/$$p; then \
-             p=$(srcdir)/$$p; \
-           else exit 1; fi; fi; \
-           if $$p $$opt > .chkout$$pid 2> .chkerr$$pid \
-                && test -n "`cat .chkout$$pid`" \
-                && test -z "`cat .chkerr$$pid`"; then :; \
-           else echo "$$p failed $$opt test" 1>&2; exit 1; fi; \
-         done; \
-       done; rm -f .chk???$$pid
-
 install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
        $(NORMAL_INSTALL)
        $(mkinstalldirs) $(pkgdatadir)
@@ -164,20 +150,6 @@ uninstall-pkgdataSCRIPTS:
          rm -f $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \
        done
 
-check-pkgdataSCRIPTS:
-       pid=$$$$; list="$(pkgdata_SCRIPTS)"; for p in $$list; do \
-         for opt in --help --version; do \
-           if test -f $$p; then :; \
-           else if test -f $(srcdir)/$$p; then \
-             p=$(srcdir)/$$p; \
-           else exit 1; fi; fi; \
-           if $$p $$opt > .chkout$$pid 2> .chkerr$$pid \
-                && test -n "`cat .chkout$$pid`" \
-                && test -z "`cat .chkerr$$pid`"; then :; \
-           else echo "$$p failed $$opt test" 1>&2; exit 1; fi; \
-         done; \
-       done; rm -f .chk???$$pid
-
 version.texi: stamp-vti
 
 stamp-vti: automake.texi $(top_srcdir)/configure.in
@@ -365,7 +337,7 @@ info: $(INFO_DEPS) info-recursive
 
 dvi: $(DVIS) dvi-recursive
 
-check: check-binSCRIPTS check-pkgdataSCRIPTS check-recursive
+check: check-recursive
 
 installcheck: installcheck-recursive installcheck-local
 

diff --git a/TODO b/TODO
index 54927679306a83519eb729b0568af815a459f9fd..a751e633029848d9304938b9d2df4449e7b160a8 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,6 +8,14 @@ Further:
 - Per's suggestion
 - man page fixes
 
+From David A Swierczek: automake should notice (eg) AC_CHECK_PROG and
+auto-generate Makefile substitution:
+       AC_CHECK_PROG(AR, ...)
+    =>  AR = @AR@ in Makefile.in
+Ditto AC_SUBST and other things that make sense.  Furthermore, other
+macros (eg AC_PROG_CC) should be handled via a similar mechanism; many
+special cases could be eliminated.
+
 consider putting all check-* targets onto @check?
 To support --help/--version checking?
 

diff --git a/automake.in b/automake.in
index faf5693f9190fed04baf99ce381dbba3c17546b4..72d903f5d6cd6ef3c3a6214f86ce07f41af0316e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -510,8 +510,6 @@ sub handle_options
 
     foreach (&variable_value_as_list ('AUTOMAKE_OPTIONS'))
     {
-       last if /^#/;
-
        $options{$_} = 1;
        if ($_ eq 'gnits' || $_ eq 'gnu' || $_ eq 'foreign')
        {
@@ -3021,6 +3019,9 @@ sub variable_value_as_list
        $content_seen{$var} = 1;
        foreach (split (' ', $contents{$var}))
        {
+           # If a comment seen, just leave.
+           last if /^#/;
+
            # Handle variable substitutions.
            if (/^\$\{(.*)\}$/ || /^\$\((.*)\)$/)
            {

diff --git a/tests/ChangeLog b/tests/ChangeLog
index d76d2dab68fc37660dba72d2cab5ccf4a24a37b0..fac8d548052aecfcfa6eca9b3cdd1ae00516b9b3 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep 30 08:34:07 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * comment2.test: New file.
+
 Mon Sep 23 00:23:34 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * spell3.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d0b8a30ddebcf2782f870b6e8d66b6561d93e185..1e3aa7f2c930fbd2b0851d0661f3d18b221e77f7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,6 +15,6 @@ man.test info.test obsolete.test lex.test scripts.test subdir2.test \
 exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \
 order.test libobj2.test interp.test alllib.test block.test libobj3.test \
 gnits.test interp2.test colneq.test implicit.test spell.test spell2.test \
-confsub.test primary.test primary2.test depend2.test spell3.test
+confsub.test primary.test primary2.test depend2.test spell3.test comment2.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 19661fb73fa713fe6dea4380b8e2cd2d7acf2fc1..6f5ac85b28fd39e705fd5e5e70041141caa7ebf2 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -53,7 +53,7 @@ man.test info.test obsolete.test lex.test scripts.test subdir2.test \
 exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \
 order.test libobj2.test interp.test alllib.test block.test libobj3.test \
 gnits.test interp2.test colneq.test implicit.test spell.test spell2.test \
-confsub.test primary.test primary2.test depend2.test spell3.test
+confsub.test primary.test primary2.test depend2.test spell3.test comment2.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs

diff --git a/tests/comment2.test b/tests/comment2.test
new file mode 100755 (executable)
index 0000000..721ff22
--- /dev/null
+++ b/tests/comment2.test
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# Make sure comment recognition works in PROGRAMS.  Report from Mark
+# Galassi.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = sim_products receive_th receive_pos # image_proc
+END
+
+$AUTOMAKE || exit 1
+
+grep '^image_proc' Makefile.in && exit 1
+exit 0