Tag
Hash :
60501dbd
Author :
Date :
2003-02-02T23:40:51
* automake.in (vars_scanned): Move near traverse_variable_recursively. (traverse_variable_recursively, traverse_variable_recursively_worker): Accept a $COND_FILTER argument to filter out conditions during recursion. Don't recurse into undefined variables. Don't pass empty results to &FUN_COLLECT. (value_to_list): Remove, was used by variable_value_as_list_recursive_worker only. (variable_value_as_list_recursive_worker): Rewrite using traverse_variable_recursively. Remove the $parent argument. (variable_value_as_list_recursive, variable_loc_and_value_as_list_recursive): Adjust calls to variable_value_as_list_recursive_worker. Don't reset %vars_scanned. * tests/cond3.test: Don't expect empty helper variables, we don't output them anymore. * tests/cond30.test: Use an undefined variable.
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 81 82 83
#! /bin/sh
# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003 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 sources listed in conditional.
# Report from Rob Savoye <rob@cygnus.com>, and Lars J. Aas.
. ./defs || exit 1
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
AC_PROG_CC
AM_CONDITIONAL(ONE, true)
AM_CONDITIONAL(TWO, false)
AM_CONDITIONAL(THREE, maybe)
AC_OUTPUT(Makefile)
END
cat > Makefile.am << 'END'
bin_PROGRAMS = targ
if ONE
SONE = one.c
else
SONE =
endif
if TWO
STWO = two.c
else
STWO =
endif
if THREE
STHREE = three.c
else
STHREE =
endif
targ_SOURCES = $(SONE) $(STWO) $(STHREE)
END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
# `b top' so that
sed -n '
/[oO][bB][jJ][eE][cC][tT].* =/ {
: loop
/\\$/ {
p
n
b loop
}
p
}' Makefile.in >produced
cat >expected << 'EOF'
@ONE_TRUE@am__objects_1 = one.$(OBJEXT)
@TWO_TRUE@am__objects_2 = two.$(OBJEXT)
@THREE_TRUE@am__objects_3 = three.$(OBJEXT)
am_targ_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_3)
targ_OBJECTS = $(am_targ_OBJECTS)
EOF
diff expected produced || exit 1