diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-05 17:37:44 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-08 17:05:49 +0200 |
| commit | 30f99cbd07736c96603d15346fc8ad9097a0dddd (patch) | |
| tree | a56240054e1bec55d8f240059bfe836adeca4fd0 /tests/aclocal.test | |
| parent | 3c99e9dca034ba5cbe3848af024aea5b4fc19b6c (diff) | |
| download | automake-30f99cbd07736c96603d15346fc8ad9097a0dddd.tar.gz | |
aclocal: more granularity in acdir overriding
Before this change, using the `--acdir' option caused aclocal to
redefine both the directory of automake-provided m4 macros and the
directory of third-party system-wide m4 macros. With this change,
we deprecate the `--acdir' aclocal option, and introduce two new
options `--automake-acdir' and `--system-acdir', to allow for more
granularity.
* aclocal.in (@automake_includes, @system_includes,
@user_includes): Fix and extend comments.
(usage): Update.
(handle_acdir_option): New function.
(parse_arguments): Recognize new options `--system-acdir' and
`automake-acdir', and handle `--acdir' using the new function
above. Simplify logic by assuming that the directory of
third-party system-wide m4 files always exists.
* tests/aclocal.in: Update to use the new options, instead of
the deprecated. `--acdir'.
* m4/dirlist: Move ...
* m4/acdir/dirlist: ... here.
* m4/Makefile.am (EXTRA_DIST): Update.
(m4datadir): Rename ...
(automake_acdir): ... to this. Accordingly, ...
(dist_m4data_DATA): ... rename this ...
(dist_automake_ac_DATA): ... to this.
(system_acdir): New, directory.
(dist_system_ac_DATA): New, defined to an empty value; this will
ensure that the $(system_acdir) directory will be created by
"make install".
* tests/aclocal.test: Remove check about the `--print-ac-dir'
option of aclocal, it has been moved into ...
* tests/aclocal-print-acdir.test: ... this new test, and quite
extended.
* tests/aclocal-acdir.test: New test.
* tests/Makefile.am (TESTS): Add the new tests.
* NEWS, bootstrap: Update.
* doc/automake.texi (aclocal Options, Macro Search Path): Update.
Diffstat (limited to 'tests/aclocal.test')
| -rwxr-xr-x | tests/aclocal.test | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/aclocal.test b/tests/aclocal.test index da80d0887..439faa95f 100755 --- a/tests/aclocal.test +++ b/tests/aclocal.test @@ -15,8 +15,8 @@ # 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 aclocal --output works. Report from -# Alexandre Oliva. +# Test on some aclocal options. Report from Alexandre Oliva. + . ./defs || Exit 1 set -e @@ -41,6 +41,4 @@ grep '[Tt]ry.*--help.*for more information' stderr $ACLOCAL --versi -test "`$ACLOCAL --print-ac-dir`" = "$testaclocaldir" - : |