AUTOHEADER="autoheader"
AUTOMAKE="automake --add-missing --copy --foreign"
AUTOCONF="autoconf"
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 qt.m4 qt4.m4 spell.m4"
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 pkg.m4 qt4.m4 spell.m4"
# Discover what version of automake we are using.
automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
}
case $automake_version in
- *' '1.9*)
+ *' '1.9*|*' '1.10*)
;;
*)
-
+
echo "This automake version is not supported by LyX."
- echo "LyX only supports automake 1.9."
- exit 1
- ;;
+ echo "LyX only supports automake 1.9 and 1.10."
+ exit 1
+ ;;
esac
# Discover what version of autoconf we are using.
}
case $autoversion in
- *' '2.5[2-9])
- EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
+ *' '2.5[2-9]|*' '2.60[ab]|*' '2.6[0-1])
;;
*)
echo "This autoconf version is not supported by LyX."
- echo "LyX only supports autoconf 2.5[2-9]."
+ echo "LyX only supports autoconf 2.52-2.61."
exit 1
;;
esac