From: Tom Tromey <tromey@redhat.com>
Date: Wed, 6 Jan 1999 13:11:37 +0000 (+0000)
Subject: 1998-12-24  Thomas Tanner  <tanner@gmx.de>
X-Git-Tag: Release-1-4~44
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=45b99f5da4186c7d758798d6931dbe0c5fa5ac08;p=automake.git

1998-12-24  Thomas Tanner  <tanner@gmx.de>
	* automake.in (handle_ltlibraries): check whether -module was
	defined for libraries names without 'lib' prefix.
---

diff --git a/ChangeLog b/ChangeLog
index 6aa13db5..efc8f953 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-24  Thomas Tanner  <tanner@gmx.de>
+
+	* automake.in (handle_ltlibraries): check whether -module was
+	defined for libraries names without 'lib' prefix.
+
 Fri Dec 11 10:20:42 1998  Matthew D. Langston  <langston@SLAC.Stanford.EDU>
 
 	* compile_f_c_cxx.test: Change to use F77 and F77LINK instead of
diff --git a/automake.in b/automake.in
index 4efe3211..d4dc354e 100755
--- a/automake.in
+++ b/automake.in
@@ -6,7 +6,7 @@ eval 'exec @PERL@ -S $0 ${1+"$@"}'
     if 0;
 
 # automake - create Makefile.in from Makefile.am
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1660,15 +1660,6 @@ sub handle_ltlibraries
     local ($seen_libobjs) = 0;
     foreach $onelib (@liblist)
     {
-	# Check that the library fits the standard naming convention.
-	if ($onelib !~ /.*\.la$/)
-	{
-	    # FIXME this should only be a warning for foreign packages
-	    # FIXME should put line number here.  That means mapping
-	    # from library name back to variable name.
-	    &am_error ("\`$onelib' is not a standard libtool library name");
-	}
-
 	local ($obj) = &get_object_extension ($onelib);
 
 	# Canonicalize names and check for misspellings.
@@ -1682,6 +1673,21 @@ sub handle_ltlibraries
 	    &define_variable ($xlib . '_LDFLAGS', '');
 	}
 
+	# Check that the library fits the standard naming convention.
+    	$libname_rx = "^lib.*\.la";
+	if (&variable_value ($xlib . '_LDFLAGS') =~ /-module/) 
+	{
+		# Relax name checking for libtool modules.
+	    	$libname_rx = "\.la";
+	}
+	if ($onelib !~ /$libname_rx$/)
+	{
+	    # FIXME this should only be a warning for foreign packages
+	    # FIXME should put line number here.  That means mapping
+	    # from library name back to variable name.
+	    &am_error ("\`$onelib' is not a standard libtool library name");
+	}
+
 	if (&variable_defined ($xlib . '_LIBADD'))
 	{
 	    if (&handle_lib_objects ($xlib, $xlib . '_LIBADD', 0))