Re: FYI: grep AM_LDFLAGS for -module

[Alexandre Duret-Lutz]

>>> "adl" == Alexandre Duret-Lutz <address@hidden> writes:

[...]

 adl> I'm installing this on HEAD and branch-1-7.  The two fixes are
 adl> different (HEAD had an additional bug: LDFLAGS would not be looked
 adl> at if foo_LDFLAGS existed), so I'm enclosing both patches.

Of course I forgot the main check in the test case, the one which
reveals the bug in the fix...

I'm installing this on branch-1-7, and the stdlib2.test bit on HEAD too.

2003-10-07  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (handle_ltlibraries): Fix definition of $ldflags.
        * tests/stdlib2.test: Check AM_LDFLAGS alone.
 
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1365.2.57
diff -u -r1.1365.2.57 automake.in
--- automake.in 6 Oct 2003 21:47:51 -0000       1.1365.2.57
+++ automake.in 6 Oct 2003 22:14:39 -0000
@@ -3464,17 +3464,16 @@
                                            '_SOURCES', '_OBJECTS',
                                            '_DEPENDENCIES');
 
+      my $ldflags = $xlib . '_LDFLAGS';
       if (! variable_defined ($xlib . '_LDFLAGS'))
        {
          # Define the lib_LDFLAGS variable.
          &define_variable ($xlib . '_LDFLAGS', '');
+         $ldflags = 'AM_LDFLAGS'
        }
 
       # Check that the library fits the standard naming convention.
       my $libname_rx = "^lib.*\.la";
-      my $ldflags = $xlib . '_LDFLAGS';
-      $ldflags = 'AM_LDFLAGS'
-       unless variable_defined ($ldflags);
       if ((variable_defined ($ldflags)
           && grep (/-module/,
                    &variable_value_as_list_recursive ($ldflags, 'all')))
Index: tests/stdlib2.test
===================================================================
RCS file: /cvs/automake/automake/tests/stdlib2.test,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 stdlib2.test
--- tests/stdlib2.test  6 Oct 2003 21:47:52 -0000       1.1.2.1
+++ tests/stdlib2.test  6 Oct 2003 22:14:39 -0000
@@ -80,4 +80,6 @@
 AM_LDFLAGS = -module
 EOF
 $AUTOMAKE && exit 1
-:
+
+echo 'AM_LDFLAGS = -module' > Makefile.inc
+$AUTOMAKE

-- 
Alexandre Duret-Lutz