summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-08 12:06:18 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-08 12:06:18 +0000
commit36202ecdea324a04b913d33ed76e10a985ced405 (patch)
tree898e63b689dc9e76a1e5edd7b5472e00db8a4246
parent8accf469f7ea363cf8372f2ff3d3d9f8c6a834ee (diff)
downloadrtems-36202ecdea324a04b913d33ed76e10a985ced405.tar.bz2
2002-02-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/check-tool.m4: Remove AC_CHECK_TOOL_PREFIX, conditionalize check upon host_alias != build_alias.
-rw-r--r--ChangeLog5
-rw-r--r--aclocal/check-tool.m47
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 <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/check-tool.m4: Remove AC_CHECK_TOOL_PREFIX, conditionalize
+ check upon host_alias != build_alias.
+
2002-01-07 Joel Sherrill <joel@OARcorp.com>
* 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)
])