From: Gary V. Vaughan <gary@gnu.org>
Date: Mon, 24 Oct 2011 07:49:30 +0000 (+0700)
Subject: tests: ensure VPATH autom4te search path can find autotests.
X-Git-Tag: v2.4.2.418~313
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=166da4d2a269b101bda8022f0a44f9c3e7ae56f9;p=thirdparty%2Flibtool.git

tests: ensure VPATH autom4te search path can find autotests.

* Makefile.am (tests/testsuite): Passing only $(srcdir) include path
to autom4te is unable to find tests/package.m4, and passing only
$(srcdir)/tests breaks VPATH build searches for TESTSUITE_AT files,
which are relative to $(srcdir)... so we pass both!
* NEWS: Updated.
Reported by Bob Friesenhahn.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/ChangeLog b/ChangeLog
index 8fc910eb1..bfd6fab96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-10-24  Gary V. Vaughan  <gary@gnu.org>
+
+	tests: ensure VPATH autom4te search path can find autotests.
+	* Makefile.am (tests/testsuite): Passing only $(srcdir) include path
+	to autom4te is unable to find tests/package.m4, and passing only
+	$(srcdir)/tests breaks VPATH build searches for TESTSUITE_AT files,
+	which are relative to $(srcdir)... so we pass both!
+	* NEWS: Updated.
+	Reported by Bob Friesenhahn.
+
 2011-10-24  Karl Berry  <karl@gnu.org>
 
 	doc: modernize libtool.texi.
diff --git a/Makefile.am b/Makefile.am
index 09b61fa89..3df475163 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -619,7 +619,7 @@ INSTALLCHECK_ENVIRONMENT = \
 	tst_aclocaldir="$(aclocaldir)"
 
 $(testsuite): $(package_m4) $(TESTSUITE_AT) Makefile.am
-	$(AUTOTEST) -I '$(srcdir)/tests' $(TESTSUITE_AT) -o '$@'
+	$(AUTOTEST) -I '$(srcdir)' -I '$(srcdir)/tests' $(TESTSUITE_AT) -o '$@'
 
 $(package_m4): $(configure_ac) Makefile.am
 	{ \
diff --git a/NEWS b/NEWS
index c5533c537..18772c843 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,8 @@ New in 2.4.4 201?-??-??: git version 2.4.3a, Libtool team:
 
 * Bug fixes:
 
-  - Waiting for bug reports...
+  - Fix a long-standing latent bug in autom4te include path for autotests
+    with VPATH builds.
 
 New in 2.4.2 2011-10-17: git version 2.4.1a, Libtool team: