* automake.in (handle_ltlibraries): Allow _LDFLAGS to be

	conditionally defined.  Fixes PR automake/77 and ldflags.test.

diff --git a/ChangeLog b/ChangeLog
index 5ff7a2462bda89ebc7343bed1d3dda6bf160e10c..e397310f5d087484672fcc300b640955af1ce041 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-17  Tom Tromey  <tromey@redhat.com>
+
+       * automake.in (handle_ltlibraries): Allow _LDFLAGS to be
+       conditionally defined.  Fixes PR automake/77 and ldflags.test.
+
 2000-11-25  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (file_contents_with_transform): Added file name and

diff --git a/automake.in b/automake.in
index 8dc8172685ace89ef3551346bd21c1dbe063c414..07f53eacdfa884ffa1680c4bb4bb5fce9c9bce1e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2011,8 +2011,9 @@ sub handle_ltlibraries
 
        # Check that the library fits the standard naming convention.
        $libname_rx = "^lib.*\.la";
-       if (&variable_value ($xlib . '_LDFLAGS') =~ /-module/
-           || &variable_value ('LDFLAGS') =~ /-module/)
+       if (grep (/-module/, &variable_value_as_list ($xlib . '_LDFLAGS',
+                                                     'all'))
+           || grep (/-module/, &variable_value_as_list ('LDFLAGS', 'all')))
        {
                # Relax name checking for libtool modules.
                $libname_rx = "\.la";