[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: set macrodir correctly for installcheck [301]
From: |
Gary V. Vaughan |
Subject: |
FYI: set macrodir correctly for installcheck [301] |
Date: |
Thu, 10 Nov 2005 17:52:45 +0000 (GMT) |
User-agent: |
mailnotify/0.7 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to HEAD.
Had to tweak slightly to make test-5 work with installcheck.
* looking for address@hidden/libtool--devo--1.0--patch-372 to compare with
* comparing to address@hidden/libtool--devo--1.0--patch-372
M Makefile.am
M libtoolize.m4sh
M tests/old-m4-iface.at
M tests/libtoolize.at
M ChangeLog
M tests/testsuite.at
* modified files
Index: Changelog
from Gary V. Vaughan <address@hidden>
* 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 <address@hidden>
--- orig/Makefile.am
+++ mod/Makefile.am
@@ -389,11 +389,13 @@
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)
--- orig/libtoolize.m4sh
+++ mod/libtoolize.m4sh
@@ -1030,6 +1030,7 @@
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
--- orig/tests/libtoolize.at
+++ mod/tests/libtoolize.at
@@ -369,10 +369,10 @@
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)
--- orig/tests/old-m4-iface.at
+++ mod/tests/old-m4-iface.at
@@ -72,8 +72,8 @@
# 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])
--- orig/tests/testsuite.at
+++ mod/tests/testsuite.at
@@ -25,7 +25,6 @@
: ${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=
- --
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 1.0
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)
iD8DBQFDc4jrFRMICSmD1gYRAvdAAKCc2F9KpXZBFRy4aiA1NyRJh0RaogCfYR3I
oMWUs3UHL4yQK5yLUvYXemI=
=qKzr
-----END PGP SIGNATURE-----
- FYI: set macrodir correctly for installcheck [301],
Gary V. Vaughan <=