[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist]

 configure.ac |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit b9230ca3af2e7226d14d7b3d68fa2800a01b8b05
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Dec 8 16:16:42 2016 +0200

    If dbus and avahi enablings are fuzzed differently, make them the same
    
    Change-Id: I4acd0e3fac55a0969bfa99e5a2621f3f77aba74d

diff --git a/configure.ac b/configure.ac
index bcc29ef..4295ee1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2369,6 +2369,17 @@ AC_ARG_WITH(system-icu-for-build,
 
 
 dnl ===================================================================
+dnl Check for incompatible options set by fuzzing, and reset those
+dnl automatically to working combinations
+dnl ===================================================================
+
+if test "$libo_fuzzed_enable_dbus" = yes -a "$libo_fuzzed_enable_avahi" -a \
+        "$enable_dbus" != "$enable_avahi"; then
+    AC_MSG_NOTICE([Resetting --enable-avahi=$enable_dbus])
+    enable_avahi=$enable_dbus
+fi
+
+dnl ===================================================================
 dnl check for required programs (grep, awk, sed, bash)
 dnl ===================================================================