(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.

diff --git a/tests/wrappl.as b/tests/wrappl.as
index a254c86e1b2916098ff25881f39adbf39e213545..9b85f8e2d08f1aa70793c0afa7de5627037beeda 100644 (file)
--- a/tests/wrappl.as
+++ b/tests/wrappl.as
@@ -2,21 +2,18 @@ AS_INIT[]dnl                                         -*- shell-script -*-
 # @configure_input@
 # Running `$0' as if it were installed.
 
-# Be sure to use the non installed Perl modules.
+AUTOCONF=@abs_top_builddir@/bin/autoconf
+AUTOHEADER=@abs_top_builddir@/bin/autoheader
+AUTOM4TE=@abs_top_builddir@/bin/autom4te
+AUTOM4TE_CFG=@abs_top_builddir@/lib/autom4te.cfg
 autom4te_perllibdir=@abs_top_srcdir@/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)
-     AUTOM4TE_CFG=@abs_top_builddir@/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 \

diff --git a/tests/wrapsh.as b/tests/wrapsh.as
index 8a736141186c9d2498fdc3140ea69c7460cf68d8..3e4e2da21e6063149fef7eee2462a493e296ff99 100644 (file)
--- a/tests/wrapsh.as
+++ b/tests/wrapsh.as
@@ -1,4 +1,10 @@
 AS_INIT[]dnl                                         -*- shell-script -*-
 # @configure_input@
 # Running `$0' as if it were installed.
+AUTOCONF=@abs_top_builddir@/bin/autoconf
+AUTOHEADER=@abs_top_builddir@/bin/autoheader
+AUTOM4TE=@abs_top_builddir@/bin/autom4te
+AUTOM4TE_CFG=@abs_top_builddir@/lib/autom4te.cfg
+autom4te_perllibdir=@abs_top_srcdir@/lib
+export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir
 exec @abs_top_builddir@/bin/$as_me --include @abs_top_builddir@/lib ${1+"$@"}