* automake.in (handle_ltlibraries): Also grep AM_LDFLAGS for `-module'.

* tests/stdlib2.test: New file.
* tests/Makefile.am (TESTS): Add stdlib2.test.
Report from Kevin P. Fleming.

diff --git a/ChangeLog b/ChangeLog
index bb24520b9c55ca64af395f6396969cb35261f13c..b869f08d752d7aa72643f2cc12ea75e49cbf0ed6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-06  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * automake.in (handle_ltlibraries): Also grep AM_LDFLAGS for `-module'.
+       * tests/stdlib2.test: New file.
+       * tests/Makefile.am (TESTS): Add stdlib2.test.
+       Report from Kevin P. Fleming.
+
 2003-10-03  Richard Dawe  <rich@phekda.freeserve.co.uk>  (tiny change)
 
        * tests/defs.in: For required=runtest, check that we are using

diff --git a/THANKS b/THANKS
index 98c2a91ef5bf6833d31c8da38daaaef13c7b617b..5a4d6ce4a82598b101a28c2f9362031be6d894aa 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -111,6 +111,7 @@ Juergen Keil                jk@tools.de
 Karl Berry             kb@cs.umb.edu
 Karl Heuer             kwzh@gnu.org
 Kevin Dalley           kevin@aimnet.com
+Kevin P. Fleming.      kpfleming@cox.net
 Kevin Ryde             user42@zip.com.au
 Kevin Street           street@iname.com
 Klaus Reichl           Klaus.Reichl@alcatel.at

diff --git a/automake.in b/automake.in
index 98e7ee51aaa40ae81a37189c5c9ee80ea2f16f05..84df19ac00a6ec40837de6a4cc6b9d0b5b517bfc 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2360,8 +2360,11 @@ sub handle_ltlibraries
 
       # Check that the library fits the standard naming convention.
       my $libname_rx = "^lib.*\.la";
-      my $ldvar = var ("${xlib}_LDFLAGS") || var ('LDFLAGS');
-      if ($ldvar && grep (/-module/, $ldvar->value_as_list_recursive ('all')))
+      my $ldvar = var ("${xlib}_LDFLAGS") || var ('AM_LDFLAGS');
+      my $ldvar2 = var ('LDFLAGS');
+      if (($ldvar && grep (/-module/, $ldvar->value_as_list_recursive ('all')))
+         || ($ldvar2
+             && grep (/-module/, $ldvar2->value_as_list_recursive ('all'))))
        {
          # Relax name checking for libtool modules.
          $libname_rx = "\.la";

diff --git a/doc/stamp-vti b/doc/stamp-vti
index e8c195b069006e1d85fa445133d5a5c0428ae906..0d7e10826bd5be892f61c72894789ed09e3b3b89 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 26 September 2003
+@set UPDATED 30 September 2003
 @set UPDATED-MONTH September 2003
 @set EDITION 1.7a
 @set VERSION 1.7a

diff --git a/doc/version.texi b/doc/version.texi
index e8c195b069006e1d85fa445133d5a5c0428ae906..0d7e10826bd5be892f61c72894789ed09e3b3b89 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 26 September 2003
+@set UPDATED 30 September 2003
 @set UPDATED-MONTH September 2003
 @set EDITION 1.7a
 @set VERSION 1.7a

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 68a136fdf54b01cbd33567da96d08a3c06e17927..aac2a6977ff7706e69ec80a9b8d12056df9987e8 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -409,6 +409,7 @@ spell3.test \
 spelling.test \
 stamph2.test \
 stdlib.test \
+stdlib2.test \
 strip.test \
 subdir.test \
 subdir2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6e5c2961b9278d353069ae375a703bf132007b1a..870d6f57be39b8c46fada23d1e08d00d3e5d449c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -519,6 +519,7 @@ spell3.test \
 spelling.test \
 stamph2.test \
 stdlib.test \
+stdlib2.test \
 strip.test \
 subdir.test \
 subdir2.test \

diff --git a/tests/stdlib2.test b/tests/stdlib2.test
new file mode 100755 (executable)
index 0000000..9fc83ec
--- /dev/null
+++ b/tests/stdlib2.test
@@ -0,0 +1,80 @@
+#! /bin/sh
+# Copyright (C) 2003  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with autoconf; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Check for AM_LDFLAGS = -module
+# Report from Kevin P. Fleming.
+required=libtool
+. ./defs || exit 1
+
+set -e
+
+: > README
+: > NEWS
+: > AUTHORS
+: > ChangeLog
+: > ltconfig
+: > ltmain.sh
+: > config.guess
+: > config.sub
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AC_PROG_LIBTOOL
+AC_OUTPUT
+END
+
+: > Makefile.inc
+
+cat > Makefile.am << 'END'
+include Makefile.inc
+lib_LTLIBRARIES = nonstandard.la
+nonstandard_la_SOURCES = foo.c
+FOO = -module
+END
+
+$ACLOCAL
+AUTOMAKE_fails --add-missing --gnu
+grep 'nonstandard.la.*not a standard libtool library name' stderr
+
+# We will use -Wno-gnu to disable the warning about setting LDFLAGS.
+# Make sure nonstandard names are diagnosed anyway.
+AUTOMAKE_fails --add-missing --gnu -Wno-gnu
+grep 'nonstandard.la.*not a standard libtool library name' stderr
+
+# Make sure nonstandard_la_LDFLAGS is read even if LDFLAGS is used.
+cat >Makefile.inc <<'EOF'
+LDFLAGS = -lfoo
+nonstandard_la_LDFLAGS = $(FOO)
+EOF
+$AUTOMAKE -Wno-gnu
+
+# Make sure LDFLAGS is read even if nonstandard_la_LDFLAGS is used.
+cat >Makefile.inc <<'EOF'
+LDFLAGS = $(FOO)
+nonstandard_la_LDFLAGS = -lfoo
+EOF
+$AUTOMAKE -Wno-gnu
+
+# Make sure AM_LDFLAGS is not read if foo_LDFLAGS is used.
+cat >Makefile.inc <<'EOF'
+nonstandard_la_LDFLAGS = -lfoo
+AM_LDFLAGS = -module
+EOF
+AUTOMAKE_fails