patch for Autoconf "make check" that tests the wrong Autoconf

[Paul Eggert]

This is a followup to my earlier message
http://mail.gnu.org/pipermail/autoconf-patches/2002-June/008469.html
reporting a problem with "make check" not working when Autoconf is not
already installed.

This bug appears to me to be a problem regardless of whether the
2002-06-12 patch is accepted, since the pre-2002-06-12 Autoconf test
suite was not always testing the just-built Autoconf.

I installed the following patch to fix this.  I'm not quite sold
on the distinction between @abs_top_srcdir@ (used for autom4te_perllibdir)
and @abs_top_builddir@ (used for everything else), and I suspect that
the resulting tests still aren't correct when builddir != srcdir.
But it does work correctly for me when builddir == srcdir, tested
on a system where Autoconf was not already installed.

Also, wrapsh.as and wrappl.as have much in common after the change,
but I don't understand the reason for the two distinct programs so I
didn't try to merge them.

2002-06-15  Paul Eggert  <address@hidden>

        * tests/wrapsh.as (AUTOCONF, AUTOHEADER, AUTOM4TE, AUTOM4TE_CFG,
        autom4te_perllibdir): Set to top build dir or src dir as appropriate,
        so that we consistently test the just-built programs.
        * tests/wrappl.as: Likewise.

Index: tests/wrappl.as
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/wrappl.as,v
retrieving revision 1.3
diff -p -u -r1.3 wrappl.as
--- tests/wrappl.as     12 Apr 2002 10:10:10 -0000      1.3
+++ tests/wrappl.as     15 Jun 2002 07:46:06 -0000
@@ -2,21 +2,18 @@ AS_INIT[]dnl                            
 # @configure_input@
 # Running `$0' as if it were installed.
 
-# Be sure to use the non installed Perl modules.
address@hidden@/bin/autoconf
address@hidden@/bin/autoheader
address@hidden@/bin/autom4te
address@hidden@/lib/autom4te.cfg
 address@hidden@/lib
-export autom4te_perllibdir
+export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir
 
 case $as_me in
   ifnames)
      # Does not have lib files.
      exec @abs_top_builddir@/bin/$as_me ${1+"$@"}
      ;;
-
-  autom4te)
-     address@hidden@/lib/autom4te.cfg
-     export AUTOM4TE_CFG
-     ;;
-
 esac
 # We might need files from build (frozen files), in addition of src files.
 exec @abs_top_builddir@/bin/$as_me \
Index: tests/wrapsh.as
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/wrapsh.as,v
retrieving revision 1.2
diff -p -u -r1.2 wrapsh.as
--- tests/wrapsh.as     12 Apr 2002 09:56:11 -0000      1.2
+++ tests/wrapsh.as     15 Jun 2002 07:46:06 -0000
@@ -1,4 +1,10 @@
 AS_INIT[]dnl                                         -*- shell-script -*-
 # @configure_input@
 # Running `$0' as if it were installed.
address@hidden@/bin/autoconf
address@hidden@/bin/autoheader
address@hidden@/bin/autom4te
address@hidden@/lib/autom4te.cfg
address@hidden@/lib
+export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir
 exec @abs_top_builddir@/bin/$as_me --include @abs_top_builddir@/lib ${1+"$@"}