2001-08-03 Richard Boulton <richard@tartarus.org>

	* automake.in (value_to_list): Check for whether $from is defined,
	rather than whether it is true, so that empty $froms are allowed in
	substitution reference patterns.

	* tests/substref.test: New file: test behavior of substitution
	references when the $from side of the substitution is empty.
	* tests/Makefile.am (TESTS): Added substref.test.

diff --git a/ChangeLog b/ChangeLog
index 0243b59d0f3ba752add8d3709972ee89cb802f0f..ec4013160daa40579c46b1994b7ce323faad1f3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-08-03  Richard Boulton <richard@tartarus.org>
+
+       * automake.in (value_to_list): Check for whether $from is defined,
+       rather than whether it is true, so that empty $froms are allowed in
+       substitution reference patterns.
+
+       * tests/substref.test: New file: test behavior of substitution
+       references when the $from side of the substitution is empty.
+       * tests/Makefile.am (TESTS): Added substref.test.
+
 2001-08-03  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * m4/install-sh.m4: New file.

diff --git a/automake.in b/automake.in
index 125829bbad7f0f2a5f5393d7c381c87c71a4fb0e..cecb270ffef34e95389b97c0311ca0839ff44fc2 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6113,7 +6113,7 @@ sub value_to_list
            @temp_list = &variable_value_as_list_worker ($1, $cond, $var);
 
            # Now rewrite the value if appropriate.
-           if ($from)
+           if (defined $from)
            {
                grep (s/$from$/$to/, @temp_list);
            }

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fc9bfda9ae8a75fef9745845ad54eedbc4f630fe..7932b2ce6678ba98257627ceb7504824fd9d8aef 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -275,6 +275,7 @@ subobj6.test \
 subobj7.test \
 subobj8.test \
 subst.test \
+substref.test \
 substtarg.test \
 suffix.test \
 suffix2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index d600297d9758d5d016315df69edce646e390fa30..542e78e8e539c4043524ce18e6d5778941b8fd38 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -343,6 +343,7 @@ subobj6.test \
 subobj7.test \
 subobj8.test \
 subst.test \
+substref.test \
 substtarg.test \
 suffix.test \
 suffix2.test \

diff --git a/tests/substref.test b/tests/substref.test
new file mode 100755 (executable)
index 0000000..750a404
--- /dev/null
+++ b/tests/substref.test
@@ -0,0 +1,46 @@
+#! /bin/sh
+
+# Test for bug in variable substitution references when left hand pattern is
+# null.
+# Report from Richard Boulton
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT(hello.c)
+AM_INIT_AUTOMAKE(hello,0.23)
+AC_PROG_CC
+AC_OUTPUT(Makefile)
+END
+
+cat > hello.c << 'END'
+END
+
+cat > Makefile.am << 'END'
+
+var1 = dlmain
+
+var2 = $(var1:=.)
+
+helldl_SOURCES = $(var2:=c)
+
+echorule:
+       @echo $(helldl_SOURCES) $(helldl_OBJECTS)
+
+bin_PROGRAMS = helldl
+END
+
+$needs_autoconf
+(gcc -v) > /dev/null 2>&1 || exit 77
+
+set -e
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+CC='gcc' ./configure
+
+val=`$MAKE echorule`;
+echo $val
+test "x$val" = "xdlmain.c dlmain.o"