Tag
Hash :
6a952503
Author :
Date :
2002-11-20T22:03:57
* automake.in (conditional_ambiguous_p, macro_define, rule_define, require_variables): Use ->human instead of ->string. * lib/Automake/Conditional.pm (string): Don't sort conditions, they are already sorted. (_to_human, human): New functions. * lib/Automake/ConditionalSet.pm (human): New function. * tests/cond27.test, tests/library3.test, tests/pluseq5.test, tests/pluseq9.test: Adjust.
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
#! /bin/sh
# Copyright (C) 1999, 2001, 2002 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 autoconf; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
# Test for another `+=' problem. Report from Brian Jones.
. ./defs || exit 1
echo 'AM_CONDITIONAL(CHECK, true)' >> configure.in
cat > Makefile.am << 'END'
if CHECK
INCLUDES = abc
endif
INCLUDES += def
END
$ACLOCAL || exit 1
$AUTOMAKE 2>stderr && exit 1
cat stderr # for debugging
# We expect the following diagnostic:
#
# Makefile.am:4: Cannot apply `+=' because `INCLUDES' is not defined in
# Makefile.am:4: the following conditions:
# Makefile.am:4: !CHECK
# Makefile.am:4: Either define `INCLUDES' in these conditions, or use
# Makefile.am:4: `+=' in the same conditions as the definitions.
# Is !CHECK mentioned?
grep ':.*!CHECK$' stderr || exit 1
# Is there only one missing condition?
test `grep ': ' stderr | wc -l` = 1 || exit 1
# By the way, Automake should suggest using AM_CPPFLAGS,
# because INCLUDES is an obsolete name.
grep AM_CPPFLAGS stderr || exit 1
# A way to suppress the obsolete warning is to use
# -Wno-obsolete:
echo 'AUTOMAKE_OPTIONS = -Wno-obsolete' >> Makefile.am
$AUTOMAKE 2>stderr && exit 1
cat stderr
grep AM_CPPFLAGS stderr && exit 1
# !CHECK should still be mentioned.
grep ':.*!CHECK$' stderr || exit 1