diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-09-16 12:57:49 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-20 21:33:38 +0200 |
| commit | bbcbed1829057121f9f9459f62f913626206e823 (patch) | |
| tree | 82b2f830010e59fc5844fbe56e6c81c0205cf6ce /package/avahi | |
| parent | 9a07346054e6e5e8e8bee0d16eabaaee9ba97bd3 (diff) | |
| download | buildroot-novena-bbcbed1829057121f9f9459f62f913626206e823.tar.gz buildroot-novena-bbcbed1829057121f9f9459f62f913626206e823.zip | |
Remove all references to libintl
From now on, packages only need to select the BR2_PACKAGE_GETTEXT
option and depend on the 'gettext' package to get the necessary i18n
libraries installed on the target.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[yann.morin.1998@free.fr: remove BR2_PACKAGE_LIBINTL]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
CC: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/avahi')
| -rw-r--r-- | package/avahi/Config.in | 1 | ||||
| -rw-r--r-- | package/avahi/avahi.mk | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/package/avahi/Config.in b/package/avahi/Config.in index eb3ccb67b..8ba33d5e7 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_AVAHI bool "avahi" 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 a26481d4e..03dc36859 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -85,7 +85,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \ --with-autoipd-user=default \ --with-autoipd-group=default -AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-intltool host-pkg-config +AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool host-pkg-config ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),) AVAHI_DEPENDENCIES += libdaemon @@ -133,8 +133,8 @@ else AVAHI_CONF_OPT += --disable-python endif -ifeq ($(BR2_PACKAGE_LIBINTL),y) -AVAHI_DEPENDENCIES += libintl +ifeq ($(BR2_PACKAGE_GETTEXT),y) +AVAHI_DEPENDENCIES += gettext AVAHI_MAKE_OPT = LIBS=-lintl endif |