From f5e125e5d79e7da9fbecd9fc3e28add6f2ce09db Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Wed, 28 Sep 2005 21:58:52 +0000 Subject: [PATCH] Remove support for gettext 0.10.x - it's too old and lacks ngettext(). --- autogen.sh | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/autogen.sh b/autogen.sh index c7c65d6ad..f1d1a3770 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,7 +9,6 @@ set -e : ${AUTOHEADER=autoheader} : ${AUTOMAKE=automake} : ${ACLOCAL=aclocal} -: ${GETTEXTIZE=gettextize} : ${AUTOPOINT=autopoint} : ${XGETTEXT=xgettext} @@ -48,31 +47,19 @@ sed_cmd="${sed_cmd} -e 's/\\.//g'" # leave only 6 leading digits sed_cmd="${sed_cmd} -e 's/\\(......\\).*/\\1/'" -gettext_ver=`$GETTEXTIZE --version | eval ${sed_cmd}` +gettext_ver=`$AUTOPOINT --version | eval ${sed_cmd}` if test -z "$gettext_ver"; then echo "Cannot determine version of gettext" >&2 exit 1 fi -if test "$gettext_ver" -lt 01038; then - echo "Don't use gettext older than 0.10.38" >&2 +if test "$gettext_ver" -lt 01105; then + echo "gettext 0.11.5 or newer is required" >&2 exit 1 fi rm -rf intl -if test "$gettext_ver" -ge 01100; then - if test "$gettext_ver" -lt 01105; then - echo "Upgrade gettext to at least 0.11.5 or downgrade to 0.10.40" >&2 - exit 1 - fi - $AUTOPOINT --force || exit 1 -else - $GETTEXTIZE --copy --force || exit 1 - if test -e po/ChangeLog~; then - rm -f po/ChangeLog - mv po/ChangeLog~ po/ChangeLog - fi -fi +$AUTOPOINT --force || exit 1 # Generate po/POTFILES.in $XGETTEXT --keyword=_ --keyword=N_ --keyword=gettext_ui --output=- \