From 690ba839c0a2b672a786fdf174ea14827f1c553a Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Sun, 25 Jan 2009 20:50:59 +0000
Subject: [PATCH] Support libiconv option for popt

---
 package/popt/popt.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/popt/popt.mk b/package/popt/popt.mk
index b2f7c8b4a2..3c0ab0b5ab 100644
--- a/package/popt/popt.mk
+++ b/package/popt/popt.mk
@@ -5,9 +5,15 @@
 #############################################################
 POPT_VERSION:=1.14
 POPT_SITE:=http://rpm5.org/files/popt
-POPT_INSTALL_STAGING:=YES
-POPT_INSTALL_TARGET:=YES
-POPT_CONF_ENV:=ac_cv_va_copy=yes
+POPT_INSTALL_STAGING = YES
+POPT_INSTALL_TARGET = YES
+
+POPT_CONF_ENV = ac_cv_va_copy=yes
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+POPT_CONF_ENV += am_cv_lib_iconv=yes
+POPT_CONF_OPT += --with-libiconv-prefix=$(STAGING_DIR)/usr
+endif
 
 POPT_DEPENDENCIES:=uclibc
 
-- 
2.30.2