diff --git a/autogen.sh b/autogen.sh
index 6a7c6317b2b2e0d373fafe9ba4466f51c4efec7f..243148239e8a46dd81886793461de62118652a12 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
# Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
+if (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake-1.11
+ ACLOCAL=aclocal-1.11
+elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake-1.10
ACLOCAL=aclocal-1.10
elif (automake --version) < /dev/null > /dev/null 2>&1; then
if test -z "$ACLOCAL_FLAGS"; then
acdir=`$ACLOCAL --print-ac-dir`
- m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4 intltool.m4 pkg.m4"
+ m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4 intltool.m4 pkg.m4 libtool.m4"
for file in $m4list
do
attempt_command '' autoheader
}
+attempt_command '' libtoolize
attempt_command '' $AUTOMAKE --copy --force --add-missing
attempt_command '' autoconf
attempt_command '^(Please add the files| codeset| progtest|from the|or directly|You will also|ftp://ftp.gnu.org|$)' \