diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2002-12-28 20:57:49 +0300 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2002-12-28 20:57:49 +0300 |
| commit | c991d310316fa22039f7889c88917f3e2770df80 (patch) | |
| tree | 8b97510e27eaee9a9f39c09e289c63e303785f96 /config/acx.m4 | |
| parent | 81011f17bbe93e62341e67887089dd4bde96cf72 (diff) | |
* 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.
Diffstat (limited to 'config/acx.m4')
| -rw-r--r-- | config/acx.m4 | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/config/acx.m4 b/config/acx.m4 index 36bc9bec9..4e16bcd31 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 - - |