diff options
| -rw-r--r-- | .gitignore | 66 | ||||
| -rw-r--r-- | ChangeLog | 45 | ||||
| -rw-r--r-- | doc/.gitignore | 27 | ||||
| -rw-r--r-- | doc/amhello/.gitignore | 8 | ||||
| -rw-r--r-- | lib/Automake/.gitignore | 1 | ||||
| -rw-r--r-- | lib/Automake/tests/.gitignore | 2 | ||||
| -rw-r--r-- | tests/.gitignore | 8 | ||||
| -rwxr-xr-x | tests/gettext-macros.test | 26 |
8 files changed, 122 insertions, 61 deletions
diff --git a/.gitignore b/.gitignore index fe6542989..47823214e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,60 @@ -aclocal.m4 -configure -autom4te.cache Makefile.in Makefile -aclocal -automake -config.cache -config.log -config.status -config.status.lineno -configure.lineno +/aclocal.m4 +/configure +/autom4te.cache +/config.cache +/config.log +/config.status +/config.status.lineno +/configure.lineno +/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/*-p.test +/tests/aclocal-1.* +/tests/automake-1.* +/tests/defs +/tests/parallel-tests.am tags TAGS @@ -1,3 +1,48 @@ +2011-12-24 Stefano Lattarini <stefano.lattarini@gmail.com> + + 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 <stefano.lattarini@gmail.com> + + 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 <stefano.lattarini@gmail.com> + + 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 <stefano.lattarini@gmail.com> tests: fix failure due to debugging code forgotten into a test diff --git a/doc/.gitignore b/doc/.gitignore deleted file mode 100644 index 2554ab9cd..000000000 --- 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 466b7a61a..000000000 --- a/doc/amhello/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -Makefile.in -aclocal.m4 -config.h.in -config.h.in~ -configure -depcomp -install-sh -missing diff --git a/lib/Automake/.gitignore b/lib/Automake/.gitignore deleted file mode 100644 index d539f93f0..000000000 --- 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 ffbdfafb7..000000000 --- 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 3c1f9903f..000000000 --- a/tests/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -aclocal-* -automake-* -defs -parallel-tests.am -*.dir -*.log -*.log-t -*-p.test diff --git a/tests/gettext-macros.test b/tests/gettext-macros.test index 5dd3a79d9..03efe8568 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 |