[gaim-migrate @ 13501]

Thu, 18 Aug 2005 18:11:12 +0000

author
Ruediger Oertel
date
Thu, 18 Aug 2005 18:11:12 +0000
changeset 11301
f336894bdd46
parent 11300
11bc6db394e6
child 11302
25694fe861b9

[gaim-migrate @ 13501]
This apparently fixes setup-gettext for gettext versions in x.y format
rather than x.y.z format. see sf patch 1218157

committer: Luke Schierer <lschiere@pidgin.im>

COPYRIGHT file | annotate | diff | comparison | revisions
setup-gettext file | annotate | diff | comparison | revisions
--- a/COPYRIGHT	Thu Aug 18 06:36:05 2005 +0000
+++ b/COPYRIGHT	Thu Aug 18 18:11:12 2005 +0000
@@ -147,6 +147,7 @@
 Padraig O'Briain
 Christopher O'Brien (siege)
 Jon Oberheide
+Ruediger Oertel
 Gudmundur Bjarni Olafsson
 Nathan Owens (pianocomp81)
 Matt Pandina
--- a/setup-gettext	Thu Aug 18 06:36:05 2005 +0000
+++ b/setup-gettext	Thu Aug 18 18:11:12 2005 +0000
@@ -27,6 +27,7 @@
 
 parse_gettext_version() {
 	GETTEXT_VERSION=`$GETTEXT_TOOL --version | sed -n 's/^.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/\1.\2.\3/p'`
+	test -z "$GETTEXT_VERSION" && GETTEXT_VERSION=`$GETTEXT_TOOL --version | sed -n 's/^.*\([0-9]\+\)\.\([0-9]\+\).*$/\1.\2/p'`
 	GETTEXT_MAJOR_VERSION=`echo $GETTEXT_VERSION | cut -d. -f1`
 	GETTEXT_MINOR_VERSION=`echo $GETTEXT_VERSION | cut -d. -f2`
 	GETTEXT_MICRO_VERSION=`echo $GETTEXT_VERSION | cut -d. -f3`

mercurial