kmx git

Commit

Hash : c7a6a92e
Author :
Date : 2011-10-21T00:23:34

ar-lib: new 'AM_PROG_AR' macro, triggering the 'ar-lib' script

* m4/ar-lib.m4: New macro AM_PROG_AR, which locates an
archiver and triggers the auxiliary 'ar-lib' script if needed.
* m4/Makefile.am (dist_m4data_DATA): Update.
* automake.in ($seen_ar): New variable.
(scan_autoconf_traces): Set it.
(handle_libraries, handle_ltlibraries): Require AM_PROG_AR for
portability.
* doc/automake.texi (Public Macros): Mention the new
'AM_PROG_AR' macro.
(Subpackages): Add AM_PROG_AR to the example.
(A Library): Adjust recommendations for AR given the new
AM_PROG_AR macro.
* All relevant tests: Adjust to new portability requirements due
to the new AM_PROG_AR macro.
* tests/ar-lib2.test: New test, checking that AM_PROG_AR triggers
install of ar-lib.
* tests/ar-lib3.test: New test, checking that lib_LIBRARIES
requires AM_PROG_AR.
* tests/ar-lib4.test: New test, checking that lib_LTLIBRARIES
requires AM_PROG_AR.
* tests/ar-lib5a.test: New test, checking that AM_PROG_AR triggers
use of ar-lib when the archiver is Microsoft lib.
* tests/ar-lib5b.test: New test, checking that AM_PROG_AR triggers
use of ar-lib when the archiver is a faked lib.
* tests/ar-lib6a.test: New test, checking the ordering of
AM_PROG_AR and LT_INIT.
* tests/ar-lib6b.test: New test, checking the ordering of
AM_PROG_AR and AC_PROG_LIBTOOL.
* tests/ar-lib7.test: New test, checking that automake warns
if ar-lib is missing.
* tests/ar3.test: New test, checking that AR and ARFLAGS may
be overridden by the user even if AM_PROG_AR is used.
* tests/ar4.test: New test, checking that AM_PROG_AR bails out
if it cannot determine the archiver interface.
* tests/ar5.test: New test, checking that AM_PROG_AR runs its
optional argument if it cannot determine the archiver interface.
* tests/defs.in: New required entry 'lib'.
* tests/Makefile.am (TESTS): Update.
* NEWS: Update.

Signed-off-by: Peter Rosin <peda@lysator.liu.se>

tests/aclocal4.test

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

set -e

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