From: Peter Rosin <peda@lysator.liu.se>
Date: Fri, 2 Mar 2012 10:49:18 +0000 (+0100)
Subject: Merge branch 'fix-vala-test'
X-Git-Tag: v1.11b~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9df2e72d4587b86a5ad49217b11cd8e3d3e63173;p=thirdparty%2Fautomake.git

Merge branch 'fix-vala-test'

* fix-vala-test:
  tests: fix (harmless) botched merge
---

9df2e72d4587b86a5ad49217b11cd8e3d3e63173
diff --cc tests/vala.test
index b4e2d7656,280c9eedf..71c2ee6eb
--- a/tests/vala.test
+++ b/tests/vala.test
@@@ -24,11 -25,11 +24,11 @@@ AC_DEFUN([AC_PROG_LIBTOOL]
           [AC_SUBST([LIBTOOL], [:])])
  END
  
 -cat >> 'configure.in' << 'END'
 +cat >> 'configure.ac' << '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