Tag
Hash :
0fff0a79
Author :
Date :
2005-06-23T22:19:56
* lib/Automake/Variable.pm (define, _new): Remember the helper variable created for the last conditional += on each variable, and only append further += in the same condition to this last helper variable, not to older helper variables. This way the order of the items appended to the variable is preserved. * tests/cond21.test: Adjust. * tests/cond38.test: New file. * tests/Makefile.am (TESTS): Add cond38.test. Report from Ed Hartnett.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
#! /bin/sh
# Copyright (C) 2002, 2005 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
# GNU Automake is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
# Check for use of = and += in different conditions.
. ./defs || exit 1
cat >> configure.in << 'END'
AC_PROG_CC
AM_CONDITIONAL(COND1, true)
AM_CONDITIONAL(COND2, true)
AM_CONDITIONAL(COND3, true)
AC_OUTPUT
END
cat > Makefile.am << 'END'
FOO = foo
if COND1
FOO += foo1
else
FOO += foon1
endif
if COND2
FOO += foo2
else
FOO += foon2
endif
if COND1
FOO += foo1b
else
FOO += foon1b
endif
if COND1
if COND2
BAR = bar12
else
BAR = bar1n2
endif
else
BAR = barn1
endif
BAR += bar
if COND3
BAR += bar3
endif
test:
@echo BAR: $(BAR) :BAR
@echo FOO: $(FOO) :FOO
END
set -e
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure
$MAKE test | $FGREP 'BAR: bar12 bar bar3 :BAR'
$MAKE test | $FGREP 'FOO: foo foo1 foo2 foo1b :FOO'