Hash :
58c019e0
Author :
Date :
2011-10-20T14:39:53
Merge branch 'test-protocols' into testsuite-work * test-protocols: cosmetics: remove obsolete comment coverage: conditional contents in LOG_DRIVER variables coverage: LOG_DRIVER variables can be defined through AC_SUBST tests: fix spurious failure with Solaris /bin/sh threaded-am: better serialization for required config files automake: refactor, break up 'require_file_internal' dist: separate auxiliary file instantiation from DIST_COMMON update refactor: rename a subroutine to a more proper name dist: truly always distribute files in AC_REQUIRE_AUX_FILE dist: simplify automake code accordingly to the previous changes dist: auxiliary files can be distributed from subdir Makefiles
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) 2001, 2002, 2004, 2006, 2010, 2011 Free Software
# Foundation, Inc.
#
# This program 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.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
# Test to make sure that depcomp and compile are added to DIST_COMMON.
# Report from Pavel Roskin. Report of problems with `--no-force' from
# Scott James Remnant (Debian #206299)
. ./defs || Exit 1
cat >> configure.in << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
AC_CONFIG_FILES([subdir/Makefile])
AC_OUTPUT
END
cat > Makefile.am << 'END'
SUBDIRS = subdir
END
mkdir subdir
: > subdir/foo.c
cat > subdir/Makefile.am << 'END'
noinst_PROGRAMS = foo
foo_SOURCES = foo.c
foo_CFLAGS = -DBAR
END
$ACLOCAL
for opt in '' --no-force; do
$AUTOMAKE $opt --add-missing
test -f compile
test -f depcomp
for dir in . subdir; do
# FIXME: the logic of this check and other similar ones in other
# FIXME: `distcom*.test' files should be factored out in a common
# FIXME: subroutine in `defs'...
sed -n -e "
/^DIST_COMMON =.*\\\\$/ {
:loop
p
n
t clear
:clear
s/\\\\$/\\\\/
t loop
s/$/ /
s/[$tab ][$tab ]*/ /g
p
n
}" $dir/Makefile.in > $dir/dc.txt
done
cat dc.txt # For debugging.
cat subdir/dc.txt # Likewise.
$FGREP ' $(top_srcdir)/depcomp ' subdir/dc.txt
# The `compile' script will be listed in the DIST_COMMON of the top-level
# Makefile because it's required in configure.in (by AM_PROG_CC_C_O).
$FGREP ' $(top_srcdir)/compile ' dc.txt || $FGREP ' compile ' dc.txt
done
: