FYI: support AC_CONFIG_LINKS($computed) correctly

[Alexandre Duret-Lutz]

I'm installing this on HEAD and branch-1-8.

2004-01-08  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (handle_configure): Skip entries which do not look
        like DEST:SRC.
        * tests/conflnk3.test: Check for AC_CONFIG_LINKS($computed).

Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.256.2.10
diff -u -r1.256.2.10 NEWS
--- NEWS        7 Jan 2004 19:41:32 -0000       1.256.2.10
+++ NEWS        8 Jan 2004 20:18:31 -0000
@@ -41,6 +41,11 @@
     This was an issue only in the Automake package itself, not in
     its output.
 
+  - Automake assumed that all AC_CONFIG_LINKS arguments had the form
+    DEST:SRC.  This was wrong, as some packages do
+    AC_CONFIG_LINKS($computedlinks).  This version no longer abort in
+    that situation.
+
 * Long-standing bugs:
 
   - Fix an unexpected diagnostic occurring when users attempt
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1526.2.4
diff -u -r1.1526.2.4 automake.in
--- automake.in 6 Jan 2004 22:08:30 -0000       1.1526.2.4
+++ automake.in 8 Jan 2004 20:18:35 -0000
@@ -3769,6 +3769,9 @@
   foreach my $spec (@config_links)
     {
       my ($link, $file) = split /:/, $spec;
+      # Some people do AC_CONFIG_LINKS($computed).  We only handle
+      # the DEST:SRC form.
+      next unless $file;
       my $where = $ac_config_files_location{$link};
 
       # Skip destinations that contain shell variables.
Index: tests/conflnk3.test
===================================================================
RCS file: /cvs/automake/automake/tests/conflnk3.test,v
retrieving revision 1.1
diff -u -r1.1 conflnk3.test
--- tests/conflnk3.test 3 Dec 2003 23:14:48 -0000       1.1
+++ tests/conflnk3.test 8 Jan 2004 20:18:37 -0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -52,6 +52,9 @@
 AC_CONFIG_LINKS($my_dest:src)
 # the following is a link whose source is itself a link
 AC_CONFIG_LINKS(dest4:sdir/dest2)
+# Some package prefer to compute links.
+cmplink='dest5:src';
+AC_CONFIG_LINKS($cmplink)
 AC_OUTPUT
 EOF
 
@@ -69,13 +72,15 @@
 test -e sdir/dest3
 test -e dest
 test -e dest4
+test -e dest5
 $MAKE test
 
 $MAKE distclean
 test ! -e sdir/dest2
 test ! -e sdir/dest3
 test -e dest  # Should still exist, Automake knows nothing about it.
-rm -f dest
+test -e dest5 # ditto
+rm -f dest dest5
 test ! -e dest4
 
 ## Cannot do the following, because at the time of writing Autoconf

-- 
Alexandre Duret-Lutz