From 36202ecdea324a04b913d33ed76e10a985ced405 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 8 Jan 2002 12:06:18 +0000 Subject: [PATCH] 2002-02-07 Ralf Corsepius * aclocal/check-tool.m4: Remove AC_CHECK_TOOL_PREFIX, conditionalize check upon host_alias != build_alias. --- ChangeLog | 5 +++++ aclocal/check-tool.m4 | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bbc7506a15..295a497f78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-02-07 Ralf Corsepius + + * aclocal/check-tool.m4: Remove AC_CHECK_TOOL_PREFIX, conditionalize + check upon host_alias != build_alias. + 2002-01-07 Joel Sherrill * automake/compile.am (LINK_LIB_RTEMS): Removed line continuation for diff --git a/aclocal/check-tool.m4 b/aclocal/check-tool.m4 index 2579aab252..5a91490e74 100644 --- a/aclocal/check-tool.m4 +++ b/aclocal/check-tool.m4 @@ -2,9 +2,10 @@ dnl $Id$ ## Check for a cross tool, similar to AC_CHECK_TOOL, but do not fall back to ## the un-prefixed version of PROG-TO-CHECK-FOR. -## HACK: AC_CHECK_TOOL_PREFIX is an internal macro from autoconf-2.13 dnl RTEMS_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]]) AC_DEFUN(RTEMS_CHECK_TOOL, -[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl -AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, $3, $4) +[ + AS_IF([test "x$build_alias" != "x$host_alias"], + [rtems_tool_prefix=${ac_tool_prefix}]) + AC_CHECK_PROG($1, ${rtems_tool_prefix}$2, ${rtems_tool_prefix}$2, $3, $4) ])