dialog: fix build, ensure host includes aren't used

configure looks for libintl, so ensure it is available. Also make sure
the host ncurses headers aren't used.
Fix up Config.in indentation while we're at it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index e703a0732e9745eb1a0eb34ebd5aa17db730e8bf..8218e3db8006fb227bd03286b8c7ece83009cdfa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,10 +4,10 @@
 
        Add support for LEON Sparc architecture variants.
 
-       Updated/fixed packages: bash, bind, busybox, gpsd, libglib2,
-       libcurl, libmad, lrzsz, midori, module-init-tools, mtd-utils,
-       openssh, openssl, pciutils, php, qt, sqlite, sysstat, webkit,
-       zlib
+       Updated/fixed packages: bash, bind, busybox, dialog, gpsd,
+       libglib2, libcurl, libmad, lrzsz, midori, module-init-tools,
+       mtd-utils, openssh, openssl, pciutils, php, qt, sqlite,
+       sysstat, webkit, zlib
 
        Issues resolved (http://bugs.uclibc.org):
 

diff --git a/package/dialog/Config.in b/package/dialog/Config.in
index 5681d1eb5ed01dc2b8a6f8cf9508de61c30ce9e9..9d3462ec4910c4af49d6645e9b709237d2f62aa7 100644 (file)
--- a/package/dialog/Config.in
+++ b/package/dialog/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_DIALOG
-    bool "dialog"
-    select BR2_PACKAGE_NCURSES
-    help
-       dialog - display dialog boxes from shell scripts
-
-       This application provides a method of displaying several different
-       types of dialog boxes from shell scripts.  This allows a developer
-       of a script to interact with the user in a much friendlier manner.
+       bool "dialog"
+       select BR2_PACKAGE_NCURSES
+       select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+       help
+         dialog - display dialog boxes from shell scripts
 
+         This application provides a method of displaying several different
+         types of dialog boxes from shell scripts.  This allows a developer
+         of a script to interact with the user in a much friendlier manner.

diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index e8c2a0d187864b40d3d5d9ae97f9b304ce3cdc65..e8f025f750be0f538e493ae8561ef5998744499d 100644 (file)
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -7,8 +7,13 @@ DIALOG_VERSION:=1.1-20100428
 DIALOG_SOURCE:=dialog-$(DIALOG_VERSION).tgz
 DIALOG_SITE:=ftp://invisible-island.net/dialog
 DIALOG_CONF_OPT = --with-ncurses
+DIALOG_CONF_ENV = ac_cv_path_NCURSES_CONFIG=true LIBS=-lncurses
 DIALOG_DEPENDENCIES = ncurses
 
+ifneq ($(BR2_ENABLE_LOCALE),y)
+DIALOG_DEPENDENCIES+=libiconv
+endif
+
 define DIALOG_INSTALL_TARGET_CMDS
        install -c $(@D)/dialog $(TARGET_DIR)/usr/bin/dialog
 endef