automake: rework patch; only skip when the directories does not exist, this preserves...

SVN-Revision: 24427

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 1df30300d9cf999003d70900d2021366a1b5a15b..c049b835d2f846f766eb29419c4723af2b50a03a 100644 (file)
--- 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': $!";