* tests/testsuite.ac (macrodir): Don't set it here...

* Makefile.am (BUILDCHECK_ENVIRONMENT, INSTALLCHECK_ENVIRONMENT):
...set it here to pick up files from the right place in context.
* tests/libtoolize.at, tests/old-m4-iface.at: Adjust.
* libtoolize.m4sh: Take tst_aclocaldir into account when running
inside the test harness.

diff --git a/ChangeLog b/ChangeLog
index 90ec3447189882c820ce708fdceb4df2e46cc1e3..a64af118b8b9484ecc5d581343228ac8cef748be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-10  Gary V. Vaughan  <gary@gnu.org>
+
+       * tests/testsuite.ac (macrodir): Don't set it here...
+       * Makefile.am (BUILDCHECK_ENVIRONMENT, INSTALLCHECK_ENVIRONMENT):
+       ...set it here to pick up files from the right place in context.
+       * tests/libtoolize.at, tests/old-m4-iface.at: Adjust.
+       * libtoolize.m4sh: Take tst_aclocaldir into account when running
+       inside the test harness.
+
 2005-11-10  Gary V. Vaughan  <gary@gnu.org>
 
        * tests/am-subdir.at: Now that we don't run autoreconf, we have to

diff --git a/Makefile.am b/Makefile.am
index f6b03e9e1ad70f616b86ee450e05ce4d1c9b4b6e..c3b1930c593531f6cfea28adc4ca5d26b17a5385 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -389,11 +389,13 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
 
 BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
        LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
-       LIBTOOL="$(abs_top_builddir)/libtool"
+       LIBTOOL="$(abs_top_builddir)/libtool" \
+       tst_aclocaldir="$(abs_top_srcdir)/libltdl/m4"
 
 INSTALLCHECK_ENVIRONMENT = \
        LIBTOOLIZE="$(bindir)/`echo libtoolize | sed '$(program_transform_name)'`" \
-       LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`"
+       LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`" \
+       tst_aclocaldir="$(aclocaldir)"
 
 check-recursive: $(srcdir)/$(TESTSUITE)
 

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index fd0d7682c6e9d606fca0582b3f9ce8f979868172..fae5839d6151a6a5fd5363f90836bd1c442c4995 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1030,6 +1030,7 @@ func_nonemptydir_p ()
     pkgdatadir="$_lt_pkgdatadir/libltdl"
     aclocaldir="$_lt_pkgdatadir/libltdl/m4"
   fi
+  test -n "$tst_aclocaldir" && aclocaldir="$tst_aclocaldir"
   func_nonemptydir_p pkgltdldir
   func_nonemptydir_p pkgdatadir
   func_nonemptydir_p aclocaldir

diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index db0c3df790e9c294bddb6068c0e0225925d5f331..16f98e90521501568481815ee59a965870160c4c 100644 (file)
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -369,10 +369,10 @@ AC_OUTPUT
 libtoolize: putting files in AC_CONFIG_AUX_DIR, \`config'.
 libtoolize: copying file \`config/ltmain.sh'
 libtoolize: You should add the contents of the following files to \`aclocal.m4':
-libtoolize:   \`$_lt_pkgdatadir/libltdl/m4/libtool.m4'
-libtoolize:   \`$_lt_pkgdatadir/libltdl/m4/ltoptions.m4'
-libtoolize:   \`$_lt_pkgdatadir/libltdl/m4/ltversion.m4'
-libtoolize:   \`$_lt_pkgdatadir/libltdl/m4/ltsugar.m4'
+libtoolize:   \`$tst_aclocaldir/libtool.m4'
+libtoolize:   \`$tst_aclocaldir/ltoptions.m4'
+libtoolize:   \`$tst_aclocaldir/ltversion.m4'
+libtoolize:   \`$tst_aclocaldir/ltsugar.m4'
 EOF]
 
 LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout)

diff --git a/tests/old-m4-iface.at b/tests/old-m4-iface.at
index 1e4a7afe8c0806d18d04a8c5354d0f616c30f307..a60c8ffdb75d217e318d81e262f1f0eec19e1ef1 100644 (file)
--- a/tests/old-m4-iface.at
+++ b/tests/old-m4-iface.at
@@ -72,8 +72,8 @@ LT_AT_LIBTOOLIZE([--install])
 # This is slightly bogus, since only libtool.m4 was required in aclocal.m4
 # with libtool-1.5x...
 AT_CHECK([test -f aclocal.m4 ||
-  cat "$macrodir/libtool.m4" "$macrodir/ltoptions.m4" \
-      "$macrodir/ltsugar.m4" "$macrodir/ltversion.m4" > aclocal.m4])
+  cat "$tst_aclocaldir/libtool.m4" "$tst_aclocaldir/ltoptions.m4" \
+    "$tst_aclocaldir/ltsugar.m4" "$tst_aclocaldir/ltversion.m4" > aclocal.m4])
 
 LT_AT_BOOTSTRAP([ignore], [ignore], [ignore], [ignore], [--force])
 

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 21108f71d5cbaeb530bdf0309e0abca0aba7f5b3..3aa16c8df08ecba562975f69755a5d7d38a626df 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -25,7 +25,6 @@ m4_divert_push([PREPARE_TESTS])dnl
 : ${AUTOMAKE=automake}
 : ${AUTORECONF=autoreconf}
 export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF
-macrodir="$abs_top_srcdir/libltdl/m4"
 eval `$LIBTOOL --config | grep ^EGREP=`
 eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build|ECHO)='`
 configure_options=