X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=09d553484ba91254cda5a7da8b8092168fb9b9ec;hb=9c628d363a987920ba2cc30364ab520ee6571cb8;hp=7583232366f898ba1479c5764646804ff2d5ed3c;hpb=da5effbfe5b69913919f604915f2a1f7ce2b1715;p=lyx.git diff --git a/autogen.sh b/autogen.sh index 7583232366..09d553484b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,32 +4,19 @@ ACLOCAL="aclocal" AUTOHEADER="autoheader" AUTOMAKE="automake -a -c --foreign" AUTOCONF="autoconf" -ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4 cygwin.m4 pkg.m4" +ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 aspell.m4 pspell.m4 cygwin.m4 pkg.m4" # Discover what version of autoconf we are using. autoversion=`$AUTOCONF --version | head -n 1` 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[23467]) - 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 + *2.5[2-9]) EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4" ;; *) echo "This autoconf version is not supported by LyX." - echo "LyX only supports autoconf 2.13 and 2.5[236]." + echo "LyX only supports autoconf 2.5[2-9]." exit ;; esac