From ab0da55683136e6a9f5fffe135a38bff66cb5d1b Mon Sep 17 00:00:00 2001 From: bonzini Date: Tue, 14 Feb 2006 09:36:24 +0000 Subject: 2006-02-14 Paolo Bonzini Sync from src: 2005-12-27 Leif Ekblad * configure.in: Add support for RDOS target. * configure: Regenerate. 2006-02-14 Paolo Bonzini Andreas Schwab * configure: Regenerate. config: 2006-02-14 Paolo Bonzini Andreas Schwab * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Use correct program name. (ACX_CHECK_INSTALLED_TARGET_TOOL): Likewise, and always set $1. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110961 138bc75d-0d04-0410-961f-82ee72b054a4 --- config/ChangeLog | 6 ++++++ config/acx.m4 | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/ChangeLog b/config/ChangeLog index b000a8062d7..2707b60900e 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,9 @@ +2006-02-14 Paolo Bonzini + Andreas Schwab + + * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Use correct program name. + (ACX_CHECK_INSTALLED_TARGET_TOOL): Likewise, and always set $1. + 2006-01-26 Paolo Bonzini * config/acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Test diff --git a/config/acx.m4 b/config/acx.m4 index 9f0dd1e00be..7c4c21386f1 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -138,8 +138,8 @@ AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOLS], if test -n "$with_build_time_tools"; then for ncn_progname in $2; do AC_MSG_CHECKING([for ${ncn_progname} in $with_build_time_tools]) - if test -x $with_build_time_tools/$1; then - ac_cv_prog_$1=$with_build_time_tools/$1 + if test -x $with_build_time_tools/${ncn_progname}; then + ac_cv_prog_$1=$with_build_time_tools/${ncn_progname} AC_MSG_RESULT(yes) break else @@ -271,10 +271,14 @@ AC_REQUIRE([ACX_TOOL_DIRS]) AC_REQUIRE([ACX_HAVE_GCC_FOR_TARGET]) if test -z "$ac_cv_path_$1" ; then if test -n "$with_build_time_tools"; then - AC_MSG_CHECKING([for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools]) - $1=`cd $with_build_time_tools && pwd`/$1 - ac_cv_path_$1=[$]$1 - AC_MSG_RESULT([$ac_cv_path_$1]) + AC_MSG_CHECKING([for $2 in $with_build_time_tools]) + if test -x $with_build_time_tools/$2; then + $1=`cd $with_build_time_tools && pwd`/$2 + ac_cv_path_$1=[$]$1 + AC_MSG_RESULT([$ac_cv_path_$1]) + else + AC_MSG_RESULT(no) + fi elif test $build != $host && test $have_gcc_for_target = yes; then $1=`$GCC_FOR_TARGET --print-prog-name=$2` test [$]$1=$2 && $1= @@ -286,6 +290,8 @@ if test -z "$ac_cv_path_$1" ; then fi if test -z "$ac_cv_path_$1" ; then NCN_STRICT_CHECK_TARGET_TOOLS([$1], [$2]) +else + $1=$ac_cv_path_$1 fi ]) []dnl # ACX_CHECK_INSTALLED_TARGET_TOOL -- cgit v1.2.1