* lib/Automake/XFile.pm (lock): Make sure $ENV{'MAKEFLAGS'} exists

before inspecting it; this fixes "uninitialized value in
concatenation" diagnostics when flock fails.
Report from Gary V. Vaughan.

diff --git a/ChangeLog b/ChangeLog
index 09419408c65cf53c4cecfe045737bfcf400a94c7..92350ef7233d5193b5ef3be8a970f30b66c0d728 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-01  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * lib/Automake/XFile.pm (lock): Make sure $ENV{'MAKEFLAGS'} exists
+       before inspecting it; this fixes "uninitialized value in
+       concatenation" diagnostics when flock fails.
+       Report from Gary V. Vaughan.
+
        * aclocal.in: Use strict and -w.  Declare local variables with `my',
        and get rid of `local'.
        (scan_m4_files, add_macro): Reindent these functions while we are

diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index 279317b7c7ad50c079ac96f2843b07c748834d6f..dc39ffeb586bc6ab9589bd5a208db155ebf0d3ed 100644 (file)
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004 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
@@ -228,10 +228,12 @@ sub lock
   # Admittedly this is a bit of a hack.
   if (!flock ($fh, $mode)
       && (!$!{ENOLCK}
-         || " -$ENV{'MAKEFLAGS'}" =~ / (-[BdeikrRsSw]*j|---?jobs)/))
+         || (exists $ENV{'MAKEFLAGS'}
+             && " -$ENV{'MAKEFLAGS'}" =~ / (-[BdeikrRsSw]*j|---?jobs)/)))
     {
       my $file = $fh->name;
-      fatal "cannot lock $file with mode $mode (perhaps you are running make -j on a lame NFS client?): $!";
+      fatal ("cannot lock $file with mode $mode "
+            . "(perhaps you are running make -j on a lame NFS client?): $!");
     }
 }