From bbcbed1829057121f9f9459f62f913626206e823 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 16 Sep 2012 12:57:49 +0000 Subject: 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 Tested-by: "Yann E. MORIN" [yann.morin.1998@free.fr: remove BR2_PACKAGE_LIBINTL] Signed-off-by: "Yann E. MORIN" Tested-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Arnout Vandecappelle (Essensium/Mind) CC: Samuel Martin Signed-off-by: Peter Korsgaard --- package/dnsmasq/Config.in | 1 - package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'package/dnsmasq') diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in index e67aa4617..b76ddb2cc 100644 --- a/package/dnsmasq/Config.in +++ b/package/dnsmasq/Config.in @@ -25,7 +25,6 @@ config BR2_PACKAGE_DNSMASQ_IDN depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBIDN select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE help Enable IDN support in dnsmasq. This option is a big space taker since it pulls in many libraries. diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 1f714bf57..e92a554ac 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -24,7 +24,7 @@ endif # NLS requires IDN so only enable it (i18n) when IDN is true ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) - DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) + DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) DNSMASQ_MAKE_OPT += LDFLAGS+="-lidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" DNSMASQ_COPTS += -DHAVE_IDN DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n) -- cgit v1.2.3