Changeset 24432


Ignore:
Timestamp:
2010-12-10T17:22:16+01:00 (7 years ago)
Author:
jow
Message:

[backfire] merge r24424 and r24427

Location:
branches/backfire/tools/automake/patches
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/backfire/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch

    r24424 r24432  
    11--- a/aclocal.in 
    22+++ b/aclocal.in 
    3 @@ -311,7 +311,8 @@ sub scan_m4_dirs ($@) 
     3@@ -295,6 +295,12 @@ sub scan_m4_dirs ($@) 
     4  
     5   foreach my $m4dir (@dirlist) 
    46     { 
     7+      if (! -d $m4dir) 
     8+      { 
     9+        msg ('override', "warning: skipping not existing directory `$m4dir'"); 
     10+        next; 
     11+      } 
     12+ 
    513       if (! opendir (DIR, $m4dir)) 
    614        { 
    7 -         fatal "couldn't open directory `$m4dir': $!"; 
    8 +         msg ('override', "warning: skipping not existing directory `$m4dir'"); 
    9 +         next; 
    10         } 
    11   
    12        # We reverse the directory contents so that foo2.m4 gets 
     15          fatal "couldn't open directory `$m4dir': $!"; 
Note: See TracChangeset for help on using the changeset viewer.