* configure.in (AUTOMAKE, ACLOCAL): Search the 'lib' directory

from the builddir too, to pick up Automake::Config.
* tests/defs.in (AUTOMAKE, ACLOCAL): Likewise.
* configure: Regenerate.
* automake.in (BEGIN): Handle multiple directories in $perllibdir.
* aclocal.in (BEGIN): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 42b1a37a4302824211e0b8e34554995add41c19c..42e05725f926de218f192f0d036e098e75047d1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-06  Raja R Harinath  <harinath@acm.org>
+
+       * configure.in (AUTOMAKE, ACLOCAL): Search the 'lib' directory
+       from the builddir too, to pick up Automake::Config.
+       * tests/defs.in (AUTOMAKE, ACLOCAL): Likewise.
+       * configure: Regenerate.
+       * automake.in (BEGIN): Handle multiple directories in $perllibdir.
+       * aclocal.in (BEGIN): Likewise.
+
 2003-08-07  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * tests/ltcond.test: Thinko.

diff --git a/aclocal.in b/aclocal.in
index 64c5c265f8269f207c1c2ff59867f86a5dcfc5fb..0bb7ea84f4def5dbc24347707d786bdf4a44018b 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -30,7 +30,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
 BEGIN
 {
   my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-  unshift @INC, $perllibdir;
+  unshift @INC, (split ':', $perllibdir);
 }
 
 use Automake::Config;

diff --git a/automake.in b/automake.in
index 513bb17776e83ed95dde9e6e0f1508aa3415787f..3f1ee13aae482a33bcfbdcfbab35dd7bf4c90e7d 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -32,7 +32,7 @@ package Language;
 BEGIN
 {
   my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-  unshift @INC, $perllibdir;
+  unshift @INC, (split ':', $perllibdir);
 
   # Override SHELL.  This is required on DJGPP so that system() uses
   # bash, not COMMAND.COM which doesn't quote arguments properly.

diff --git a/configure b/configure
index 0b2fecda6f9a25d7465d94e591c8a6f45a380fab..e6a75a27aee8ab157d9383fae0c0d0204ab4c6c7 100755 (executable)
--- a/configure
+++ b/configure
@@ -1662,8 +1662,8 @@ pkgvdatadir="\${datadir}/automake-${APIVERSION}"
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
 # hence `.' is really what we want for perllibdir, libdir, and acdir.
-ACLOCAL="perllibdir=./lib `pwd`/aclocal --acdir=m4"
-AUTOMAKE="perllibdir=./lib `pwd`/automake --libdir=lib"
+ACLOCAL="perllibdir=`pwd`/lib:./lib `pwd`/aclocal --acdir=m4"
+AUTOMAKE="perllibdir=`pwd`/lib:./lib `pwd`/automake --libdir=lib"
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2

diff --git a/configure.in b/configure.in
index 54479e99004af07d446f7476b908720b27caa41c..e28a8caf569073e615c7a115ed65a2a2b3c80709 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -49,8 +49,8 @@ AC_SUBST(pkgvdatadir)
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
 # hence `.' is really what we want for perllibdir, libdir, and acdir.
-ACLOCAL="perllibdir=./lib `pwd`/aclocal --acdir=m4"
-AUTOMAKE="perllibdir=./lib `pwd`/automake --libdir=lib"
+ACLOCAL="perllibdir=`pwd`/lib:./lib `pwd`/aclocal --acdir=m4"
+AUTOMAKE="perllibdir=`pwd`/lib:./lib `pwd`/automake --libdir=lib"
 
 AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then

diff --git a/tests/defs.in b/tests/defs.in
index ca310420c318c899a89f633b54386b52b9e0beb1..6ca72190750f77b8ad0110524d0933ae224875b3 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -235,7 +235,7 @@ echo "=== Running test $0"
 # strictness to avoid having to create lots and lots of files.  A test
 # can override this by specifying a different strictness.
 if test -z "$AUTOMAKE"; then
-   perllibdir=$srcdir/../lib
+   perllibdir=../../lib:$srcdir/../lib
    export perllibdir
    # Use -Wall -Werror by default.  Tests for which this is inappropriate
    # (e.g. when testing that a warning is enabled by a specific switch)
@@ -245,7 +245,7 @@ fi
 
 # See how aclocal should be run.
 if test -z "$ACLOCAL"; then
-   perllibdir=$srcdir/../lib
+   perllibdir=../../lib:$srcdir/../lib
    export perllibdir
    # Most of the files are in $srcdir/../m4.  However amversion.m4 is
    # generated in ../m4, so we include that directory in the search