build: Use PERL5LIB from 'pre-inst-env' script

* bin/aclocal.in: Detect build environment with AUTOMAKE_UNINSTALLED.
Let 'PERL5LIB' from 'pre-inst-env' define the perl module directories.
* bin/automake.in: Likewise.
* bin/wrap-aclocal.in: Don't set 'Automake::perl_libdirs' anymore.
* bin/wrap-automake.in: Likewise.
* t/Makefile.inc (LOG_COMPILER, PL_LOG_COMPILER): Use 'pre-inst-env'.
(AM_PL_LOG_FLAGS): Don't set perl module path.

diff --git a/bin/aclocal.in b/bin/aclocal.in
index 7350c8e38688b80ed646456e6bbc9f1c29ca8d82..abd352376b4095707be469affb485f0e4d918d8e 100644 (file)
--- a/bin/aclocal.in
+++ b/bin/aclocal.in
@@ -27,9 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
 
 BEGIN
 {
-  @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
-    unless @Aclocal::perl_libdirs;
-  unshift @INC, @Aclocal::perl_libdirs;
+  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
+    unless $ENV{AUTOMAKE_UNINSTALLED};
 }
 
 use strict;

diff --git a/bin/automake.in b/bin/automake.in
index cdea38856b8ae6b92b9ac1010b286199882ee459..ad86cf4a8299e1cdc5760f6bcdb27d972d10383c 100644 (file)
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -31,9 +31,8 @@ use strict;
 
 BEGIN
 {
-  @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
-    unless @Automake::perl_libdirs;
-  unshift @INC, @Automake::perl_libdirs;
+  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
+    unless $ENV{AUTOMAKE_UNINSTALLED};
 
   # Override SHELL.  This is required on DJGPP so that system() uses
   # bash, not COMMAND.COM which doesn't quote arguments properly.

diff --git a/bin/wrap-aclocal.in b/bin/wrap-aclocal.in
index a624bcb164c14ed5f7614fbcfe87c13b50eb1b86..2fcccb4a2ac6d4ead39a98d018faa7a55d484330 100644 (file)
--- a/bin/wrap-aclocal.in
+++ b/bin/wrap-aclocal.in
@@ -19,9 +19,6 @@
 BEGIN
 {
   use strict;
-  @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib');
-  unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib'
-    if '@srcdir@' ne '.';
   unshift @ARGV,
     '--automake-acdir=@abs_top_srcdir@/m4',
     '--system-acdir=@abs_top_srcdir@/m4/acdir';

diff --git a/bin/wrap-automake.in b/bin/wrap-automake.in
index 1075346a1165903321cadb330cab87d748617437..a363dbc7c6834104d11ea6a22a08e182dc375a84 100644 (file)
--- a/bin/wrap-automake.in
+++ b/bin/wrap-automake.in
@@ -19,9 +19,6 @@
 BEGIN
 {
   use strict;
-  @Automake::perl_libdirs = ('@abs_top_srcdir@/lib');
-  unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib'
-    if '@srcdir@' ne '.';
   unshift @ARGV, '--libdir=@abs_top_srcdir@/lib';
 }
 require '@abs_top_builddir@/bin/automake';

diff --git a/t/Makefile.inc b/t/Makefile.inc
index 936108ed6fe12c5ab829c63d3891ffb09b8e2b9b..6b3b62feddfdfb12d3f706f1a5e33f6c9d8d17fa 100644 (file)
--- a/t/Makefile.inc
+++ b/t/Makefile.inc
@@ -20,13 +20,13 @@
 ## ------------ ##
 
 # Run the tests with a proper shell detected at configure time.
-LOG_COMPILER = $(AM_TEST_RUNNER_SHELL)
+LOG_COMPILER = ./pre-inst-env $(AM_TEST_RUNNER_SHELL)
 
 TEST_EXTENSIONS = .pl .sh .tap
 SH_LOG_COMPILER = $(LOG_COMPILER)
 TAP_LOG_COMPILER = $(LOG_COMPILER)
-PL_LOG_COMPILER = $(PERL)
-AM_PL_LOG_FLAGS = -Mstrict -I $(builddir)/lib -I $(srcdir)/lib -w
+PL_LOG_COMPILER = ./pre-inst-env $(PERL)
+AM_PL_LOG_FLAGS = -Mstrict -w
 
 TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(srcdir)/lib/tap-driver.sh