aboutsummaryrefslogtreecommitdiff
path: root/config/acx.m4
diff options
context:
space:
mode:
Diffstat (limited to 'config/acx.m4')
-rw-r--r--config/acx.m488
1 files changed, 37 insertions, 51 deletions
diff --git a/config/acx.m4 b/config/acx.m4
index b52342c..94e3216 100644
--- a/config/acx.m4
+++ b/config/acx.m4
@@ -103,72 +103,58 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
]) []dnl # _NCN_TOOL_PREFIXES
####
-# NCN_CHECK_TARGET_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
-# Like AC_CHECK_TOOL, but tries a prefix of the target, not the host.
-# Code is pretty much lifted from autoconf2.53.
+# NCN_STRICT_CHECK_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
+# Like plain AC_CHECK_TOOLS, but require prefix if build!=target.
-AC_DEFUN([NCN_CHECK_TARGET_TOOL],
+AC_DEFUN([NCN_STRICT_CHECK_TOOLS],
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
-if test -n "$ncn_target_tool_prefix"; then
- AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}$2],
- [${ncn_target_tool_prefix}$2], , [$4])
-fi
-if test -z "$ac_cv_prog_$1" ; then
- 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
-]) []dnl # NCN_CHECK_TARGET_TOOL
-
-
-####
-# NCN_STRICT_CHECK_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
-# Like AC_CHECK_TOOL, but requires the prefix if build!=host.
+for ncn_progname in $2; do
+ if test -n "$ncn_tool_prefix"; then
+ AC_CHECK_PROG([$1], [${ncn_tool_prefix}${ncn_progname}],
+ [${ncn_tool_prefix}${ncn_progname}], , [$4])
+ fi
+ if test -z "$ac_cv_prog_$1" && test $build = $host ; then
+ AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
+ fi
+ test -n "$ac_cv_prog_$1" && break
+done
-AC_DEFUN([NCN_STRICT_CHECK_TOOL],
-[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
-if test -n "$ncn_tool_prefix"; then
- AC_CHECK_PROG([$1], [${ncn_tool_prefix}$2],
- [${ncn_tool_prefix}$2], , [$4])
-fi
if test -z "$ac_cv_prog_$1" ; then
+ ifelse([$3],[], [set dummy $2
if test $build = $host ; then
- ncn_cv_$1=$$1
- AC_CHECK_PROG([ncn_cv_$1], [$2], [$2], [ifelse([$3],[],[$2],[$3])], [$4])
- $1=$ncn_cv_$1
+ $1="[$]2"
else
- $1="ifelse([$3],[],[${ncn_tool_prefix}$2],[$3])"
- fi
-else
- $1="$ac_cv_prog_$1"
+ $1="${ncn_tool_prefix}[$]2"
+ fi], [$1="$3"])
fi
-]) []dnl # NCN_STRICT_CHECK_TOOL
-
+]) []dnl # NCN_STRICT_CHECK_TOOLS
####
-# NCN_STRICT_CHECK_TARGET_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
-# Like NCN_CHECK_TARGET_TOOL, but requires the prefix if build!=target.
+# NCN_STRICT_CHECK_TARGET_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
+# Like CVS Autoconf AC_CHECK_TARGET_TOOLS, but require prefix if build!=target.
-AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOL],
+AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOLS],
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
-if test -n "$ncn_target_tool_prefix"; then
- AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}$2],
- [${ncn_target_tool_prefix}$2], , [$4])
-fi
+for ncn_progname in $2; do
+ if test -n "$ncn_target_tool_prefix"; then
+ AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}${ncn_progname}],
+ [${ncn_target_tool_prefix}${ncn_progname}], , [$4])
+ fi
+ if test -z "$ac_cv_prog_$1" && test $build = $target ; then
+ AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
+ fi
+ test -n "$ac_cv_prog_$1" && break
+done
+
if test -z "$ac_cv_prog_$1" ; then
+ ifelse([$3],[], [set dummy $2
if test $build = $target ; then
- ncn_cv_$1=$$1
- AC_CHECK_PROG([ncn_cv_$1], [$2], [$2], [ifelse([$3],[],[$2],[$3])], [$4])
- $1=$ncn_cv_$1
+ $1="[$]2"
else
- $1="ifelse([$3],[],[${ncn_target_tool_prefix}$2],[$3])"
- fi
-else
- $1="$ac_cv_prog_$1"
+ $1="${ncn_target_tool_prefix}[$]2"
+ fi], [$1="$3"])
fi
-]) []dnl # NCN_STRICT_CHECK_TARGET_TOOL
+]) []dnl # NCN_STRICT_CHECK_TARGET_TOOLS
###
# AC_PROG_CPP_WERROR