summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--package/libidn/Config.in4
-rw-r--r--package/libidn/libidn.mk1
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index dffc84898..1f19a244f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
Fixes all over the tree.
- Updated/fixed packages: netperf
+ Updated/fixed packages: libidn, netperf
Issues resolved (http://bugs.uclibc.org):
diff --git a/package/libidn/Config.in b/package/libidn/Config.in
index 04f890072..dcf972494 100644
--- a/package/libidn/Config.in
+++ b/package/libidn/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_LIBIDN
bool "libidn"
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
- Libidn's purpose is to encode and decode internationalized
- domain names.
+ Libidn's purpose is to encode and decode internationalized
+ domain names.
http://www.gnu.org/software/libidn/
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index 4b3bea3a5..79e03211d 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -8,6 +8,7 @@ LIBIDN_VERSION = 1.15
LIBIDN_SITE = http://ftp.gnu.org/gnu/libidn/
LIBIDN_INSTALL_STAGING = YES
LIBIDN_INSTALL_TARGET = YES
+LIBIDN_CONF_ENV = EMACS="no"
LIBIDN_CONF_OPT = --enable-shared --disable-java --enable-csharp=no
LIBIDN_LIBTOOL_PATCH = NO
LIBIDN_DEPENDENCIES = host-pkg-config $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)