[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13b-142-gf05943a

[Stefano Lattarini]

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=f05943a2948c9ca7c98cb31f221a6f1529d3b928

The branch, master has been updated
       via  f05943a2948c9ca7c98cb31f221a6f1529d3b928 (commit)
       via  e4a0b83273e5c51a4f8d6877407e117c4746d8ed (commit)
       via  6f723f1ed6e7383c8f266f6b06eac5f696268784 (commit)
      from  b401dcece25aa79817c3b6f16a4e64c1b1caed15 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 t/{gettext2.sh => gettext-basics.sh}               |   41 ++++-----
 ...luded-parent-dir.sh => gettext-config-rpath.sh} |   40 ++++-----
 t/{gettext2.sh => gettext-external-pr338.sh}       |    4 +
 t/{gettext3.sh => gettext-intl-subdir.sh}          |    2 +
 t/{confh-subdir-clean.sh => gettext-pr381.sh}      |   31 ++++---
 t/gettext.sh                                       |   87 --------------------
 t/list-of-tests.mk                                 |    8 +-
 7 files changed, 65 insertions(+), 148 deletions(-)
 copy t/{gettext2.sh => gettext-basics.sh} (65%)
 copy t/{dist-included-parent-dir.sh => gettext-config-rpath.sh} (54%)
 rename t/{gettext2.sh => gettext-external-pr338.sh} (94%)
 rename t/{gettext3.sh => gettext-intl-subdir.sh} (99%)
 copy t/{confh-subdir-clean.sh => gettext-pr381.sh} (65%)
 delete mode 100644 t/gettext.sh

diff --git a/t/gettext2.sh b/t/gettext-basics.sh
similarity index 65%
copy from t/gettext2.sh
copy to t/gettext-basics.sh
index e6a8922..d128a0d 100644
--- a/t/gettext2.sh
+++ b/t/gettext-basics.sh
@@ -14,48 +14,45 @@
 # 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 gettext 'external' support.
-# PR/338, reported by Charles Wilson.
+# Check basic gettext support.
 
 required='gettext'
 . test-init.sh
 
-cat >>configure.ac <<END
-AM_GNU_GETTEXT([external])
+cat >> configure.ac << 'END'
+AM_GNU_GETTEXT
 AC_OUTPUT
 END
 
-: >Makefile.am
-mkdir foo po
+: > Makefile.am
+: > config.rpath
+mkdir po intl
 
 $ACLOCAL
+$AUTOCONF
 
-# config.rpath is required.
-: >config.rpath
-
-# po/ is required, but intl/ isn't.
+# po/ and intl/ are required.
 
 AUTOMAKE_fails --add-missing
 grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
 
-echo 'SUBDIRS = foo' >Makefile.am
+echo 'SUBDIRS = po' >Makefile.am
+AUTOMAKE_fails --add-missing
+grep 'AM_GNU_GETTEXT.*intl' stderr
+
+echo 'SUBDIRS = intl' >Makefile.am
 AUTOMAKE_fails --add-missing
 grep 'AM_GNU_GETTEXT.*po' stderr
 
 # Ok.
 
-echo 'SUBDIRS = po' >Makefile.am
+echo 'SUBDIRS = po intl' >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
-
-# intl/ isn't wanted with AM_GNU_GETTEXT([external]).
-
-mkdir intl
-echo 'SUBDIRS = po intl' >Makefile.am
-AUTOMAKE_fails --add-missing
-grep 'intl.*AM_GNU_GETTEXT' stderr
+# Make sure distcheck runs './configure --with-included-gettext'.
+./configure
+echo distdir: > po/Makefile
+echo distdir: > intl/Makefile
+$MAKE -n distcheck | grep '.*--with-included-gettext'
 
 :
diff --git a/t/dist-included-parent-dir.sh b/t/gettext-config-rpath.sh
similarity index 54%
copy from t/dist-included-parent-dir.sh
copy to t/gettext-config-rpath.sh
index bd411cb..d99e361 100644
--- a/t/dist-included-parent-dir.sh
+++ b/t/gettext-config-rpath.sh
@@ -14,38 +14,32 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure included files in parent directory are distributed.
+# Check the config.rpath requirement.
 
+required='gettext'
 . test-init.sh
 
 cat >> configure.ac << 'END'
-AC_CONFIG_FILES([sub/Makefile])
+AM_GNU_GETTEXT
+# config.rpath is required by versions >= 0.14.3.
+AM_GNU_GETTEXT_VERSION([0.14.3])
 AC_OUTPUT
 END
 
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-test: distdir
-       test -f $(distdir)/foo
-       test -f $(distdir)/bar
-       test 2 -gt `find $(distdir)/sub -type d | wc -l`
-END
-
-: > foo
-: > bar
+echo 'SUBDIRS = po intl' >Makefile.am
+mkdir po intl
 
-mkdir sub
-cat > sub/Makefile.am << 'END'
-include $(top_srcdir)/foo
-include ../bar
-END
+# If aclocal fails here, it may be that gettext is too old to provide
+# AM_GNU_GETTEXT_VERSION.  Similarly, autopoint will fail if it's
+# from an older version.  If gettext is too old to provide autopoint,
+# this will fail as well, so we're safe here.
+if ! $ACLOCAL && autopoint -n; then
+  skip_ "too old gettext installation"
+fi
 
-$ACLOCAL
-$AUTOCONF
+AUTOMAKE_fails --add-missing
+grep '^configure\.ac:.*required file.*config.rpath' stderr
+: > config.rpath
 $AUTOMAKE
-# Use --srcdir with an absolute path because it's harder
-# to support in 'distdir'.
-./configure --srcdir "$(pwd)"
-$MAKE test
 
 :
diff --git a/t/gettext2.sh b/t/gettext-external-pr338.sh
similarity index 94%
rename from t/gettext2.sh
rename to t/gettext-external-pr338.sh
index e6a8922..c82af69 100644
--- a/t/gettext2.sh
+++ b/t/gettext-external-pr338.sh
@@ -29,6 +29,7 @@ END
 mkdir foo po
 
 $ACLOCAL
+$AUTOCONF
 
 # config.rpath is required.
 : >config.rpath
@@ -47,9 +48,12 @@ grep 'AM_GNU_GETTEXT.*po' stderr
 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
 
 # intl/ isn't wanted with AM_GNU_GETTEXT([external]).
 
diff --git a/t/gettext3.sh b/t/gettext-intl-subdir.sh
similarity index 99%
rename from t/gettext3.sh
rename to t/gettext-intl-subdir.sh
index 28b26a0..a33f249 100644
--- a/t/gettext3.sh
+++ b/t/gettext-intl-subdir.sh
@@ -45,3 +45,5 @@ grep 'AM_GNU_GETTEXT.*intl.*SUBDIRS' stderr
 
 echo 'SUBDIRS = po intl' > Makefile.am
 $AUTOMAKE --add-missing
+
+:
diff --git a/t/confh-subdir-clean.sh b/t/gettext-pr381.sh
similarity index 65%
copy from t/confh-subdir-clean.sh
copy to t/gettext-pr381.sh
index beb6cec..ebf047d 100644
--- a/t/confh-subdir-clean.sh
+++ b/t/gettext-pr381.sh
@@ -14,27 +14,32 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test to make sure config headers in subdirectories are cleaned.
+# Automake gettext support: regression check for PR/381:
+# 'SUBDIRS = po intl' must not be required if 'po/' doesn't exist.
 
+required='gettext'
 . test-init.sh
 
 cat >> configure.ac << 'END'
-AC_CONFIG_HEADERS([sub/config.h:sub/config.hin])
+AM_GNU_GETTEXT
 AC_OUTPUT
 END
 
-touch Makefile.am
-mkdir sub
-
 $ACLOCAL
-$AUTOCONF
-touch sub/config.hin
+
+: > config.guess
+: > config.rpath
+: > config.sub
+
+test ! -d po # Sanity check.
+mkdir sub
+echo 'SUBDIRS = sub' > Makefile.am
 $AUTOMAKE
-./configure
-test -f sub/stamp-h1
-$MAKE clean
-test -f sub/stamp-h1
-$MAKE distclean
-test -f sub/stamp-h1 && exit 1
+
+# Still, SUBDIRS must be defined.
+
+: > Makefile.am
+AUTOMAKE_fails
+grep '^configure\.ac:.*AM_GNU_GETTEXT used but SUBDIRS not defined' stderr
 
 :
diff --git a/t/gettext.sh b/t/gettext.sh
deleted file mode 100644
index 496602d..0000000
--- a/t/gettext.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# 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 gettext support.
-
-required='gettext'
-. test-init.sh
-
-cat >>configure.ac <<END
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.14.3])
-AC_OUTPUT
-END
-
-: >Makefile.am
-mkdir po intl
-
-# config.rpath is required by versions >= 0.14.3.  We try to verify
-# this requirement, but only when we find we have a working and recent
-# gettext installation.
-
-# If aclocal fails here, it may be that gettext is too old to
-# provide AM_GNU_GETTEXT_VERSION.
-if $ACLOCAL; then
-
-  # autopoint will fail if it's from an older version.
-  # If gettext is too old to provide autopoint, this will
-  # fail as well, so we're safe here.
-  if autopoint -n; then
-    AUTOMAKE_fails --add-missing
-    grep 'required.*config.rpath' stderr
-  fi
-fi
-
-: >config.rpath
-sed '/AM_GNU_GETTEXT_VERSION/d' configure.ac >configure.tmp
-mv -f configure.tmp configure.ac
-
-$ACLOCAL
-
-# po/ and intl/ are required.
-
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
-
-echo 'SUBDIRS = po' >Makefile.am
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*intl' stderr
-
-echo 'SUBDIRS = intl' >Makefile.am
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*po' stderr
-
-# Ok.
-
-echo 'SUBDIRS = po intl' >Makefile.am
-$AUTOMAKE --add-missing
-
-# Make sure distcheck runs './configure --with-included-gettext'.
-grep 'with-included-gettext' Makefile.in
-
-# 'SUBDIRS = po intl' isn't required if po/ doesn't exist.
-# PR/381.
-
-rmdir po
-mkdir sub
-echo 'SUBDIRS = sub' >Makefile.am
-$AUTOMAKE
-
-# Still, SUBDIRS must be defined.
-
-: >Makefile.am
-AUTOMAKE_fails --add-missing
-grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 90f32bf..ed1fbde 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -484,9 +484,11 @@ t/gcj3.sh \
 t/gcj4.sh \
 t/gcj5.sh \
 t/gcj6.sh \
-t/gettext.sh \
-t/gettext2.sh \
-t/gettext3.sh \
+t/gettext-basics.sh \
+t/gettext-config-rpath.sh \
+t/gettext-external-pr338.sh \
+t/gettext-intl-subdir.sh \
+t/gettext-pr381.sh \
 t/gnumake.sh \
 t/gnuwarn.sh \
 t/gnuwarn2.sh \


hooks/post-receive
-- 
GNU Automake