[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11
From: |
Peter Rosin |
Subject: |
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.3-17-g3c0d821 |
Date: |
Fri, 02 Mar 2012 12:08:43 +0000 |
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=3c0d8213bc1d7a6a11defbd8d1e904fb0a1eee99
The branch, branch-1.11 has been updated
via 3c0d8213bc1d7a6a11defbd8d1e904fb0a1eee99 (commit)
via 7d836cd0adf95778b4e5e9d9a87b3fd1842e5c3b (commit)
from bd7ff422f866a08064eb9a01a106ab1fa6425bf5 (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 3c0d8213bc1d7a6a11defbd8d1e904fb0a1eee99
Merge: bd7ff42 7d836cd
Author: Peter Rosin <address@hidden>
Date: Fri Mar 2 13:04:13 2012 +0100
Merge branch 'fix-vala-test-for-branch-1.11' into branch-1.11
* fix-vala-test-for-branch-1.11:
tests: fix (harmless) botched merge
commit 7d836cd0adf95778b4e5e9d9a87b3fd1842e5c3b
Author: Peter Rosin <address@hidden>
Date: Fri Mar 2 12:59:55 2012 +0100
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.
-----------------------------------------------------------------------
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 fc17987..2c7dae1 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
hooks/post-receive
--
GNU Automake
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.3-17-g3c0d821,
Peter Rosin <=