[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-596-geada913

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

The branch, maint has been updated
       via  eada913864b278ccaf93f4589b4e24d9d5e82202 (commit)
       via  e1fad75e44c76a3444b5f310af8e064d1833115d (commit)
       via  9ea4c4541f643e18c56015b32b0870fe80257f8b (commit)
       via  763f3ec319b070f498ea3d06447c214e969cbb02 (commit)
      from  007455d934d9dc2cd1d37ab6c76412a872dbec14 (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 eada913864b278ccaf93f4589b4e24d9d5e82202
Merge: 9ea4c45 e1fad75
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 24 09:58:17 2011 +0100

    Merge branch 'tests-gettext-macros-require' into maint
    
    * tests-gettext-macros-require:
      tests: one more fixlet for gettext macros requirement

commit e1fad75e44c76a3444b5f310af8e064d1833115d
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 24 09:56:49 2011 +0100

    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.

commit 9ea4c4541f643e18c56015b32b0870fe80257f8b
Merge: 007455d 763f3ec
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 24 09:29:15 2011 +0100

    Merge branch 'tests-gettext-macros-require' into maint
    
    * tests-gettext-macros-require:
      tests: fix handling of gettext macros requirement

commit 763f3ec319b070f498ea3d06447c214e969cbb02
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 24 09:25:00 2011 +0100

    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.

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

Summary of changes:
 ChangeLog                 |   36 ++++++++++++++++++++++++++++++++++++
 tests/gettext-macros.test |   26 +++++++++++++++++++++-----
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb03a8d..a83bb6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+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
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


hooks/post-receive
-- 
GNU Automake