Update packages to BR2_NEEDS_GETTEXT_IF_LOCALE

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index 338600515e90984550a708eb99d2a31578ea138a..eb3ccb67b05df6d12dc717dc002465619a533ac5 100644 (file)
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_AVAHI
        bool "avahi"
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Avahi is a system which facilitates service
          discovery on a local network.

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index ca55e27861e73db367c9a4c42622f286ea600737..66e2e63259c048737076b1bcbe45c49c8c34cf14 100644 (file)
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -82,7 +82,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
                --with-autoipd-user=default \
                --with-autoipd-group=default
 
-AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl) host-intltool
+AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-intltool
 
 ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
 AVAHI_DEPENDENCIES += libdaemon

diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index 056f5a0779252f0484060e9118fd84efb0d47955..979df48b860b77f887f9bda00066df4f245edb54 100644 (file)
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_GMPC
        bool "gmpc"
        depends on BR2_PACKAGE_LIBGTK2
        select BR2_PACKAGE_LIBGLIB2
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_LIBMPD
        select BR2_PACKAGE_LIBCURL

diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index aa74a2e2f2b3313cc711f7787ca75e8873bba3a8..6016e7cfc05b88ce5e71201f8f98e457d0302c92 100644 (file)
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -12,7 +12,7 @@ GMPC_CONF_ENV = ac_cv_lib_curl_curl_global_init=yes \
 GMPC_CONF_OPT = --disable-mmkeys
 
 GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd host-gob2 host-intltool \
-       $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
+       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y)
 GMPC_DEPENENCIES += xlib_libSM

diff --git a/package/grep/Config.in b/package/grep/Config.in
index f898fdf4abe74b727c43ee858ed94737d4ae3ac5..430616b18359a28f133b846e853417dadac97c82 100644 (file)
--- a/package/grep/Config.in
+++ b/package/grep/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_GREP
        bool "grep"
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          The GNU regular expression matcher.
 

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 93c6cafddde19b94bdf34d14178977164713ec65..5b945d5f2c222b73f289b573b6197e3f2c9f92e0 100644 (file)
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -8,6 +8,6 @@ GREP_SOURCE:=grep-$(GREP_VERSION).tar.bz2
 GREP_SITE:=$(BR2_GNU_MIRROR)/grep
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
 
-GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
+GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
 $(eval $(call AUTOTARGETS,package,grep))

diff --git a/package/hal/Config.in b/package/hal/Config.in
index 9518f1355f877e7aa6886f7f33ef8d33820f6a2c..0420568fad23345621575db3299eeb46decf908f 100644 (file)
--- a/package/hal/Config.in
+++ b/package/hal/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_HAL
        bool "hal"
        select BR2_PACKAGE_EXPAT
        select BR2_PACKAGE_LIBGLIB2
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_DBUS_EXPAT

diff --git a/package/hal/hal.mk b/package/hal/hal.mk
index 62eca704a446113b8ff626009114f80b725fc609..801fe92755c150680253ea8e36b0bf1207cd3ce2 100644 (file)
--- a/package/hal/hal.mk
+++ b/package/hal/hal.mk
@@ -79,7 +79,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
                rm -f $(TARGET_DIR)/usr/libexec/$$file; \
        done
 
-hal: host-pkg-config host-libxml-parser-perl dbus-glib hwdata udev $(if $(BR2_NEEDS_GETTEXT),gettext libintl) $(TARGET_DIR)/$(HAL_TARGET_BINARY)
+hal: host-pkg-config host-libxml-parser-perl dbus-glib hwdata udev $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) $(TARGET_DIR)/$(HAL_TARGET_BINARY)
 
 hal-clean:
        rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf

diff --git a/package/libidn/Config.in b/package/libidn/Config.in
index 793fbc3d248e2b3eb3470490716b35b3bc88cc74..04f89007285d6a349b35e992743db09de33fc9cb 100644 (file)
--- a/package/libidn/Config.in
+++ b/package/libidn/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBIDN
        bool "libidn"
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Libidn's purpose is to encode and decode internationalized 
          domain names. 

diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index bc8e001403a67b920834b239308da953421d4ffe..4b3bea3a56a4253dfb67cfdf26d1193fbcace2b8 100644 (file)
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -10,7 +10,7 @@ LIBIDN_INSTALL_STAGING = YES
 LIBIDN_INSTALL_TARGET = YES
 LIBIDN_CONF_OPT = --enable-shared --disable-java --enable-csharp=no
 LIBIDN_LIBTOOL_PATCH = NO
-LIBIDN_DEPENDENCIES = host-pkg-config $(if $(BR2_NEEDS_GETTEXT),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+LIBIDN_DEPENDENCIES = host-pkg-config $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 $(eval $(call AUTOTARGETS,package,libidn))
 

diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 6bccd1116144ebaf02fdd8e3fcb3107eb84bc05b..b3d4b5f9cccdc0f8a970c6cb35eab99f39ee0eab 100644 (file)
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBSOUP
        bool "libsoup"
        select BR2_PACKAGE_LIBXML2
        select BR2_PACKAGE_LIBGLIB2
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          libsoup is an HTTP client/server library. It uses GObject
          and the GLib main loop, to integrate well with GNOME

diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 45f62e8e4846825ceaea8c615da983f8f6963715..9757698be11e0c415bb49b0f9cce5214208d6265 100644 (file)
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -26,6 +26,6 @@ LIBSOUP_CONF_OPT = \
        --without-gnome         \
        --disable-gtk-doc
 
-LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2
+LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2
 
 $(eval $(call AUTOTARGETS,package,libsoup))

diff --git a/package/make/Config.in b/package/make/Config.in
index 674e245e9a41a4a54b9487ad54664309357edf21..364bb1e18af45c2c5c79f924874e7eddd8fcd286 100644 (file)
--- a/package/make/Config.in
+++ b/package/make/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MAKE
        bool "make"
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          A tool which controls the generation of executables and other
          non-source files of a program from the program's source files.

diff --git a/package/make/make.mk b/package/make/make.mk
index 5dd06379f1ca2c797c85860a6818dfe9a879e161..0b2657d3f47be57494408889cc996b4851f03c2e 100644 (file)
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -56,7 +56,7 @@ $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY): $(GNUMAKE_DIR)/$(GNUMAKE_BINARY)
        rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
                $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
-make: $(if $(BR2_NEEDS_GETTEXT),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
+make: $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
 
 make-clean:
        $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) uninstall

diff --git a/package/pango/Config.in b/package/pango/Config.in
index bf2fc6e7090305c41ea49b011853076e0ce3c0e3..2c02219dc6eb89687e1578559f8da194b29105bb 100644 (file)
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -3,6 +3,8 @@ config BR2_PACKAGE_PANGO
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_EXPAT
        select BR2_PACKAGE_CAIRO
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Pango is a library for laying out and rendering of text, with an
          emphasis on internationalization. Pango can be used anywhere that

diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index c640045843335274557e6f2b2987b9e8c05e42cc..ad38246613b6fd6763760b4553296796be3ab434 100644 (file)
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -40,7 +40,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 PANGO_CONF_OPT = --enable-shared --enable-static \
                --enable-explicit-deps=no --disable-debug
 
-PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl) host-pkg-config libglib2 cairo
+PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 cairo
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
         PANGO_CONF_OPT += --with-x \

diff --git a/package/psmisc/Config.in b/package/psmisc/Config.in
index 31e982c6456eebeccb80ce9fd2b9d13a2b6a2245..a13820426cf91cd5b1a548ba82124b2f78a9eb5a 100644 (file)
--- a/package/psmisc/Config.in
+++ b/package/psmisc/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_PSMISC
        bool "psmisc"
        select BR2_PACKAGE_NCURSES
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Helpful /proc related utilities such as pstree, fuser, and killall
 

diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index b82883fa9b53438e53f5e7a81fbfb35854d057b5..e4301da984ee91bf211ac2a2d8337a5b423b7249 100644 (file)
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -7,6 +7,6 @@ PSMISC_VERSION:=22.8
 PSMISC_SOURCE:=psmisc-$(PSMISC_VERSION).tar.gz
 PSMISC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc
 PSMISC_AUTORECONF:=NO
-PSMISC_DEPENDENCIES:=ncurses $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
+PSMISC_DEPENDENCIES:=ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
 $(eval $(call AUTOTARGETS,package,psmisc))

diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index fc820a30664ed87f29b7946d691f44c82cc650df..8d7a2a23e1f56aaa5c85fa96fd5121ced2539362 100644 (file)
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_SSHFS
        bool "sshfs (FUSE)"
        select BR2_PACKAGE_LIBFUSE
        select BR2_PACKAGE_LIBGLIB2
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        depends on BR2_PACKAGE_OPENSSH
        depends on BR2_LARGEFILE

diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index d15aa00c26dd10bc0f9c9ebdbfbd314f9d0a45cf..09f1e93ba75498656964070caf8cb6695e2c36e3 100644 (file)
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -11,6 +11,6 @@ SSHFS_AUTORECONF:=NO
 SSHFS_INSTALL_STAGING:=NO
 SSHFS_INSTALL_TARGET:=YES
 
-SSHFS_DEPENDENCIES = libglib2 libfuse $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
+SSHFS_DEPENDENCIES = libglib2 libfuse $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
 $(eval $(call AUTOTARGETS,package,sshfs))

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 533ef698b7cd675749ae41180e346a51c1c81a5b..434dae9521ac292c600987d3c8929479b4c31fd8 100644 (file)
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_UTIL-LINUX
        bool "util-linux"
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        depends on BR2_INET_RPC
        help
          Various useful/essential Linux utilities.

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 6446d37b0abfa1d2ff39694c510e887f502fd626..001ca75294cbc63d6b298d4a78b08ecf62e43b61 100644 (file)
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -18,7 +18,7 @@ else
 UTIL-LINUX_SCHED_UTILS:=--disable-schedutils
 endif
 
-ifeq ($(BR2_NEEDS_GETTEXT),y)
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 UTIL-LINUX_DEPENDENCIES += gettext libintl
 UTIL-LINUX_MAKE_OPT = LIBS=-lintl
 endif