From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 10 Dec 2010 16:10:07 +0000 (+0000)
Subject: [tools] automake: rework patch; only skip when the directories does not exist, this... 
X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/ecde55c971e3c25bd15fcdca643c3e1b451c3bd6

[tools] automake: rework patch; only skip when the directories does not exist, this preserves error cases like missing access permissions


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24427 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
index 1df30300d..c049b835d 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 ($@)
+@@ -309,6 +309,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': $!";