removed version check for glib-gettextize. It didn't work with glib

2006-03-02  Sven Neumann  <sven@gimp.org>

	* autogen.sh: removed version check for glib-gettextize. It didn't
	work with glib 2.10.x.
This commit is contained in:
Sven Neumann 2006-03-02 10:20:06 +00:00 committed by Sven Neumann
parent ac85e94d55
commit 5b4334df07
2 changed files with 16 additions and 14 deletions

View File

@ -1,3 +1,8 @@
2006-03-02 Sven Neumann <sven@gimp.org>
* autogen.sh: removed version check for glib-gettextize. It didn't
work with glib 2.10.x.
2006-03-01 Sven Neumann <sven@gimp.org> 2006-03-01 Sven Neumann <sven@gimp.org>
* app/about.h: use U+00A9 COPYRIGHT SIGN. * app/about.h: use U+00A9 COPYRIGHT SIGN.

View File

@ -9,23 +9,22 @@
# tools and you shouldn't use this script. Just call ./configure # tools and you shouldn't use this script. Just call ./configure
# directly. # directly.
ACLOCAL=${ACLOCAL-aclocal-1.9}
AUTOCONF=${AUTOCONF-autoconf} AUTOCONF=${AUTOCONF-autoconf}
AUTOHEADER=${AUTOHEADER-autoheader} AUTOHEADER=${AUTOHEADER-autoheader}
AUTOMAKE=${AUTOMAKE-automake-1.9} AUTOMAKE=${AUTOMAKE-automake-1.9}
ACLOCAL=${ACLOCAL-aclocal-1.9}
LIBTOOLIZE=${LIBTOOLIZE-libtoolize} LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
AUTOCONF_REQUIRED_VERSION=2.54
AUTOMAKE_REQUIRED_VERSION=1.8.3
INTLTOOL_REQUIRED_VERSION=0.31
LIBTOOL_REQUIRED_VERSION=1.4
LIBTOOL_WIN32=1.5
PROJECT="GNU Image Manipulation Program" PROJECT="GNU Image Manipulation Program"
TEST_TYPE=-d TEST_TYPE=-d
FILE=plug-ins FILE=plug-ins
LIBTOOL_REQUIRED_VERSION=1.4
LIBTOOL_WIN32=1.5
AUTOCONF_REQUIRED_VERSION=2.54
AUTOMAKE_REQUIRED_VERSION=1.8.3
GLIB_REQUIRED_VERSION=2.2.0
INTLTOOL_REQUIRED_VERSION=0.31
srcdir=`dirname $0` srcdir=`dirname $0`
test -z "$srcdir" && srcdir=. test -z "$srcdir" && srcdir=.
@ -44,8 +43,8 @@ check_version ()
} }
echo echo
echo "I am testing that you have the required versions of libtool, autoconf," echo "I am testing that you have the tools required to build the"
echo "automake, glib-gettextize and intltoolize. This test is not foolproof," echo "$PROJECT from CVS. This test is not foolproof,"
echo "so if anything goes wrong, see the file HACKING for more information..." echo "so if anything goes wrong, see the file HACKING for more information..."
echo echo
@ -152,11 +151,9 @@ if test x$AUTOMAKE != x; then
fi fi
echo -n "checking for glib-gettextize >= $GLIB_REQUIRED_VERSION ... " echo -n "checking for glib-gettextize ... "
if (glib-gettextize --version) < /dev/null > /dev/null 2>&1; then if (glib-gettextize --version) < /dev/null > /dev/null 2>&1; then
VER=`glib-gettextize --version \ echo "yes"
| grep glib-gettextize | sed "s/.* \([0-9.]*\)/\1/"`
check_version $VER $GLIB_REQUIRED_VERSION
else else
echo echo
echo " You must have glib-gettextize installed to compile $PROJECT." echo " You must have glib-gettextize installed to compile $PROJECT."