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 6aa13db529caa2ae62b3fa00d9624b5cd965050f..efc8f953af49f4de2eb7306dbd498038f327ceb3 100644 (file)
--- 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 4efe32113b19d196a17cca33957b024293bd38e0..d4dc354ed2392594d746c2d48681cdb1cf78e1ba 100755 (executable)
--- 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))