From ff0fc8eed0fe87d2bfcb7015a4aebc404e2f064e Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 8 Aug 2013 11:43:52 +1000 Subject: [PATCH] config: Check the path for a valid autoconf. --- rtems/config/tools/rtems-kernel-4.11.cfg | 4 +++- source-builder/config/versions.cfg | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rtems/config/tools/rtems-kernel-4.11.cfg b/rtems/config/tools/rtems-kernel-4.11.cfg index dd010e3..99ab111 100644 --- a/rtems/config/tools/rtems-kernel-4.11.cfg +++ b/rtems/config/tools/rtems-kernel-4.11.cfg @@ -13,7 +13,9 @@ # %if %{__autoreconf_ver} <= 2.68 %if %{__autoreconf_bindir_ver} <= 2.68 - %error Autoconf (autoreconf) version 2.69 or higher is needed. + %if %{__autoreconf_path_ver} <= 2.68 + %error Autoconf (autoreconf) version 2.69 or higher is needed. + %endif %endif %endif diff --git a/source-builder/config/versions.cfg b/source-builder/config/versions.cfg index ee0a657..c9518fe 100644 --- a/source-builder/config/versions.cfg +++ b/source-builder/config/versions.cfg @@ -3,7 +3,10 @@ %define __makeinfo_ver %(test -x %{__makeinfo} && %{__makeinfo} --version | %{__awk} 'NR==1 {print $NF}' || echo "0") %define __autoconf_ver %(test -x %{__autoconf} && %{__autoconf} --version | %{__awk} 'NR==1 {print $NF}' || echo "0") %define __autoconf_bindir_ver %(test -x %{_bindir}/autoconf && %{_bindir}/autoconf --version | %{__awk} 'NR==1 {print $NF}' || echo "0") +%define __autoconf_path_rver %(autoconf --version | %{__awk} 'NR==1 {print $NF}' || echo "0") %define __autoreconf_ver %(test -x %{__autoreconf} && %{__autoreconf} --version | %{__awk} 'NR==1 {print $NF}' || echo "0") %define __autoreconf_bindir_ver %(test -x %{_bindir}/autoreconf && %{_bindir}/autoreconf --version | %{__awk} 'NR==1 {print $NF}' || echo "0") +%define __autoreconf_path_ver %(autoreconf --version | %{__awk} 'NR==1 {print $NF}' || echo "0") %define __automake_ver %(test -x %{__automake} && %{__automake} --version | %{__awk} 'NR==1 {print $NF}' || echo "0") %define __automake_bindir_ver %(test -x %{_bindir}/automake && %{_bindir}/automake --version | %{__awk} 'NR==1 {print $NF}' || echo "0") +%define __automake_path_ver %(automake --version | %{__awk} 'NR==1 {print $NF}' || echo "0")