[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1194-ge335107

[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=e3351076de09b744d3387699fa20f1ec85f9ba58

The branch, master has been updated
       via  e3351076de09b744d3387699fa20f1ec85f9ba58 (commit)
       via  bfc83bdec2e6e39a3275ae0c51b29a86603b49ad (commit)
       via  eada913864b278ccaf93f4589b4e24d9d5e82202 (commit)
       via  e1fad75e44c76a3444b5f310af8e064d1833115d (commit)
       via  9ea4c4541f643e18c56015b32b0870fe80257f8b (commit)
       via  763f3ec319b070f498ea3d06447c214e969cbb02 (commit)
       via  007455d934d9dc2cd1d37ab6c76412a872dbec14 (commit)
       via  03f5195860391f524df10f90b54a79f50de3b5ba (commit)
      from  3749d843083e552232579a85288e7dfee126ad91 (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:
 .gitignore                    |   60 +++++++++++++++++++++++++++++++++++++---
 ChangeLog                     |   53 ++++++++++++++++++++++++++++++++++++
 doc/.gitignore                |   27 ------------------
 doc/amhello/.gitignore        |   15 ----------
 lib/Automake/.gitignore       |    1 -
 lib/Automake/tests/.gitignore |    2 -
 tests/.gitignore              |   12 --------
 tests/gettext-macros.test     |   26 ++++++++++++++---
 tests/missing-tar.test        |    2 +-
 9 files changed, 130 insertions(+), 68 deletions(-)
 delete mode 100644 doc/.gitignore
 delete mode 100644 doc/amhello/.gitignore
 delete mode 100644 lib/Automake/.gitignore
 delete mode 100644 lib/Automake/tests/.gitignore
 delete mode 100644 tests/.gitignore

diff --git a/.gitignore b/.gitignore
index 96d603e..552fa17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,65 @@
-/autom4te.cache
-/aclocal
-/automake
+Makefile.in
+Makefile
 /aclocal.m4
 /configure
+/autom4te.cache
 /config.cache
 /config.log
 /config.status
 /config.status.lineno
 /configure.lineno
-Makefile.in
-Makefile
+/aclocal
+/automake
+/doc/amhello-*.tar.gz
+/doc/automake.info
+/doc/automake.info-[0-9]
+/doc/automake*.1
+/doc/aclocal*.1
+/doc/stamp-vti
+/doc/version.texi
+/doc/automake.ac
+/doc/automake.aux
+/doc/automake.cm
+/doc/automake.cp
+/doc/automake.cps
+/doc/automake.dvi
+/doc/automake.fn
+/doc/automake.fns
+/doc/automake.html
+/doc/automake.ky
+/doc/automake.log
+/doc/automake.op
+/doc/automake.pdf
+/doc/automake.pg
+/doc/automake.ps
+/doc/automake.toc
+/doc/automake.tp
+/doc/automake.tr
+/doc/automake.vr
+/doc/automake.vrs
+/doc/amhello/Makefile.in
+/doc/amhello/aclocal.m4
+/doc/amhello/config.h.in
+/doc/amhello/config.h.in~
+/doc/amhello/configure
+/doc/amhello/depcomp
+/doc/amhello/install-sh
+/doc/amhello/missing
+/lib/Automake/Config.pm
+/lib/Automake/tests/*.log
+/lib/Automake/tests/*.log-t
+/tests/*.log
+/tests/*.log-t
+/tests/*.dir
+/tests/aclocal-1.*
+/tests/automake-1.*
+/tests/defs-static
+/tests/instspc-tests.am
+/tests/parallel-tests.am
+/tests/instspc-*-build.test
+/tests/instspc-*-install.test
+/tests/*.test-t
+/tests/*-p.test
 cscope.files
 cscope.in.out
 cscope.out
diff --git a/ChangeLog b/ChangeLog
index 64bf976..819ea4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,56 @@
+2011-12-24  Stefano Lattarini  <address@hidden>
+
+       gitignore: use only one .gitignore file, in the top-level directory
+       * doc/.gitignore, doc/amhello/.gitignore, lib/Automake/.gitignore,
+       lib/Automake/tests/.gitignore, tests/.gitignore: Deleted, their
+       contents merged into ...
+       * .gitignore: ... this top-level file.  Since we are at it, improve
+       it by anchoring files where it makes sense.
+
+2011-12-24  Stefano Lattarini  <address@hidden>
+
+       tests: one more fixlet for gettext macros requirement
+       * tests/gettext-macros.test (configure.in): Add calls to
+       AC_INIT and AC_PROG_CC, to avoid a spurious failure in the
+       later aclocal invocation.
+       Luckily, this wart wasn't causing any spurious SKIP or FAIL,
+       but only the redundant addition to the `-Wno-syntax' option
+       to some aclocal invocations in the gettext tests.
+
+2011-12-24  Stefano Lattarini  <address@hidden>
+
+       tests: fix handling of gettext macros requirement
+
+       The code introduced in the earlier change `v1.11-581-gb7d67d5'
+       and aimed at automatically fetching all the .m4 files provided by
+       gettext has proven inadequate, since it hasn't managed to truly
+       and always get *all* the required .m4 files.  For example, it has
+       failed to fetch the file `intldir.m4' (present in gettext 0.18.1,
+       and where the macro `AM_GNU_GETTEXT_INTL_SUBDIR' is defined),
+       which in turn has caused spurious SKIPs of at least the test
+       `gettext3.test'.
+
+       The reason for this debacle is that autopoint looks at the version
+       specified in AM_GNU_GETTEXT_VERSION to decide which version of the
+       gettext infrastructure to bring in; since we were unconditionally
+       specifying the older 0.10.35 version, the newer `.m4' files weren't
+       brought in.
+
+       * tests/gettext-macros.test: In AM_GNU_GETTEXT_VERSION, instead
+       of unconditionally specifying the older 0.10.35 version, specify
+       the version of the available `gettextize' or `autopoint' program,
+       dynamically extracted with the help of ...
+       (extract_program_version):... this new function, and saved ...
+       ($autopoint_version): ... in this new variable.
+
+2011-12-22  Stefano Lattarini  <address@hidden>
+
+       tests: fix failure due to debugging code forgotten into a test
+       * tests/missing-tar.test: Don't ever call the `missing' script
+       with `sh -x'; this was used for debugging, but an instance of
+       it slipped into the committed test case.  Bug revealed by a
+       failure on a Solaris 10 system with GNU tar installed as `gtar'.
+
 2011-12-23  Stefano Lattarini  <address@hidden>
 
        tests: avoid spurious failure of libtool and gettext tests
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index 66b9b42..0000000
--- a/doc/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-/amhello-*.tar.gz
-/automake.info
-/automake.info-[0-9]
-/automake*.1
-/aclocal*.1
-/stamp-vti
-/version.texi
-/automake.ac
-/automake.aux
-/automake.cm
-/automake.cp
-/automake.cps
-/automake.dvi
-/automake.fn
-/automake.fns
-/automake.html
-/automake.ky
-/automake.log
-/automake.op
-/automake.pdf
-/automake.pg
-/automake.ps
-/automake.toc
-/automake.tp
-/automake.tr
-/automake.vr
-/automake.vrs
diff --git a/doc/amhello/.gitignore b/doc/amhello/.gitignore
deleted file mode 100644
index cdd9777..0000000
--- a/doc/amhello/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-/Makefile.in
-/Makefile
-/autom4te.cache
-/aclocal.m4
-/config.h.in
-/config.h.in~
-/configure
-/configure.lineno
-/config.status
-/config.status.lineno
-/config.cache
-/config.log
-/depcomp
-/install-sh
-/missing
diff --git a/lib/Automake/.gitignore b/lib/Automake/.gitignore
deleted file mode 100644
index f99f508..0000000
--- a/lib/Automake/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Config.pm
diff --git a/lib/Automake/tests/.gitignore b/lib/Automake/tests/.gitignore
deleted file mode 100644
index 9da0540..0000000
--- a/lib/Automake/tests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.log
-/*.log-t
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index cddf84b..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/aclocal-*
-/automake-*
-/defs-static
-/instspc-tests.am
-/parallel-tests.am
-/*.dir
-/*.log
-/*.log-t
-/*-p.test
-/instspc-*-build.test
-/instspc-*-install.test
-/*.test-t
diff --git a/tests/gettext-macros.test b/tests/gettext-macros.test
index 5dd3a79..03efe85 100755
--- a/tests/gettext-macros.test
+++ b/tests/gettext-macros.test
@@ -20,17 +20,17 @@
 
 . ./defs || Exit 1
 
+extract_program_version ()
+{
+  "$1" --version | sed 1q | $PERL -ne '/(\d(?:\.\d+)+)/ and print "$1\n"'
+}
+
 echo "# Automatically generated by $me." > get.sh
 echo : >> get.sh
 
 # The `gettextize' and `autopoint' scripts will look into Makefile.am.
 echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am
 
-# Required by autopoint.
-echo 'AM_GNU_GETTEXT' > configure.in
-# Likewise; and older version specified here *won't* work!
-echo 'AM_GNU_GETTEXT_VERSION([0.10.35])' >> configure.in
-
 # Prefer autopoint to gettextize, since the more modern versions of the
 # latter might unconditionally require user interaction to complete;
 # yes, this means confirmation from /dev/tty (!) -- see:
@@ -45,6 +45,22 @@ else
   am_gettextize_command=gettextize
 fi
 
+# We will need to specify the correct autopoint (or gettextize) version
+# in the AM_GNU_GETTEXT_VERSION call in configure.in if we want autopoint
+# (or gettextize) to setup the correct infrastructure -- in particular,
+# for what concerns us, to bring in all the required .m4 files.
+autopoint_version=`extract_program_version $am_gettextize_command` \
+  && test -n "$autopoint_version" \
+  || autopoint_version=0.10.35
+
+cat > configure.in <<END
+AC_INIT([foo], [1.0])
+AC_PROG_CC
+# Both required by autopoint.
+AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([$autopoint_version])
+END
+
 if $am_gettextize_command --force && test -f m4/gettext.m4; then
   echo "ACLOCAL_PATH='`pwd`/m4':\$ACLOCAL_PATH" >> get.sh
   echo "export ACLOCAL_PATH" >> get.sh
diff --git a/tests/missing-tar.test b/tests/missing-tar.test
index 4f531df..889ae20 100755
--- a/tests/missing-tar.test
+++ b/tests/missing-tar.test
@@ -142,7 +142,7 @@ $EGREP "(g|gnu)tar" stderr && Exit 1
 rm -f bin/*
 
 # We try to use an option that causes any `tar' program (GNU or non-GNU) to.
-sh -x ./missing --run tar --bad-unknonw-option cvf foo.tar ./data.txt 2>stderr 
\
+./missing --run tar --bad-unknonw-option cvf foo.tar ./data.txt 2>stderr \
   && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 test ! -f foo.tar


hooks/post-receive
-- 
GNU Automake