diff --git a/autogen.sh b/autogen.sh
index eedf7f23caf71f23ff3cb2deff84863a8b0e051c..5e9822c2ce9e9458c3425f9d73f6317f571dff9c 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
attempt_command '' autoheader
}
-attempt_command '' libtoolize
+# use glibtoolize if it is available (darwin)
+(glibtoolize --version) < /dev/null > /dev/null 2>&1 && LIBTOOLIZE=glibtoolize || LIBTOOLIZE=libtoolize
+
+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|$)' \