Hash :
5012480b
Author :
Date :
2011-11-03T15:39:02
Merge branch 'master' into testsuite-work
Commits merged from master:
- tests: various minor tweakings, mostly related to AM_PROG_AR
- maint-mode: fix botched configure messages
- fix: regenerate Makefiles
- tests: few improvements to some `ar-lib' related tests
- info: allow user to inhibit creation/update of '${infodir}/dir'
- warnings: new 'extra-portability' category, for AM_PROG_AR
- ar-lib: new 'AM_PROG_AR' macro, triggering the 'ar-lib' script
Extra testsuite adjustments:
* tests/instspc.tap: Adjust to new portability requirements
due to the new AM_PROG_AR macro.
* tests/lex-lib.test: Likewise.
* tests/extra-portability2.test: Use `$am_original_AUTOMAKE'
instead of the obsolete `$original_AUTOMAKE'.
* tests/list-of-tests.mk: Update.
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
#! /bin/sh
# Copyright (C) 2001, 2002, 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 for bug in conditionals.
# Report from Lars J. Aas.
. ./defs || Exit 1
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_CXX
AM_PROG_AR
AC_PROG_RANLIB
AM_CONDITIONAL([COND1], [true])
AM_CONDITIONAL([COND2], [true])
END
cat > Makefile.am << 'END'
noinst_LIBRARIES = libtest.a
if COND1
SOURCEVAR1 =
SOURCEVAR2 = habla.cpp espanol.cpp
else
SOURCEVAR1 = dummy.cpp
SOURCEVAR2 =
endif
if COND2
TESTSOURCES = $(SOURCEVAR1)
else
TESTSOURCES = $(SOURCEVAR2)
endif
libtest_a_SOURCES = $(TESTSOURCES)
END
: > ar-lib
$ACLOCAL
$AUTOMAKE
grep '^am_libtest_a_OBJECTS =' Makefile.in
: