mirror/gettext
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gettext.git synced 2026-01-26 15:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make autopoint AM_GNU_GETTEXT_VERSION handling more robust.

Browse Source
This commit is contained in:
Daiki Ueno 2013-01-07 08:09:09 +09:00
parent 9b90c26c86
commit a071c8a3cd
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gettext-tools/misc/ChangeLog
View File

@ -1,3 +1,10 @@
2013-01-07 Daiki Ueno <ueno@gnu.org>
* autopoint.in: Extract version number from configure.ac in a more
robust way.
Reported by Tom G. Christensen in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-01/msg00053.html>.
2012-12-25 Daiki Ueno <ueno@gnu.org>
* autopoint.in: Update for 0.18.2.

12
gettext-tools/misc/autopoint.in
View File

@ -267,9 +267,15 @@ fi
# Check whether the -V option and the version number in configure.in match.
# At least one of the two must be given. If both are given, they must agree.
sed_extract_AM_GNU_GETTEXT_VERSION_argument='s/^AM_GNU_GETTEXT_VERSION(\([^()]*\)).*$/\1/'
sed_remove_outer_brackets='s/^\[\(.*\)\]$/\1/'
xver=`cat "$configure_in" | grep '^AM_GNU_GETTEXT_VERSION(' | sed -n -e "$sed_extract_AM_GNU_GETTEXT_VERSION_argument"p | sed -e "$sed_remove_outer_brackets" | sed -e 1q`
sed_extract_AM_GNU_GETTEXT_VERSION_argument='
s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
/AM_GNU_GETTEXT_VERSION/ {
s,^.*AM_GNU_GETTEXT_VERSION(\([^()]*\)).*$,xver=\1,
s,^xver=\[\(.*\)\]$,xver=\1,
p
}
d'
eval `sed "$sed_extract_AM_GNU_GETTEXT_VERSION_argument" "$configure_in"`
if test -z "$xver" && test -f intl/VERSION; then
xver=`cat intl/VERSION | LC_ALL=C sed -n -e 's/^.*gettext-\([-+_.0-9A-Za-z]*\).*$/\1/p'`
fi