projects / platform / upstream / automake.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 693557c) | patch
tests: fix (harmless) botched merge
authorPeter Rosin <peda@lysator.liu.se>
Fri, 2 Mar 2012 11:59:55 +0000 (12:59 +0100)
committerPeter Rosin <peda@lysator.liu.se>
Fri, 2 Mar 2012 11:59:55 +0000 (12:59 +0100)
commit7d836cd0adf95778b4e5e9d9a87b3fd1842e5c3b
tree505ee7dc61da7d3a6f975d43c4c8e02e78257230tree | snapshot
parent693557ce7fcd728fa9e7b5d60713b4caefc39e78commit | diff
tests: fix (harmless) botched merge

Commit v1.11.2-114-g693557c of 2012-01-16 (Merge branch 'maint'
into branch-1.11) 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;