Add layout AltAffiliation ; add optional argument support for Author Email and

[lyx.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index bda48fd4ab3a351200ecc81f70ec76b521065ef0..afad75b4835296cf53041edf9fe84f10e08bedbb 100755 (executable)
--- 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 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 spell.m4 cygwin.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`
@@ -20,13 +20,13 @@ case $automake_version in
     *' '1.9*)
        ;;
     *)
-    
+
        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."
+       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
@@ -127,13 +127,6 @@ else
        exit 1
 fi
 
-# Autogenerate lib/configure.m4.
-echo -n "Building lib/configure ... "
-rm -f lib/configure
-$GNUM4 lib/configure.m4 > lib/configure
-chmod a+x lib/configure
-echo "done."
-
 echo
 echo 'run "./configure ; make"'
 echo