From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 16 Jun 2013 14:49:07 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f057d98f8b1117a2aa28bb1a093be5cf40565e6;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  tests: some improvements to Gettext tests
  post-release: micro version bump (1.13.4a)
  release: stable micro release 1.13.4
  sync: update config.guess

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

4f057d98f8b1117a2aa28bb1a093be5cf40565e6
diff --cc t/gettext-external-pr338.sh
index 48ea39713,c82af6995..01b35ff64
--- a/t/gettext-external-pr338.sh
+++ b/t/gettext-external-pr338.sh
@@@ -48,8 -48,10 +48,10 @@@ grep 'AM_GNU_GETTEXT.*po' stder
  echo 'SUBDIRS = po' >Makefile.am
  $AUTOMAKE --add-missing
  
 -
  # Don't try running ./configure --with-included-gettext if the
  # user is using AM_GNU_GETTEXT([external]).
++
+ grep 'with-included-gettext' Makefile.in && exit 1
  ./configure
  $MAKE -n distcheck | grep 'with-included-gettext' && exit 1