diff options
| author | aoliva <> | 2007-02-18 22:51:18 +0000 |
|---|---|---|
| committer | aoliva <> | 2007-02-18 22:51:18 +0000 |
| commit | 1651dcebaa3bbd02427db1cb0cbdefa14e885d69 (patch) | |
| tree | d6c424c014ed690052c66a60875a20cd57c3293a /config | |
| parent | 62ed97a1550a5fa51a90c3166b08330ca83393b3 (diff) | |
ChangeLog:
* configure: Rebuilt.
config/ChangeLog:
* acx.m4 (NCN_STRICT_CHECK_TOOLS): Mark environment variable as
precious. Prefer it over a cached value. Use cached value
verbosely.
(NCN_STRICT_CHECK_TARGET_TOOLS): Likewise. Don't override
environment variable with build-time tools.
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 8 | ||||
| -rw-r--r-- | config/acx.m4 | 30 |
2 files changed, 37 insertions, 1 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index aee290ada76..fdc2ebf7b00 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,11 @@ +2007-02-18 Alexandre Oliva <aoliva@redhat.com> + + * acx.m4 (NCN_STRICT_CHECK_TOOLS): Mark environment variable as + precious. Prefer it over a cached value. Use cached value + verbosely. + (NCN_STRICT_CHECK_TARGET_TOOLS): Likewise. Don't override + environment variable with build-time tools. + 2007-02-09 Daniel Jacobowitz <dan@codesourcery.com> * acx.m4 (ACX_CHECK_INSTALLED_TARGET_TOOL): Avoid AC_PATH_PROG diff --git a/config/acx.m4 b/config/acx.m4 index 107fd765c6e..d2d227d2de0 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -123,6 +123,20 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias- AC_DEFUN([NCN_STRICT_CHECK_TOOLS], [AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl +AC_ARG_VAR([$1], [$1 for the host]) + +if test -n "[$]$1"; then + ac_cv_prog_$1=[$]$1 +elif test -n "$ac_cv_prog_$1"; then + $1=$ac_cv_prog_$1 +fi + +if test -n "$ac_cv_prog_$1"; then + for ncn_progname in $2; do + AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4]) + done +fi + for ncn_progname in $2; do if test -n "$ncn_tool_prefix"; then AC_CHECK_PROG([$1], [${ncn_tool_prefix}${ncn_progname}], @@ -150,7 +164,21 @@ fi AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOLS], [AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl -if test -n "$with_build_time_tools"; then +AC_ARG_VAR([$1], patsubst([$1], [_FOR_TARGET$], [])[ for the target]) + +if test -n "[$]$1"; then + ac_cv_prog_$1=[$]$1 +elif test -n "$ac_cv_prog_$1"; then + $1=$ac_cv_prog_$1 +fi + +if test -n "$ac_cv_prog_$1"; then + for ncn_progname in $2; do + AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4]) + done +fi + +if test -z "$ac_cv_prog_$1" && 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/${ncn_progname}; then |