Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/automake/files: automake-1.9.6-subst-test.patch
Date: Sat, 21 Mar 2009 11:39:49
Message-Id: E1LkzYI-0006Rp-9Z@stork.gentoo.org
1 vapier 09/03/21 11:39:46
2
3 Added: automake-1.9.6-subst-test.patch
4 Log:
5 Fix from upstream for tests with newer autotools #222225 by Xake.
6
7 Revision Changes Path
8 1.1 sys-devel/automake/files/automake-1.9.6-subst-test.patch
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.9.6-subst-test.patch?rev=1.1&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/automake/files/automake-1.9.6-subst-test.patch?rev=1.1&content-type=text/plain
12
13 Index: automake-1.9.6-subst-test.patch
14 ===================================================================
15 https://bugs.gentoo.org/222225
16
17 Patch from automake upstream git-repo to fix "make check" with newer versions of autoconf
18
19 From: Ralf Wildenhues <Ralf.Wildenhues@×××.de>
20 Date: Sun, 22 Jul 2007 09:06:23 +0000 (+0000)
21 Subject: * tests/subst.test: Move the AC_SUBST into a macro definition.
22 X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff_plain;h=3d85de7baa9edf21c56401db3d25ef8a8e8d7797
23
24 * tests/subst.test: Move the AC_SUBST into a macro definition.
25 Avoids an error from CVS Autoconf.
26 * THANKS: Update.
27 Report by Benoit Sigoure.
28 ---
29 diff --git a/tests/subst.test b/tests/subst.test
30 index 33e925d..a72af85 100755
31 --- a/tests/subst.test
32 +++ b/tests/subst.test
33 @@ -1,5 +1,5 @@
34 #! /bin/sh
35 -# Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc.
36 +# Copyright (C) 1996, 2001, 2002, 2007 Free Software Foundation, Inc.
37 #
38 # This file is part of GNU Automake.
39 #
40 @@ -24,8 +24,14 @@
41 . ./defs || exit 1
42
43 cat >> configure.in << 'END'
44 -AC_SUBST($1)
45 -AC_SUBST([$]$1) dnl this is the actual invocation that was used
46 +dnl This test used to have the following lines, which cannot have
47 +dnl worked sensibly with Autoconf for years, however:
48 +dnl AC_SUBST($1)
49 +dnl AC_SUBST([$]$1) dnl this is the actual invocation that was used
50 +dnl
51 +AC_DEFUN([FOO],
52 +[AC_SUBST([$1])])
53 +FOO([BAR])
54 END
55
56 : > Makefile.am