From: Peter Rosin <peda@lysator.liu.se>
Date: Fri, 2 Mar 2012 10:48:41 +0000 (+0100)
Subject: tests: fix (harmless) botched merge
X-Git-Tag: v1.11b~59^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1da044d6234dba752fbb880180d54ca5fc9a3357;p=thirdparty%2Fautomake.git

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.
---

diff --git a/tests/vala.test b/tests/vala.test
index e1d267656..280c9eedf 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -28,8 +28,8 @@ END
 cat >> 'configure.in' << 'END'
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_LIBTOOL
 AM_PROG_AR
+AC_PROG_LIBTOOL
 AM_PROG_VALAC
 AC_CONFIG_FILES([sub/Makefile])
 AC_OUTPUT