X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=e43a5f96ea7f199be93cabd3a6d5850de9dccf97;hb=07aead5b21d09353930bf9c4190a486698de2dee;hp=a813a1e56dd0f126aba3eb903d285b766cdec496;hpb=22861453fefc5d4eac3af933f75827c643073744;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index a813a1e56d..e43a5f96ea 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@ ACLOCAL="aclocal -I ${PWD}/m4"
 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 pkg.m4 qt.m4 qt4.m4 spell.m4"
 
 # Discover what version of automake we are using.
 automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
@@ -17,16 +17,16 @@ test "$automake_version" != "" && {
 }
 
 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.
 autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
 
@@ -36,14 +36,14 @@ test "$autoversion" != "" && {
     echo "LyX requires autoconf >= 2.52"
     exit 1
 }
-	    
+
 case $autoversion in
-    *' '2.5[2-9])
+    *' '2.5[2-9]|*' '2.60[ab]|*' '2.6[0-1])
 	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.52-2.61."
 	exit 1
 	;;
 esac