projects / platform / upstream / automake.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9928ea5) | patch
tests: fix (harmless) botched merge
authorPeter Rosin <peda@lysator.liu.se>
Fri, 2 Mar 2012 10:48:41 +0000 (11:48 +0100)
committerPeter Rosin <peda@lysator.liu.se>
Fri, 2 Mar 2012 10:48:41 +0000 (11:48 +0100)
commit1da044d6234dba752fbb880180d54ca5fc9a3357
tree823f55f0b782bbbefb00fed097f6b3ce51c72eaftree | snapshot
parent9928ea5c84889026f5800fe4270013791d47f16acommit | diff
tests: fix (harmless) botched merge

Commit v1.11-1750-g9928ea5 of 2012-01-16 (Merge branch 'maint')
reordered the macro calls so that AM_PROG_AR ended up after
AC_PROG_LIBTOOL, which is not allowed.  This error went by
undetected since AC_PROG_LIBTOOL was redefined, but that also
removed the ordering requirement making the error benign.

* tests/vala.test: Put AM_PROG_AR before AC_PROG_LIBTOOL.
tests/vala.test diff | blob | history
Domain: System / Base;