X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2Fautomake%2Fpatches%2F100-aclocal-skip-not-existing-directories.patch;h=caaad084a4996a4ad8afca3411381382f6ff8e2c;hb=43365ca6625363fbe3006ce47300f48434e2d36c;hp=1df30300d9cf999003d70900d2021366a1b5a15b;hpb=94c3f4ab4d6d9ac9f2647997d4e2759c13131c02;p=openwrt%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..caaad084a4 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 ($@)
+--- a/bin/aclocal.in
++++ b/bin/aclocal.in
+@@ -354,6 +354,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
+ 	  # TODO: maybe avoid complaining only if errno == ENONENT?