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/linux-pam/Config.in | 1 - package/linux-pam/linux-pam.mk | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'package/linux-pam') diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 722b87576..7cfd8147a 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LINUX_PAM bool "linux-pam" - select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_FLEX select BR2_PACKAGE_FLEX_LIBFL diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 48cb07394..1a2e7f6bf 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -15,12 +15,12 @@ LINUX_PAM_CONF_OPT = \ --disable-regenerate-docu \ --enable-securedir=/lib/security \ --libdir=/lib -LINUX_PAM_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) flex +LINUX_PAM_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) flex LINUX_PAM_AUTORECONF = YES LINUX_PAM_LICENSE = BSD-3c LINUX_PAM_LICENSE_FILES = Copyright -ifeq ($(BR2_PACKAGE_LIBINTL),y) +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) LINUX_PAM_MAKE_OPT += LIBS=-lintl endif -- cgit v1.2.3