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

diff --cc bin/automake.in
Simple merge

diff --cc t/dist-shar.sh
index 5db0ade774653fe139da74b5d5c614fe214397a1,2265fd9962305560a56ded0b952ffa9c8e1784c7..8b053b29df183efda6206668f72cc837d7df4946
--- 1/t/dist-shar.sh
--- 2/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