X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=fa2b829675c9269cfeec5fe9dfd99232929a804d;hb=c0b204c0a8ae195f8527eed0f0f9f01a835d1faa;hp=c1740d5928061cb617ddbd8fdf6d85b6e75cef16;hpb=ef8e527612bc40ab2b671df6a90c4f2eb88a4e84;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index c1740d5928..fa2b829675 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 
 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 spell.m4 cygwin.m4 pkg.m4"
 
@@ -12,17 +12,17 @@ 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]."
+        echo "LyX only supports automake 1.9."
         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