aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/ChangeLog8
-rw-r--r--config/acx.m424
2 files changed, 19 insertions, 13 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index dd742ba..15c7c3e 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 36bc9be..4e16bcd 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
-
-