FYI: perl 5.6.0 nits

[Alexandre Duret-Lutz]

I'm checking this in.

2003-12-08  Alexandre Duret-Lutz  <address@hidden>

        * lib/Automake/Variable.pm (hook): Use $$ as prototype, not $\&.
        Perl 5.6.0 will not accept a reference sub reference for the
        latter.
        * automake.in (var_SUFFIXES_trigger): Adjust registration via
        Automake::Variabke::hook.
        (handle_texinfo_helper): Make sure `inner_expand => 1' appears
        on one line, so that Perl 5.6.0 does not complain about
        inner_expand being a bare identifier.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1525
diff -u -r1.1525 automake.in
--- automake.in 4 Dec 2003 18:17:19 -0000       1.1525
+++ automake.in 8 Dec 2003 17:57:34 -0000
@@ -560,7 +560,7 @@
     my ($type, $value) = @_;
     accept_extensions (split (' ', $value));
 }
-Automake::Variable::hook ('SUFFIXES', &var_SUFFIXES_trigger);
+Automake::Variable::hook ('SUFFIXES', \&var_SUFFIXES_trigger);
 
 ################################################################
 
@@ -2720,8 +2720,8 @@
   @f = map { s|[^A-Za-z_0-9*\[\]\-]|\\$&|g; s|\*|[^/]*|g; $_; } @f;
   my $user_cleaned_files = '^(?:' . join ('|', @f) . ')$';
 
-  foreach my $texi ($info_texinfos->value_as_list_recursive (inner_expand
-                                                            => 1))
+  foreach my $texi
+      ($info_texinfos->value_as_list_recursive (inner_expand => 1))
     {
       my $infobase = $texi;
       $infobase =~ s/\.(txi|texinfo|texi)$//;
@@ -3505,8 +3505,8 @@
            }
          # In the top-level Makefile we do not use $(top_builddir), because
          # we are already there, and since the targets are built without
-         # a $(top_builddir), it helps BSD Make to match them with 
-          # dependencies.
+         # a $(top_builddir), it helps BSD Make to match them with
+         # dependencies.
          elsif ($relative_dir ne '.')
            {
              $i = '$(top_builddir)/' . $i;
Index: lib/Automake/Variable.pm
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Variable.pm,v
retrieving revision 1.26
diff -u -r1.26 Variable.pm
--- lib/Automake/Variable.pm    29 Nov 2003 23:47:02 -0000      1.26
+++ lib/Automake/Variable.pm    8 Dec 2003 17:57:37 -0000
@@ -286,7 +286,7 @@
 =cut
 
 use vars '%_hooks';
-sub hook ($\&)
+sub hook ($$)
 {
   my ($var, $fun) = @_;
   $_hooks{$var} = $fun;

-- 
Alexandre Duret-Lutz