diff options
| author | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-12-28 17:57:00 +0000 |
|---|---|---|
| committer | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-12-28 17:57:00 +0000 |
| commit | c43b8f8746fc68eca1c0ecbbee97c61d9e46c329 (patch) | |
| tree | 7978ade501f35ec7c176dbcfaef119c7da0d3c10 /config | |
| parent | 041dd099139a7ca66000cfb44d4ce26c1b81af09 (diff) | |
| download | gcc-c43b8f8746fc68eca1c0ecbbee97c61d9e46c329.tar.gz | |
* acx.m4: Name cache variables properly.
(NCN_STRICT_CHECK_TOOL): If program is not found and
value-if-not-found is empty, use ${ncn_tool_prefix}$2 or $2,
depending on whether build != host or not.
(NCN_STRICT_CHECK_TARGET_TOOL): Ditto, with the target prefix.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60581 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 8 | ||||
| -rw-r--r-- | config/acx.m4 | 24 |
2 files changed, 19 insertions, 13 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index dd742ba0b72..15c7c3e0ae3 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,11 @@ +2002-12-28 Alexandre Oliva <aoliva@redhat.com> + + * acx.m4: Name cache variables properly. + (NCN_STRICT_CHECK_TOOL): If program is not found and + value-if-not-found is empty, use ${ncn_tool_prefix}$2 or $2, + depending on whether build != host or not. + (NCN_STRICT_CHECK_TARGET_TOOL): Ditto, with the target prefix. + 2002-12-28 Nathanael Nerode <neroden@gcc.gnu.org> * acx.m4: New. diff --git a/config/acx.m4 b/config/acx.m4 index 36bc9bec93c..4e16bcd31b5 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -24,9 +24,9 @@ if test -n "$ncn_target_tool_prefix"; then [${ncn_target_tool_prefix}$2], , [$4]) fi if test -z "$ac_cv_prog_$1" ; then - ncn_ct_$1=$$1 - AC_CHECK_PROG([ncn_ct_$1], [$2], [$2], [$3], [$4]) - $1=$ncn_ct_$1 + ncn_cv_$1=$$1 + AC_CHECK_PROG([ncn_cv_$1], [$2], [$2], [$3], [$4]) + $1=$ncn_cv_$1 else $1="$ac_cv_prog_$1" fi @@ -45,11 +45,11 @@ if test -n "$ncn_tool_prefix"; then fi if test -z "$ac_cv_prog_$1" ; then if test $build = $host ; then - ncn_ct_$1=$$1 - AC_CHECK_PROG([ncn_ct_$1], [$2], [$2], [$3], [$4]) - $1=$ncn_ct_$1 + ncn_cv_$1=$$1 + AC_CHECK_PROG([ncn_cv_$1], [$2], [$2], [ifelse([$3],[],[$2],[$3])], [$4]) + $1=$ncn_cv_$1 else - $1="$3" + $1="ifelse([$3],[],[${ncn_tool_prefix}$2],[$3])" fi else $1="$ac_cv_prog_$1" @@ -69,15 +69,13 @@ if test -n "$ncn_target_tool_prefix"; then fi if test -z "$ac_cv_prog_$1" ; then if test $build = $target ; then - ncn_ct_$1=$$1 - AC_CHECK_PROG([ncn_ct_$1], [$2], [$2], [$3], [$4]) - $1=$ncn_ct_$1 + ncn_cv_$1=$$1 + AC_CHECK_PROG([ncn_cv_$1], [$2], [$2], [ifelse([$3],[],[$2],[$3])], [$4]) + $1=$ncn_cv_$1 else - $1="$3" + $1="ifelse([$3],[],[${ncn_target_tool_prefix}$2],[$3])" fi else $1="$ac_cv_prog_$1" fi ]) []dnl # NCN_STRICT_CHECK_TARGET_TOOL - - |