mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-01-18 10:45:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

* lib/autoconf/programs.m4 (_AC_FEATURE_CHECK_LENGTH): Don't guess

Browse Source 
how deeply nested we are when a suitable tool is found, set the
ac_path_TOOL_found flag.
(_AC_PATH_PROG_FEATURE_CHECK): Encapsulate knowledge of how deeply
nested we are in this macro.  Break out of all 3 nested loops if
ac_path_TOOL_found is set.
This commit is contained in:
Gary V. Vaughan 2004-04-23 10:24:32 +00:00
parent 94c540e872
commit 883a232738
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2004-04-22 Albert Chin-A-Young <china@thewrittenword.com>,
Gary V. Vaughan <gary@gnu.org>
* lib/autoconf/programs.m4 (_AC_FEATURE_CHECK_LENGTH): Don't guess
how deeply nested we are when a suitable tool is found, set the
ac_path_TOOL_found flag.
(_AC_PATH_PROG_FEATURE_CHECK): Encapsulate knowledge of how deeply
nested we are in this macro. Break out of all 3 nested loops if
ac_path_TOOL_found is set.
2004-04-21 Gary V. Vaughan <gary@gnu.org>
* lib/autoconf/programs.m4 (_AC_FEATURE_CHECK_LENGTH): Break out

21
lib/autoconf/programs.m4
View File

@ -412,14 +412,16 @@ m4_define([_AC_PROG_GREP],
# path to a program named in PROGNAME-LIST. FEATURE-TEST must set
# $ac_cv_path_VARIABLE to the path of an acceptable program, or else
# _AC_PATH_PROG_FEATURE_CHECK will report that no acceptable program
# was found, and abort. If a suitable $ac_path_VARIABLE is found,
# `break 3' will accept it without any further checks.
# was found, and abort. If a suitable $ac_path_VARIABLE is found in the
# FEATURE-TEST macro, it can set $ac_path_VARIABLE_found=':' to accept
# that value without any further checks.
m4_define([_AC_PATH_PROG_FEATURE_CHECK],
[# Extract the first word of "$2" to use in msg output
if test -z "$$1"; then
set dummy $2; ac_prog_name=$[2]
AC_CACHE_VAL([ac_cv_path_$1],
[AS_TMPDIR([$1])
ac_path_$1_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
_AS_PATH_WALK([$4],
[for ac_prog in $2; do
@ -427,8 +429,10 @@ _AS_PATH_WALK([$4],
ac_path_$1="$as_dir/$ac_prog$ac_exec_ext"
test -f "$ac_path_$1" || continue
$3
$ac_path_$1_found && break 3
done
done])
done
])
rm -rf "$tmp"
])
$1="$ac_cv_path_$1"
@ -452,14 +456,11 @@ fi
# iteration by appending (optionally, MATCH-STRING and) a newline
# to the file, and using the result as input to CHECK-CMD.
m4_define([_AC_FEATURE_CHECK_LENGTH],
[if AS_EXECUTABLE_P(["$$1"]); then
[$$1_found || if AS_EXECUTABLE_P(["$$1"]); then
# Check for GNU $1 and select it if it is found.
_AC_PATH_PROG_FLAVOR_GNU([$$1],
[$2="$$1"
break 3
])
ac_count=0
[$2="$$1" $1_found=:],
[ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >"$tmp/conftest.in"
while :
do
@ -480,7 +481,7 @@ dnl # for best performing tool in a list breaks down.
fi
# 10*(2^10) chars as input seems more than enough
test $ac_count -gt 10 && break
done
done])
fi
])