From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 10 Dec 2010 16:22:16 +0000 (+0000)
Subject: [backfire] merge r24424 and r24427
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=dd5c94d83dc9a194999cc25d846c9ff1770c00c2

[backfire] merge r24424 and r24427


SVN-Revision: 24432
---

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
index 0000000000..e5f2d004bb
--- /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': $!";