mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Commit a different patch than the one in #1064.. this sets the default automake required version to 1.10.. the detection for 1.11 is *after* 1.11 because we prefer to use that, though we do prefer to use 1.11 than 1.9 if it's available. Updates #1064

Browse source 
Originally committed to SVN as r3862.
This commit is contained in:
Amar Takhar 2009-12-13 17:47:19 +00:00
parent 608a73677d
commit fedd8ecce6
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
aegisub/autogen.sh
View file

@ -9,10 +9,10 @@
# 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} ACLOCAL=${ACLOCAL-aclocal-1.10}
LIBTOOLIZE=${LIBTOOLIZE-libtoolize} LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
AUTOHEADER=${AUTOHEADER-autoheader} AUTOHEADER=${AUTOHEADER-autoheader}
AUTOMAKE=${AUTOMAKE-automake-1.9} AUTOMAKE=${AUTOMAKE-automake-1.10}
AUTOCONF=${AUTOCONF-autoconf} AUTOCONF=${AUTOCONF-autoconf}
GETTEXTIZE=${GETTEXTIZE-glib-gettextize} GETTEXTIZE=${GETTEXTIZE-glib-gettextize}
INTLTOOLIZE=${INTLTOOLIZE-intltoolize} INTLTOOLIZE=${INTLTOOLIZE-intltoolize}
@ -20,7 +20,7 @@ INTLTOOLIZE=${INTLTOOLIZE-intltoolize}
GLIB_REQUIRED_VERSION=2.10.0 GLIB_REQUIRED_VERSION=2.10.0
AUTOCONF_REQUIRED_VERSION=2.54 AUTOCONF_REQUIRED_VERSION=2.54
AUTOMAKE_REQUIRED_VERSION=1.9 AUTOMAKE_REQUIRED_VERSION=1.10
INTLTOOL_REQUIRED_VERSION=0.31 INTLTOOL_REQUIRED_VERSION=0.31
LIBTOOL_REQUIRED_VERSION=1.5 LIBTOOL_REQUIRED_VERSION=1.5
@ -127,6 +127,7 @@ else
fi fi
# 1.11 comes after 1.10 beacuse 1.11 isn't fully supported.
$ECHO_N "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... " $ECHO_N "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=$AUTOMAKE AUTOMAKE=$AUTOMAKE
@ -134,6 +135,9 @@ if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake-1.10 AUTOMAKE=automake-1.10
ACLOCAL=aclocal-1.10 ACLOCAL=aclocal-1.10
elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake-1.11
ACLOCAL=aclocal-1.11
elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake-1.9 AUTOMAKE=automake-1.9
ACLOCAL=aclocal-1.9 ACLOCAL=aclocal-1.9