Commit c89b7259 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch '2010-05-15-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents 319a4751 52e600eb

package/avahi/Config.in

+2 −2
Original line number Diff line number Diff line 
config BR2_PACKAGE_AVAHI

	bool "avahi"

	select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE

	select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE

	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT

	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT

	help

	  Avahi is a system which facilitates service

	  discovery on a local network.

package/avahi/avahi.mk

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \ 
		--with-autoipd-user=default \

		--with-autoipd-group=default



AVAHI_DEPENDENCIES = $(if $(BR2_PACKAGE_GETTEXT),gettext) host-intltool

AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl) host-intltool



ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)

AVAHI_DEPENDENCIES += libdaemon

package/cairo/cairo.mk

+0 −3
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ else 
	CAIRO_CONF_OPT += --disable-svg

endif



HOST_CAIRO_DEPENDENCIES = host-pkg-config host-pixman host-fontconfig



HOST_CAIRO_CONF_OPT = \

		--enable-ps \

		--enable-pdf \
@@ -90,4 +88,3 @@ HOST_CAIRO_CONF_OPT = \ 
		--disable-svg



$(eval $(call AUTOTARGETS,package,cairo))
 
$(eval $(call AUTOTARGETS,package,cairo,host))

package/gettext/Config.in

+2 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_GETTEXT

	bool "gettext"

	depends on BR2_NEEDS_GETTEXT

	help

	  The GNU `gettext' utilities are a set of tools that provide a

	  framework to help other GNU packages produce multi-lingual
@@ -21,6 +22,7 @@ config BR2_PACKAGE_GETTEXT_STATIC 


config BR2_PACKAGE_LIBINTL

	bool "libintl"

	depends on BR2_NEEDS_GETTEXT

	help

	  Selecting this package installs all of gettext in the staging

	  directory and the shared library for it's use in the target.

package/gmpc/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ config BR2_PACKAGE_GMPC 
	bool "gmpc"

	depends on BR2_PACKAGE_LIBGTK2

	select BR2_PACKAGE_LIBGLIB2

	select BR2_PACKAGE_GETTEXT

	select BR2_PACKAGE_LIBINTL

	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT

	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT

	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE

	select BR2_PACKAGE_LIBMPD

	select BR2_PACKAGE_LIBCURL