-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4 pkg.m4"
-SIGCPP_ACINCLUDE_FILES="libtool.m4"
+echo "Using $autoversion"
+case $autoversion in
+ *2.13)
+ cp config/acconfig.h .
+ cp config/configure.in .
+ rm -f configure.ac
+ cp config/relyx_configure.in lib/reLyX/configure.in
+ rm -f lib/reLyX/configure.ac
+ EXTRA_ACINCLUDE_FILES="lyxinclude213.m4"
+ ;;
+ *2.5[23])
+ rm -f acconfig.h
+ rm -f configure.in
+ cp config/configure.ac .
+ rm -f lib/reLyX/configure.in
+ cp config/relyx_configure.ac lib/reLyX/configure.ac
+ EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
+ ;;
+ *)
+ echo "This autoconf version is not supported by LyX."
+ echo "LyX only supports autoconf 2.13 and 2.5[23]."
+ exit
+ ;;
+esac