X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=afad75b4835296cf53041edf9fe84f10e08bedbb;hb=fed31122c415f4b310e254e5db7197f786960b01;hp=ec15c28aedaa7c973bb81d886546e8ae1f2e28f6;hpb=eac44e91941932555bbad2da7abe1317a2c239a7;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index ec15c28aed..afad75b483 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,9 +2,9 @@
 
 ACLOCAL="aclocal -I ${PWD}/m4"
 AUTOHEADER="autoheader"
-AUTOMAKE="automake -a -c --foreign"
+AUTOMAKE="automake --add-missing --copy --foreign"
 AUTOCONF="autoconf"
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 aspell.m4 pspell.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`
@@ -12,21 +12,21 @@ automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
 test "$automake_version" != "" && {
     echo "Using $automake_version"
 } || {
-    echo "LyX requires automake >= 1.5"
+    echo "LyX requires automake >= 1.9"
     exit 1
 }
 
 case $automake_version in
-    *' '1.[5-9]*)
+    *' '1.9*)
 	;;
     *)
-    
+
 	echo "This automake version is not supported by LyX."
-        echo "LyX only supports automake 1.[5-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
@@ -70,7 +70,7 @@ fi
 
 # Delete old cache directories.
 # automake will stop if their contents was created by an earlier version.
-rm -rf autom4te.cache lib/reLyX/autom4te.cache
+rm -rf autom4te.cache
 
 # Generate acinclude.m4
 echo -n "Generate acinclude.m4... "
@@ -81,7 +81,7 @@ echo "done."
 # Generate the Makefiles and configure files
 if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
 	echo "Building macros..."
-	for dir in . lib/reLyX ; do
+	for dir in . ; do
 	    echo "        $dir"
 	    ( cd $dir ; $ACLOCAL )
 	done
@@ -105,7 +105,7 @@ fi
 
 if ( $AUTOMAKE --version ) < /dev/null > /dev/null 2>&1; then
 	echo "Building Makefile templates..."
-	for dir in . lib/reLyX ; do
+	for dir in . ; do
 	    echo "        $dir"
 	    ( cd $dir ; $AUTOMAKE )
 	done
@@ -117,7 +117,7 @@ fi
 
 if ( $AUTOCONF --version ) < /dev/null > /dev/null 2>&1; then
 	echo "Building configure..."
-	for dir in . lib/reLyX ; do
+	for dir in . ; do
 	    echo "       $dir"
 	    ( cd $dir ; $AUTOCONF )
 	done
@@ -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