X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=edc6c40fa21e0008b5b6d4eae292ed30404c4d6b;hb=11f922b6763d477ca5f466a4bd401f1ae9232b09;hp=b03318f9a63b3d665302a1eac12dd84ade35906b;hpb=6f58137318254d7d553af0e6a34fadbfda057f5c;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index b03318f9a6..edc6c40fa2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,43 +6,41 @@ AUTOMAKE="automake --add-missing --force-missing --copy --foreign"
 AUTOCONF="autoconf"
 
 # Discover what version of automake we are using.
-automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
+automake_version=$($AUTOMAKE --version 2>/dev/null | head -n 1)
 
-test "$automake_version" != "" && {
+if test "$automake_version" != ""; then
     echo "Using $automake_version"
-} || {
-    echo "LyX requires automake >= 1.8"
+else
+    echo "LyX requires automake >= 1.14"
     exit 1
-}
+fi
 
 case $automake_version in
-    *' '1.[8-9]*|*' '1.1[012]*)
+    *' '1.1[456]*)
 	;;
     *)
-
 	echo "This automake version is not supported by LyX."
-	echo "LyX only supports automake 1.8 to 1.12."
+	echo "LyX only supports automake 1.14 through 1.16."
 	exit 1
 	;;
 esac
 
 # Discover what version of autoconf we are using.
-autoversion=`$AUTOCONF --version 2>/dev/null | head -n 1`
+autoversion=$($AUTOCONF --version 2>/dev/null | head -n 1)
 
-test "$autoversion" != "" && {
+if test "$autoversion" != ""; then
     echo "Using $autoversion"
-} || {
-    echo "LyX requires autoconf >= 2.59c"
+else
+    echo "LyX requires autoconf >= 2.65"
     exit 1
-}
-
+fi
 
 case $autoversion in
-    *' '2.59[cd]|*' '2.60[ab]|*' '2.6[0-9])
+    *' '2.6[5-9])
 	;;
     *)
 	echo "This autoconf version is not supported by LyX."
-	echo "LyX only supports autoconf 2.59c-2.69."
+	echo "LyX only supports autoconf 2.65-2.69."
 	exit 1
 	;;
 esac
@@ -85,7 +83,9 @@ else
 fi
 
 echo "Building po/POTFILES.in..."
-if (! make -s -f po/Rules-lyx srcdir=po top_srcdir=. po/POTFILES.in ); then
+if ( make -s -f po/Rules-lyx srcdir=po top_srcdir=. po/POTFILES.in ); then
+    :
+else
 	echo "Building po/POTFILES.in failed -- aborting"
 	exit 1
 fi