[backfire] merge r24424 and r24427

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24432 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
new file mode 100644 (file)
index 0000000..e5f2d00
--- /dev/null
+++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
@@ -0,0 +1,15 @@
+--- a/aclocal.in
++++ b/aclocal.in
+@@ -295,6 +295,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': $!";