kmx git

Commit

Hash : 38e1b39d
Author :
Date : 2011-11-03T13:50:06

Merge branch 'msvc' into master

Commits merged from msvc:
 - tests: few improvements to some `ar-lib' related tests
 - warnings: new 'extra-portability' category, for AM_PROG_AR
 - ar-lib: new 'AM_PROG_AR' macro, triggering the 'ar-lib' script

Extra changes required by the testsuite:
* tests/instspc-tests.sh: Adjust to new portability requirements
due to the new AM_PROG_AR macro.
* tests/libobj-basic.test: Likewise.
* tests/libobj2.test: Likewise.
* tests/libobj15a.test: Likewise.
* tests/libobj15b.test: Likewise.
* tests/libobj15c.test: Likewise.
* tests/libobj16a.test: Likewise.
* tests/libobj16b.test: Likewise.
* tests/libobj17.test: Likewise.
* tests/libobj18.test: Likewise.
* tests/libobj19.test: Likewise.
* tests/libobj20a.test: Likewise.
* tests/libobj20b.test: Likewise.
* tests/libobj20c.test: Likewise.
* tests/canon6.test: Likewise.
* tests/canon6.test: Likewise.
* tests/canon7.tests: Likewise.
* tests/extra9.test: Likewise.
* tests/extradep.test: Likewise.
* tests/extradep2.test: Likewise.
* tests/posixsubst-ldadd.test: Likewise.
* tests/posixsubst-libraries.test: Likewise.
* tests/posixsubst-ltlibraries.test: Likewise.
* tests/python-virtualenv.test: Likewise.
* tests/vartypos.test: Likewise.
* tests/vartypo2.test: Likewise.
* tests/suffix.test: Update to take into account previous
master-only changes.
* tests/suffix2.test: Likewise.
* tests/libobj7.test: Call automake with the `--add-missing'
option, instead of creating a dummy `ar-lib' file, since this
test now also runs "./configure" and "make".
* tests/suffix5.test: Copy the real `ar-lib' script file,
instead of creating a dummy one, since this test now also
runs "./configure" and "make".
* tests/extra-portability2.test: Fix this test not to rely
on the older, faulty semantics of "strictness specification
always reset warning level", which has been fixed in commit
v1.11-623-g1609491 (see also automake bug#7669 a.k.a. PR/547).
Since we are at it, throw inf few other minor unrelated
improvements.
* tests/extra-portability.test: Explicitly pass `-Wall' to
automake calls, for clarity.

tests/aclocal4.test

#! /bin/sh
# Copyright (C) 2003, 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/>.

# Make sure dependencies on aclocal.m4 are set correctly.
# Report from Jim Meyering.

# We need GNU make for the `rebuild rules' to be triggered.
required=GNUmake
. ./defs || Exit 1

cat >>configure.in <<EOF
AC_PROG_RANLIB
AM_PROG_AR
AC_PROG_CC
MY_MACRO
AC_CONFIG_FILES([lib/Makefile])
AC_OUTPUT
EOF

mkdir m4
cat >m4/mymacro.m4 <<EOF
AC_DEFUN([MY_MACRO], [])
EOF

mkdir lib
: > lib/foo.c
: > lib/bar.c
cat >lib/Makefile.am <<'EOF'
noinst_LIBRARIES = liberi.a
liberi_a_SOURCES = bar.c
liberi_a_LIBADD = $(LIBOBJS)
EOF

cat >Makefile.am <<'EOF'
SUBDIRS = lib
EXTRA_DIST = m4/mymacro.m4
ACLOCAL_AMFLAGS = -I m4
check-foo: distdir
	test -f $(distdir)/lib/foo.c
	test -f $(distdir)/lib/bar.c

check-not-foo: distdir
	test ! -f $(distdir)/lib/foo.c
	test -f $(distdir)/lib/bar.c
EOF

$ACLOCAL -I m4
$AUTOCONF
$AUTOMAKE --add-missing
./configure
$MAKE check-not-foo

# Update one of the macros.  This should cause ./configure, Makefile.in,
# Makefile, lib/Makefile.in, and lib/Makfile to be updated.  This assumes
# GNU make.

cat >m4/mymacro.m4 <<'EOF'
AC_DEFUN([MY_MACRO], [AC_LIBOBJ([foo])])
EOF

$MAKE check-foo

kc3-lang/automake/tests/aclocal4.test

Commit

tests/aclocal4.test