summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-10 16:01:33 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-10 16:01:33 +0000
commitd7949ae19aa74a505d4d69d85ad18fedcd121019 (patch)
tree5383ee980e3c5c00faaac04f7b7a0295cb8aa32d
parent0de20c79711e2ec0aca7cda29d928f68a63c138f (diff)
[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
-rw-r--r--tools/automake/patches/100-aclocal-skip-not-existing-directories.patch12
1 files changed, 12 insertions, 0 deletions
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 000000000..1df30300d
--- /dev/null
+++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
@@ -0,0 +1,12 @@
+--- a/aclocal.in
++++ b/aclocal.in
+@@ -311,7 +311,8 @@ sub scan_m4_dirs ($@)
+ {
+ 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