* 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)'.

diff --git a/ChangeLog b/ChangeLog
index d935636719c511b7a99f562548aec93b99f829e1..c1c6e116c58ad3e374f0349798de569887c34661 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)):

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 2cb2862b8c4c96cfa6b00c5af8d6e37c3ec69630..07a3df1610d30d1a51757a955f1895b2a200b4e5 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -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])])
 
 

diff --git a/lib/autom4te.in b/lib/autom4te.in
index 9ca3c782c49ccb89e98afcdaea83b670d1d0aba1..94d93d43911b663bdf0e10344752d5e37e22b66c 100644 (file)
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -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

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index ffacf21be29d4c5cac54d295c1c120071e7d62d3..a38a6f7830a03cf49020b227e6c1c175f23588a4 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -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
 
 {