From f7d8a2a259560b2ba41422c04c40d7f6fa36620e Mon Sep 17 00:00:00 2001 From: John Ellis Date: Tue, 1 Mar 2005 14:50:03 +0000 Subject: [PATCH] ######## DO NOT BASE ENHANCEMENTS OR TRANSLATION UPDATES ON CODE IN THIS CVS! This CVS is never up to date with current development and is provided solely for reference purposes, please use the latest official release package when making any changes or translation updates. ######## Sync to updated autogen.sh so building is actually possible. --- autogen.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/autogen.sh b/autogen.sh index 4b1ca7cf..5647c144 100755 --- a/autogen.sh +++ b/autogen.sh @@ -24,13 +24,12 @@ DIE=0 DIE=1 } -grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { +grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ - (gettext --version) < /dev/null > /dev/null 2>&1 || { + (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || { echo - echo "**Error**: You must have \`gettext' installed." - echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" - echo "(or a newer version if it is available)" + echo "**Error**: You must have \`glib-gettextize' installed." + echo "glib-gettextize is a part of glib" DIE=1 } } @@ -78,21 +77,21 @@ do ## echo "**Warning**: No such directory \`$k'. Ignored." fi done - if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then + if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then if grep "sed.*POTFILES" configure.in >/dev/null; then : do nothing -- we still have an old unmodified configure.in else echo "Creating $dr/aclocal.m4 ..." test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running gettextize... Ignore non-fatal messages." - echo "no" | gettextize --force --copy + echo "Running glib-gettextize..." + echo "no" | glib-gettextize --force --copy echo "Making $dr/aclocal.m4 writable ..." test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi fi echo "Running aclocal $aclocalinclude ..." aclocal $aclocalinclude - if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then + if grep "^AC_CONFIG_HEADER" configure.in >/dev/null; then echo "Running autoheader..." autoheader fi -- 2.20.1