[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1643-ga3f66de

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

The branch, testsuite-work has been updated
       via  a3f66de9d0d0126dbefb08a69ea2a326fc6a6649 (commit)
       via  e3351076de09b744d3387699fa20f1ec85f9ba58 (commit)
       via  bfc83bdec2e6e39a3275ae0c51b29a86603b49ad (commit)
       via  eada913864b278ccaf93f4589b4e24d9d5e82202 (commit)
       via  e1fad75e44c76a3444b5f310af8e064d1833115d (commit)
       via  9ea4c4541f643e18c56015b32b0870fe80257f8b (commit)
       via  763f3ec319b070f498ea3d06447c214e969cbb02 (commit)
      from  c3bcf99ccfdb499e0e97128910a5d920ab5338f0 (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 -----------------------------------------------------------------
commit a3f66de9d0d0126dbefb08a69ea2a326fc6a6649
Merge: c3bcf99 e335107
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 24 11:05:24 2011 +0100

    Merge branch 'master' into testsuite-work
    
    * master:
      gitignore: use only one .gitignore file, in the top-level directory
      tests: one more fixlet for gettext macros requirement
      tests: fix handling of gettext macros requirement

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                    |   57 +++++++++++++++++++++++++++++++++++++---
 ChangeLog                     |   45 ++++++++++++++++++++++++++++++++
 doc/.gitignore                |   27 -------------------
 doc/amhello/.gitignore        |   15 -----------
 lib/Automake/.gitignore       |    1 -
 lib/Automake/tests/.gitignore |    2 -
 tests/gettext-macros.test     |   26 +++++++++++++++---
 7 files changed, 118 insertions(+), 55 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

diff --git a/.gitignore b/.gitignore
index 96d603e..0074759 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,62 @@
-/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/*.trs
+/tests/aclocal-1.*
+/tests/automake-1.*
+/tests/defs-static
+/tests/testsuite-part.am
+/tests/*-w.tap
+/tests/*-w.test
+/tests/*.dir
+/tests/*.log
+/tests/*.trs
 cscope.files
 cscope.in.out
 cscope.out
diff --git a/ChangeLog b/ChangeLog
index 2c5cf2f..dfe666a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+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-23  Stefano Lattarini  <address@hidden>
 
        tests: automatically handle deps also for generated 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 56e8f36..0000000
--- a/lib/Automake/tests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.trs
-/*.log
diff --git a/tests/gettext-macros.test b/tests/gettext-macros.test
index ad7e13a..8dd05b5 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


hooks/post-receive
-- 
GNU Automake