From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 8 Jan 2004 20:22:24 +0000 (+0000)
Subject: * automake.in (handle_configure): Skip AC_CONFIG_LINKS items which
X-Git-Tag: Release-1-8b~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f323a7a72bc2f93d95f08d27c616b0904308d502;p=thirdparty%2Fautomake.git

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

diff --git a/ChangeLog b/ChangeLog
index f6f71ca59..b7837666f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-08  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* automake.in (handle_configure): Skip AC_CONFIG_LINKS items which
+	do not look like DEST:SRC.
+	* tests/conflnk3.test: Check for AC_CONFIG_LINKS($computed).
+
 2004-01-07  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	Fix for PR automake/289:
diff --git a/automake.in b/automake.in
index bb4d8b135..413db5c7d 100755
--- a/automake.in
+++ b/automake.in
@@ -3840,6 +3840,9 @@ sub handle_configure ($$$@)
   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.
diff --git a/tests/conflnk3.test b/tests/conflnk3.test
index 19409a134..24e81d16e 100755
--- a/tests/conflnk3.test
+++ b/tests/conflnk3.test
@@ -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(sdir/dest2:src2 sdir/dest3:$my_src_dir/src3)
 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/dest2
 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