mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-02-17 14:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

* lib/autom4te.in (Autoconf): Preselect AM_CONDITIONAL,

Browse Source 
AC_LIBSOURCE, AC_CONFIG_FILES.
* lib/autotest/general.m4 (AT_INIT): Don't abort when a tested
program version string doesn't match the package's.
* lib/autoconf/general.m4 (AC_CACHE_VAL): Reestablish the space
after `(cached)'.
This commit is contained in:
Akim Demaille 2001-09-18 08:58:56 +00:00
parent 3bf9fd606e
commit 72c26bb441
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2001-09-18 Akim Demaille <akim@epita.fr>
* lib/autom4te.in (Autoconf): Preselect AM_CONDITIONAL,
AC_LIBSOURCE, AC_CONFIG_FILES.
* lib/autotest/general.m4 (AT_INIT): Don't abort when a tested
program version string doesn't match the package's.
* lib/autoconf/general.m4 (AC_CACHE_VAL): Reestablish the space
after `(cached)'.
2001-09-17 Paul Eggert <eggert@twinsun.com>
* lib/autoconf/c.m4: (AC_LANG_INT_SAVE(C)):

2
lib/autoconf/general.m4
View File

@ -1798,7 +1798,7 @@ m4_define([AC_CACHE_VAL],
[$0($1, ...): suspicious presence of an AC_DEFINE in the second argument, ]dnl
[where no actions should be taken])])dnl
AS_VAR_SET_IF([$1],
[_AS_ECHO_N([(cached)])],
[_AS_ECHO_N([(cached) ])],
[$2])])

3
lib/autom4te.in
View File

@ -40,6 +40,9 @@ args: --preselect AC_DEFINE_TRACE_LITERAL
# Wanted by Automake
args: --preselect AC_LIBSOURCE
args: --preselect AC_SUBST
args: --preselect AM_CONDITIONAL
args: --preselect AC_LIBSOURCE
args: --preselect AC_CONFIG_FILES
# Wanted by autoscan
args: --preselect AC_CHECK_FUNCS
args: --preselect AC_CHECK_HEADERS

30
lib/autotest/general.m4
View File

@ -420,27 +420,23 @@ fi
done
AS_BOX([Victims.])
echo
} >&AS_MESSAGE_LOG_FD
# If we are an embedded test suite, be sure to check we are running
# the proper version of the programs. And in either case, report
# what program is being used.
for at_program in $at_victims
# Report what programs are being tested.
for at_program in : $at_victims
do
_AS_PATH_WALK([$PATH],
[if test -f $as_dir/$at_program; then
(
echo "AT_LINE: $as_dir/$at_program --version"
$as_dir/$at_program --version
echo
) >&AS_MESSAGE_LOG_FD 2>&1
if test -n "$at_package_name" && test -n "$at_package_version"; then
($as_dir/$at_program --version |
grep "$at_package_name.*$at_package_version") >/dev/null 2>&1 ||
AS_ERROR([version mismatch (need $at_package_name $at_package_version): $as_dir/$at_program])
test "$at_program" = : && continue
_AS_PATH_WALK([$PATH], [test -f $as_dir/$at_program && break])
if test -f $as_dir/$at_program; then
{
echo "AT_LINE: $as_dir/$at_program --version"
$as_dir/$at_program --version
echo
} >&AS_MESSAGE_LOG_FD 2>&1
else
AS_ERROR([cannot find $at_program])
fi
break;
fi])
done
{