Ver Fonte

avahi: enable glib / gtk support if available

Peter Korsgaard há 16 anos atrás
pai
commit
4801198ae7
1 ficheiros alterados com 12 adições e 3 exclusões
  1. 12 3
      package/avahi/avahi.mk

+ 12 - 3
package/avahi/avahi.mk

@@ -72,11 +72,8 @@ AVAHI_CONF_ENV = ac_cv_func_strtod=yes \
 		avahi_cv_sys_cxx_works=yes
 		avahi_cv_sys_cxx_works=yes
 
 
 AVAHI_CONF_OPT = --localstatedir=/var \
 AVAHI_CONF_OPT = --localstatedir=/var \
-		--disable-glib \
-		--disable-gobject \
 		--disable-qt3 \
 		--disable-qt3 \
 		--disable-qt4 \
 		--disable-qt4 \
-		--disable-gtk \
 		--disable-gdbm \
 		--disable-gdbm \
 		--disable-python-dbus \
 		--disable-python-dbus \
 		--disable-pygtk \
 		--disable-pygtk \
@@ -112,6 +109,18 @@ else
 AVAHI_CONF_OPT += --disable-dbus
 AVAHI_CONF_OPT += --disable-dbus
 endif
 endif
 
 
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+AVAHI_DEPENDENCIES += libglib2
+else
+AVAHI_CONF_OPT += --disable-glib --disable-gobject
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGTK2),y)
+AVAHI_DEPENDENCIES += libgtk2
+else
+AVAHI_CONF_OPT += --disable-gtk
+endif
+
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 AVAHI_CONF_ENV += am_cv_pathless_PYTHON=python \
 AVAHI_CONF_ENV += am_cv_pathless_PYTHON=python \
 		am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \
 		am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \