Patchwork [06/10] avahi: remove double dependency on gettext

login
register
mail settings
Submitter Arnout Vandecappelle
Date Oct. 14, 2012, 9:10 p.m.
Message ID <20121014211032.17845.70959.stgit@localhost>
Download mbox | patch
Permalink /patch/191429/
State Superseded
Headers show

Comments

Arnout Vandecappelle - Oct. 14, 2012, 9:10 p.m.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/avahi/avahi.mk |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Yann E. MORIN - Oct. 14, 2012, 9:27 p.m.
Atnout, All,

On Sunday 14 October 2012 Arnout Vandecappelle (Essensium/Mind) wrote:
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

> ---
>  package/avahi/avahi.mk |    5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
> index 03dc368..6a6f524 100644
> --- a/package/avahi/avahi.mk
> +++ b/package/avahi/avahi.mk
> @@ -133,10 +133,7 @@ else
>  AVAHI_CONF_OPT += --disable-python
>  endif
>  
> -ifeq ($(BR2_PACKAGE_GETTEXT),y)
> -AVAHI_DEPENDENCIES += gettext
> -AVAHI_MAKE_OPT = LIBS=-lintl
> -endif
> +AVAHI_MAKE_OPT += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
>  
>  define AVAHI_REMOVE_INITSCRIPT
>  	rm -rf $(TARGET_DIR)/etc/init.d/avahi-*
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
> 
>

Patch

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 03dc368..6a6f524 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -133,10 +133,7 @@  else
 AVAHI_CONF_OPT += --disable-python
 endif
 
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-AVAHI_DEPENDENCIES += gettext
-AVAHI_MAKE_OPT = LIBS=-lintl
-endif
+AVAHI_MAKE_OPT += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
 
 define AVAHI_REMOVE_INITSCRIPT
 	rm -rf $(TARGET_DIR)/etc/init.d/avahi-*