From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 19 May 2013 20:18:54 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.16~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89fdcc96d4f0444a55fc217350c56563efa55a0f;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: fix a spurious failure on NetBSD 5.1
  texi: build version.texi and stamp-vti in srcdir
  tests: fix a botched heading comment
  tests: fix another spurious with FreeBSD make
  tests: fix a spurious failure with FreeBSD make
---

89fdcc96d4f0444a55fc217350c56563efa55a0f
diff --cc t/dist-shar.sh
index 5db0ade77,2265fd996..8b053b29d
--- a/t/dist-shar.sh
+++ b/t/dist-shar.sh
@@@ -14,13 -14,12 +14,13 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -# Check support for no-dist-gzip with dist-shar.
 +# Trying to use removed option 'dist-shar' should trigger a clear
 +# error message.
  
- required=shar
+ required='shar unshar'
  . test-init.sh
  
 -errmsg='support for shar .*deprecated'
 +errmsg='support for shar .*removed'
  
  echo AUTOMAKE_OPTIONS = dist-shar > Makefile.am
  $ACLOCAL