From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 16 Jan 2012 17:43:28 +0000 (+0100)
Subject: Merge branch 'maint' into branch-1.11
X-Git-Tag: v1.11.2b~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=693557ce7fcd728fa9e7b5d60713b4caefc39e78;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint' into branch-1.11

* maint:
  recheck: fix interaction with "make -n"
  vala: avoid potential useless remakes (minor bugfix)
  vala: enhance tests
  recheck: behave better with non-GNU make
  check: separate .log -> .html conversion from core testsuite harness
  docs: deprecate .log -> .html conversion by parallel-tests
  tests: list some forgotten test cases in $(TESTS)
  maintcheck: consistency of list of test scripts
---

693557ce7fcd728fa9e7b5d60713b4caefc39e78
diff --cc NEWS
index a177096,172889c..b11b8ac
--- a/NEWS
+++ b/NEWS
@@@ -2,10 -2,10 +2,14 @@@ New in 1.11.2a
  
  * WARNING: Future backward-incompatibilities!
  
+   - The support for ".log -> .html" conversion and the check-html and
+     recheck-html targets will be removed in the next major Automake
+     release (1.12).
+ 
 +  - The obsolescent AM_WITH_REGEX  macro has been deprecated (since the
 +    GNU rx library has been decommissioned), and will be removed in the
 +    next major Automake release (1.12).
 +
    - The `lzma' compression format for distribution archives has been
      deprecated in favor of `xz' and `lzip', and will be removed in the
      next major Automake release (1.12).
diff --cc tests/vala.test
index 34b71d4,442661d..9750942
--- a/tests/vala.test
+++ b/tests/vala.test
@@@ -26,11 -25,18 +25,19 @@@
  
  set -e
  
- cat >> 'configure.in' << 'END'
+ # So that we won't require libtool macros.
+ cat > acinclude.m4 <<'END'
+ AC_DEFUN([AC_PROG_LIBTOOL],
+          [AC_SUBST([LIBTOOL], [:])])
+ END
+ 
+ cat >> configure.in <<'END'
  AC_PROG_CC
- AM_PROG_AR
+ AC_PROG_CXX
  AC_PROG_LIBTOOL
++AM_PROG_AR
  AM_PROG_VALAC
+ AC_CONFIG_FILES([sub/Makefile])
  AC_OUTPUT
  END