[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2041-g9df2e72

[Peter Rosin]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9df2e72d4587b86a5ad49217b11cd8e3d3e63173

The branch, master has been updated
       via  9df2e72d4587b86a5ad49217b11cd8e3d3e63173 (commit)
       via  1da044d6234dba752fbb880180d54ca5fc9a3357 (commit)
      from  8d0391c50b8205ea6388cba13c16c09c18e57974 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9df2e72d4587b86a5ad49217b11cd8e3d3e63173
Merge: 8d0391c 1da044d
Author: Peter Rosin <address@hidden>
Date:   Fri Mar 2 11:49:18 2012 +0100

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

commit 1da044d6234dba752fbb880180d54ca5fc9a3357
Author: Peter Rosin <address@hidden>
Date:   Fri Mar 2 11:48:41 2012 +0100

    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.

-----------------------------------------------------------------------

Summary of changes:
 tests/vala.test |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tests/vala.test b/tests/vala.test
index b4e2d76..71c2ee6 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -27,8 +27,8 @@ 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


hooks/post-receive
-- 
GNU Automake