From 90ac14b2a0c3d501b98cddc40305ccf424fea58d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 19 Mar 2009 11:41:05 +0000 Subject: avahi: gtk support needs libglade as well --- package/avahi/avahi.mk | 4 ++-- package/libgtk2/libgtk2.mk | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 856586a83..7c463b6dd 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -115,8 +115,8 @@ else AVAHI_CONF_OPT += --disable-glib --disable-gobject endif -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -AVAHI_DEPENDENCIES += libgtk2 +ifeq ($(BR2_PACKAGE_LIBGLADE),y) +AVAHI_DEPENDENCIES += libglade else AVAHI_CONF_OPT += --disable-gtk endif diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index b8a42ff43..7b772a3d0 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -152,7 +152,6 @@ $(STAMP_DIR)/host_libgtk2_configured: $(STAMP_DIR)/host_libgtk2_unpacked $(STAMP --disable-static \ --disable-glibtest \ --without-libtiff \ - --without-libpng \ --without-libjpeg \ --with-x \ --with-gdktarget=x11 \ -- cgit v1.2.3