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