Ver código fonte

avahi: fix build with libintl but without locale support in toolchain

Peter Korsgaard 16 anos atrás
pai
commit
bc9512c09d
1 arquivos alterados com 3 adições e 2 exclusões
  1. 3 2
      package/avahi/avahi.mk

+ 3 - 2
package/avahi/avahi.mk

@@ -92,7 +92,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
 		--with-autoipd-user=default \
 		--with-autoipd-user=default \
 		--with-autoipd-group=default
 		--with-autoipd-group=default
 
 
-AVAHI_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),gettext libintl)
+AVAHI_DEPENDENCIES = $(if $(BR2_PACKAGE_GETTEXT),gettext)
 
 
 ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
 ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
 AVAHI_DEPENDENCIES += libdaemon
 AVAHI_DEPENDENCIES += libdaemon
@@ -113,7 +113,8 @@ else
 AVAHI_CONF_OPT += --disable-dbus
 AVAHI_CONF_OPT += --disable-dbus
 endif
 endif
 
 
-ifeq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_PACKAGE_LIBINTL),y)
+AVAHI_DEPENDENCIES += libintl
 AVAHI_MAKE_OPT = LIBS=-lintl
 AVAHI_MAKE_OPT = LIBS=-lintl
 endif
 endif