summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/avahi/avahi.mk25
1 files changed, 12 insertions, 13 deletions
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 9c6b609d24..5d6e6a811f 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -68,9 +68,21 @@ AVAHI_CONF_ENV = \
avahi_cv_sys_cxx_works=yes \
DATADIRNAME=share
+# Note: even if we have Gtk2 and Gtk3 support in Buildroot, we
+# explicitly disable support for them, in order to avoid the following
+# circular dependencies:
+#
+# avahi -> libglade -> libgtk2 -> cups -> avahi
+# avahi -> libgtk3 -> cups -> avahi
+#
+# Since Gtk2 and Gtk3 in Avahi are only used for some example/demo
+# programs, we decided to disable their support to solve the circular
+# dependency.
AVAHI_CONF_OPTS = \
--disable-qt3 \
--disable-qt4 \
+ --disable-gtk \
+ --disable-gtk3 \
--disable-gdbm \
--disable-pygtk \
--disable-mono \
@@ -126,19 +138,6 @@ else
AVAHI_CONF_OPTS += --disable-glib --disable-gobject
endif
-ifeq ($(BR2_PACKAGE_LIBGLADE),y)
-AVAHI_DEPENDENCIES += libglade
-else
-AVAHI_CONF_OPTS += --disable-gtk
-endif
-
-ifeq ($(BR2_PACKAGE_LIBGTK3),y)
-AVAHI_DEPENDENCIES += libgtk3
-AVAHI_CONF_OPTS += --enable-gtk3
-else
-AVAHI_CONF_OPTS += --disable-gtk3
-endif
-
ifeq ($(BR2_PACKAGE_PYTHON),y)
AVAHI_CONF_ENV += \
am_cv_pathless_PYTHON=python \
OpenPOWER on IntegriCloud