[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] tests: fix (harmless) botched merge
From: |
Peter Rosin |
Subject: |
[PATCH] tests: fix (harmless) botched merge |
Date: |
Fri, 2 Mar 2012 13:08:34 +0100 |
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 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Hi!
I'm also pushing this very similar patch to branch-1.11.
Cheers,
Peter
diff --git a/tests/vala.test b/tests/vala.test
index 9750942..4eb17df 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -34,8 +34,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
--
1.7.9