From: curt Date: Tue, 3 Sep 2002 21:44:44 +0000 (+0000) Subject: Automake version check is only done in autogen.sh and not in configure. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c3bdd0e5377a37be5f6c8899254a0cced59d9cbd;p=simgear.git Automake version check is only done in autogen.sh and not in configure. --- diff --git a/autogen.sh b/autogen.sh index 5a0ab3b1..733ac8d0 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 b7c1a2cf..cc7c437c 100644 --- a/configure.ac +++ b/configure.ac @@ -54,18 +54,6 @@ else echo "includedir changed to" $includedir "libdir is" $libdir fi -# Determine version of automake ... important because 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 - # set logging default value # with_logging=yes AC_ARG_WITH(logging, [ --with-logging Include logging output (default)])