X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2Fautomake%2Fpatches%2F100-aclocal-skip-not-existing-directories.patch;h=cc1f49d519e08b1a3949d7f9a565f1f62a6b90e6;hb=b8a61e62d5ccebcdcafaffc0661e45797b42f820;hp=1df30300d9cf999003d70900d2021366a1b5a15b;hpb=d7949ae19aa74a505d4d69d85ad18fedcd121019;p=openwrt-working-2016%2F.git

diff --git a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
index 1df30300d9..cc1f49d519 100644
--- a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
+++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
@@ -1,12 +1,15 @@
 --- a/aclocal.in
 +++ b/aclocal.in
-@@ -311,7 +311,8 @@ sub scan_m4_dirs ($@)
+@@ -310,6 +310,12 @@ sub scan_m4_dirs ($@)
+ 
+   foreach my $m4dir (@dirlist)
      {
++      if (! -d $m4dir)
++      {
++        msg ('override', "warning: skipping not existing directory `$m4dir'");
++        next;
++      }
++
        if (! opendir (DIR, $m4dir))
  	{
--	  fatal "couldn't open directory `$m4dir': $!";
-+	  msg ('override', "warning: skipping not existing directory `$m4dir'");
-+	  next;
- 	}
- 
-       # We reverse the directory contents so that foo2.m4 gets
+ 	  fatal "couldn't open directory `$m4dir': $!";