From: curt <curt>
Date: Tue, 3 Sep 2002 21:30:37 +0000 (+0000)
Subject: Automake version check is best done only in the autogen.sh file, and not
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=64312039da71e931281364b2bbc7c1a408423ad1;p=flightgear.git

Automake version check is best done only in the autogen.sh file, and not
in the configure script.
---

diff --git a/autogen.sh b/autogen.sh
index 73157d062..e09c31b91 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,14 @@
 OSTYPE=`uname -s`
 MACHINE=`uname -m`
 AUTO_MAKE_VERSION=`automake --version | head -1 | awk '{print $4}' | sed -e 's/\.\([0-9]*\).*/\1/'`
+if test $AUTO_MAKE_VERSION -lt 15; then
+    echo ""
+    echo "You need to upgrade to automake version 1.5 or greater."
+    echo "Most distributions have packages available to install or you can"
+    echo "find the source for the most recent version at"
+    echo "ftp://ftp.gnu.org/gnu/automake"
+    exit 1
+fi
 
 echo "Host info: $OSTYPE $MACHINE"
 echo -n " automake: `automake --version | head -1 | awk '{print $4}'`"
diff --git a/configure.ac b/configure.ac
index ad735106a..66d0c94ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,18 +51,6 @@ AC_EGREP_CPP(yes,
 echo "IS_CYGWIN = $is_cygwin"
 AM_CONDITIONAL(IS_CYGWIN, test "x$is_cygwin" = "xyes")
 
-# Determine version of automake ... important becuase of
-# incompatibilities between versions
-AUTO_MAKE_VERSION=`automake --version | head -1 | awk '{print $4}' | sed -e 's/\.\([0-9]*\).*/\1/'`
-if test $AUTO_MAKE_VERSION -lt 15; then
-    echo ""
-    echo "You need to upgrade to automake version 1.5 or greater."
-    echo "Most distributions have packages available to install or you can"
-    echo "find the source for the most recent version at"
-    echo "ftp://ftp.gnu.org/gnu/automake"
-    exit 1
-fi
-
 # Used by JSBSim
 AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])