diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 6 | ||||
| -rw-r--r-- | config/acx.m4 | 18 |
2 files changed, 18 insertions, 6 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 553ee48..1ddcfd4 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,9 @@ +2006-02-14 Paolo Bonzini <bonzini@gnu.org> + Andreas Schwab <schwab@suse.de> + + * 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 <bonzini@gnu.org> * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Test $with_build_time_tools. diff --git a/config/acx.m4 b/config/acx.m4 index 9f0dd1e..7c4c213 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 |