diff options
| author | Ted Gould <ted@gould.cx> | 2008-02-04 17:56:14 +0000 |
|---|---|---|
| committer | gouldtj <gouldtj@users.sourceforge.net> | 2008-02-04 17:56:14 +0000 |
| commit | 084c6659ff4319fcec70d643fd30f45c4ede46cb (patch) | |
| tree | d8d3f5bc6a5d100d81ad5c11f1a76f094a46fbde | |
| parent | r17821@shi: ted | 2008-01-31 12:59:57 -0800 (diff) | |
| download | inkscape-084c6659ff4319fcec70d643fd30f45c4ede46cb.tar.gz inkscape-084c6659ff4319fcec70d643fd30f45c4ede46cb.zip | |
r17853@shi: ted | 2008-02-04 09:54:45 -0800
Fixing all the warnings and making automake.sh work to ensure 1.10 or higher
(bzr r4654)
| -rwxr-xr-x | autogen.sh | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/autogen.sh b/autogen.sh index 304e49dc0..6a7c6317b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -15,7 +15,7 @@ TEST_TYPE=-f FILE=inkscape.spec.in AUTOCONF_REQUIRED_VERSION=2.52 -AUTOMAKE_REQUIRED_VERSION=1.7 +AUTOMAKE_REQUIRED_VERSION=1.10 GLIB_REQUIRED_VERSION=2.0.0 INTLTOOL_REQUIRED_VERSION=0.17 @@ -99,23 +99,12 @@ elif (automake --version) < /dev/null > /dev/null 2>&1; then else echo echo " You must have automake 1.10 or newer installed to compile $PROJECT." - echo " Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.8.5.tar.gz" - echo " (or a newer version of 1.8 if it is available; note that 1.9 is buggy)" DIE=1 fi if test x$AUTOMAKE != x; then VER=`$AUTOMAKE --version \ | grep automake | sed -n 's/.* \([0-9.]*\)[-a-z0-9]*$/\1/p'` check_version "$VER" "$AUTOMAKE_REQUIRED_VERSION" - - # Exclude automake 1.9.[0-6] - if expr $VER \>= 1.9.0 >/dev/null && expr $VER \<= 1.9.6 >/dev/null ; then - echo - echo " You must have automake less than 1.9.0 or newer than 1.9.6" - echo " Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.8.5.tar.gz" - echo " (or a newer version of 1.8 if it is available)" - DIE=1 - fi fi echo -n "checking for glib-gettextize >= $GLIB_REQUIRED_VERSION ... " |