FYI: 05-uninstalled-testsuite.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * autoconf.in: Try to define the variables before using them.
        * autom4te.in ($perllibdir): Use `$autom4te_perllibdir' as envvar
        instead of `$perllibdir'.
        * tests/atconfig.in ($autom4te_perllibdir): Export it.
        
Index: autoconf.in
--- autoconf.in Tue, 24 Jul 2001 20:25:48 +0200 akim (ace/17_autoconf.s 
1.31.8.49 644)
+++ autoconf.in Tue, 24 Jul 2001 22:16:09 +0200 akim (ace/17_autoconf.s 
1.31.8.49 644)
@@ -83,6 +83,18 @@
 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
 
+# Variables.
+: address@hidden@}}
+debug=false
+dir=`echo "$0" | sed -e 's,[^\\/]*$,,'`
+# Trace Autoconf's initialization?
+initialization=false
+localdir=.
+outfile=
+# Exit status.
+status=0
+verbose=:
+
 # Find GNU m4.
 # Handle the case that m4 has moved since we were configured.
 # It may have been found originally in a build directory.
@@ -125,19 +137,6 @@
   test -f "$autom4te" && break
 done
 
-
-# Variables.
-: address@hidden@}}
-test -z "$AC_ACLOCALDIR" &&
-  AC_ACLOCALDIR=`(aclocal --print-ac-dir) 2>/dev/null`
-debug=false
-# Trace Autoconf's initialization?
-initialization=false
-localdir=.
-outfile=
-# Exit status.
-status=0
-verbose=:
 
 # Parse command line.
 while test $# -gt 0 ; do
Index: autom4te.in
--- autom4te.in Tue, 24 Jul 2001 01:00:23 +0200 akim (ace/c/10_autom4te.i 1.4 
664)
+++ autom4te.in Tue, 24 Jul 2001 20:27:34 +0200 akim (ace/c/10_autom4te.i 1.4 
664)
@@ -38,7 +38,7 @@
 {
   my $prefix = "@prefix@";
   # FIXME: Import Struct into Autoconf.
-  my $perllibdir = $ENV{'perllibdir'} || "@datadir@";
+  my $perllibdir = $ENV{'autom4te_perllibdir'} || "@datadir@";
   unshift @INC, "$perllibdir";
 }
 
Index: tests/atconfig.in
--- tests/atconfig.in Mon, 04 Jun 2001 18:29:01 +0200 akim (ace/b/18_atconfig.i 
1.9 644)
+++ tests/atconfig.in Tue, 24 Jul 2001 22:19:50 +0200 akim (ace/b/18_atconfig.i 
1.9 644)
@@ -65,3 +65,11 @@
 
 # We need GNU m4.
 M4='@M4@'
+
+# Be sure to use the non installed Perl modules.
+# We need no special protection for the subtools (e.g., autoheader runs
+# autoconf which runs autom4te) because by themselves, they try to use
+# subtools from the same directory (i.e., foo/autoheader will run
+# foo/autoconf etc.).
+autom4te_perllibdir=$top_srcdir/lib
+export autom4te_perllibdir