From: Sebastian Kemper <redacted>
Date: Mon, 30 Dec 2019 18:06:34 +0000 (+0100)
Subject: apr-util: allow iconv-stub use
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=03124bf4b42eab292e92038bd7c4efdee78b23d1;p=openwrt-packages.git

apr-util: allow iconv-stub use

Allow iconv-stub use when NLS support is disabled.

Signed-off-by: Sebastian Kemper <redacted>
---

diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile
index 6fe72ed98..ce80a3643 100644
--- a/libs/apr-util/Makefile
+++ b/libs/apr-util/Makefile
@@ -39,15 +39,10 @@ CONFIGURE_ARGS += \
 	--with-pgsql=no \
 	--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
 	--with-expat="$(STAGING_DIR)/usr" \
+	--with-iconv="$(ICONV_PREFIX)" \
 	--without-sqlite2 \
 	--with-sqlite3="$(STAGING_DIR)/usr"
 
-ifdef $(CONFIG_BUILD_NLS)
-	CONFIGURE_ARGS += --with-iconv="$(ICONV_PREFIX)"
-else
-	CONFIGURE_ARGS += --without-iconv
-endif
-
 CONFIGURE_VARS += \
 	ac_cv_file_dbd_apr_dbd_mysql_c=no \
 	ac_cv_path_ODBC_CONFIG= \