diff --git a/tools/automake/patches/010-m4-cond-no-error.patch b/tools/automake/patches/010-m4-cond-no-error.patch
new file mode 100644
index 0000000000..787691146c
--- /dev/null
+++ b/tools/automake/patches/010-m4-cond-no-error.patch
@@ -0,0 +1,12 @@
+--- a/m4/cond.m4
++++ b/m4/cond.m4
+@@ -27,6 +27,8 @@ else
+ fi
+ AC_CONFIG_COMMANDS_PRE(
+ [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+-  AC_MSG_ERROR([[conditional "$1" was never defined.
++  [$1]_TRUE='#'
++  [$1]_FALSE='#'
++  AC_MSG_WARN([[conditional "$1" was never defined.
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])