00-fyi-fatal-victims.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        
        * lib/autom4te.in (Autoconf): Preselect AM_CONDITIONAL,
        AC_LIBSOURCE, AC_CONFIG_FILES.
        * lib/autotest/general.m4 (AT_INIT): Don't abort when a victim's
        version string doesn't match the package's.
        * lib/autoconf/general.m4 (AC_CACHE_VAL): Reestablish the space
        after `(cached)'.
        
Index: lib/autom4te.in
--- lib/autom4te.in Thu, 30 Aug 2001 23:35:32 +0200 akim
+++ lib/autom4te.in Sun, 16 Sep 2001 12:26:15 +0200 akim
@@ -40,6 +40,9 @@ args: --preselect AC_DEFINE_TRACE_LITERA
 # 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
Index: lib/autoconf/general.m4
--- lib/autoconf/general.m4 Wed, 12 Sep 2001 23:47:08 +0200 akim
+++ lib/autoconf/general.m4 Sat, 15 Sep 2001 15:52:47 +0200 akim
@@ -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])])
 
 
Index: lib/autotest/general.m4
--- lib/autotest/general.m4 Wed, 12 Sep 2001 23:58:47 +0200 akim
+++ lib/autotest/general.m4 Sun, 16 Sep 2001 12:08:31 +0200 akim
@@ -419,27 +419,23 @@ m4_define([AS_MESSAGE_LOG_FD], [6])
   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
 
 {