wifipineapple-openwrt/tools/automake/patches/100-aclocal-skip-not-existi...

--- a/aclocal.in
+++ b/aclocal.in
@@ -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': $!";
[tools] automake: skip over not existing m4 macro directories, don't fail git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24424 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-12-10 16:01:33 +00:00			`--- a/aclocal.in`
			`+++ b/aclocal.in`
[tools] automake: further relocation fixes git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29828 3c298f89-4303-0410-b956-a3cf2f4a3e73 2012-01-20 15:19:22 +00:00			`@@ -310,6 +310,12 @@ sub scan_m4_dirs ($@)`
[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 2010-12-10 16:10:07 +00:00
			`foreach my $m4dir (@dirlist)`
[tools] automake: skip over not existing m4 macro directories, don't fail git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24424 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-12-10 16:01:33 +00:00			`{`
[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 2010-12-10 16:10:07 +00:00			`+ if (! -d $m4dir)`
			`+ {`
			+ msg ('override', "warning: skipping not existing directory `$m4dir'");
			`+ next;`
			`+ }`
			`+`
[tools] automake: skip over not existing m4 macro directories, don't fail git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24424 3c298f89-4303-0410-b956-a3cf2f4a3e73 2010-12-10 16:01:33 +00:00			`if (! opendir (DIR, $m4dir))`
			`{`
[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 2010-12-10 16:10:07 +00:00			fatal "couldn't open directory `$m4dir': $!";