From: Tom Tromey <tromey@redhat.com>
Date: Tue, 17 Jul 2001 03:38:32 +0000 (+0000)
Subject: 2001-07-16  Alexandre Duret-Lutz  <duret_g@epita.fr>
X-Git-Tag: Release-1-4j~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e3608a582f0ca34dbc13ecc06a22887fa61b6a6;p=thirdparty%2Fautomake.git

2001-07-16  Alexandre Duret-Lutz  <duret_g@epita.fr>

	* automake.in (handle_libraries): Allow libraries to lie in
	a subdirectory by constraining only the basename to start
	with 'lib', not the whole path.
---

diff --git a/ChangeLog b/ChangeLog
index a7429c540..d09b5aa4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-16  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* automake.in (handle_libraries): Allow libraries to lie in
+	a subdirectory by constraining only the basename to start
+	with 'lib', not the whole path.
+
 2001-07-16  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
 	* tests/subobj8.test: New file.
diff --git a/automake.in b/automake.in
index 471a2350e..83165accc 100755
--- a/automake.in
+++ b/automake.in
@@ -2539,7 +2539,7 @@ sub handle_libraries
     foreach my $onelib (@liblist)
     {
 	# Check that the library fits the standard naming convention.
-	if ($onelib !~ /^lib.*\.a$/)
+	if ($onelib !~ m%^(?:.*/)?lib[^/]*\.a$%)
 	{
 	    # FIXME should put line number here.  That means mapping
 	    # from library name back to variable name.
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 003be1260..a9f783adc 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -66,7 +66,7 @@ _am_include = @_am_include@
 _am_quote = @_am_quote@
 install_sh = @install_sh@
 
-XFAIL_TESTS = subdir5.test
+XFAIL_TESTS = subdir5.test subobj8.test
 
 TESTS = \
 acinclude.test \
@@ -330,6 +330,7 @@ subobj4.test \
 subobj5.test \
 subobj6.test \
 subobj7.test \
+subobj8.test \
 subst.test \
 suffix.test \
 suffix2.test \