diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-09-23 01:24:12 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-12-28 21:31:55 +0100 |
commit | 7d989ddd3afc5e4fbf58290c94a6e0c311ccd15e (patch) | |
tree | ffe6247563232c27890c7d1887d08769cf3b22ec /t/libtool-macros.sh | |
parent | 880595d0b4930c51f96da50f755f2f2f882fe5b4 (diff) | |
download | automake-7d989ddd3afc5e4fbf58290c94a6e0c311ccd15e.tar.gz |
ACLOCAL_AMFLAGS: fully deprecate, with warnings in the 'obsolete' category
Users are expected to use the AC_CONFIG_MACRO_DIR{,S} autoconf macros
instead. And the use of the '--install' aclocal option in ACLOCAL_AMFLAGS
has proved to be a bad idea anyway -- see automake bug#9037.
* NEWS: Update.
* t/aclocal-amflags.sh: Enhance and adjust.
* t/acloca14b.sh: Adjust.
* t/acloca22b.sh: Likewise.
* t/ax/distcheck-hook-m4.am: Likewise.
* t/dist-missing-m4.sh: Likewise.
* t/remake-renamed-m4-macro.sh: Likewise.
* t/remake-renamed-m4-macro-and-file.sh: Likewise.
* t/remake-renamed-m4-file.sh: Likewise.
* t/remake-moved-m4-file.sh: Likewise.
* t/remake-gnulib-remove-header.sh: Likewise.
* t/remake-gnulib-add-acsubst.sh: Likewise.
* t/remake-deleted-m4-file.sh: Likewise.
* t/remake-deleted-m4-file.sh: Likewise.
* t/libtool-macros.sh: Likewise.
* t/gettext-macros.sh: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/libtool-macros.sh')
-rwxr-xr-x | t/libtool-macros.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/libtool-macros.sh b/t/libtool-macros.sh index c50777b7c..ec84682a1 100755 --- a/t/libtool-macros.sh +++ b/t/libtool-macros.sh @@ -23,8 +23,7 @@ echo "# Automatically generated by $me." > get.sh echo : >> get.sh -# The 'libtoolize' script will look into Makefile.am. -echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am +echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac if libtoolize --copy --install && test -f m4/libtool.m4; then echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh @@ -37,7 +36,7 @@ else mkdir m4 echo AC_PROG_LIBTOOL >> configure.ac # See below for an explanation about the use the of '-Wno-syntax'. - if $ACLOCAL -Wno-syntax -I m4 --install && test -f m4/libtool.m4; then + if $ACLOCAL -Wno-syntax --install && test -f m4/libtool.m4; then : # Libtool macros already accessible by default. else echo "skip_all_ \"couldn't find or get libtool macros\"" >> get.sh |