ushare: do not use the DISABLE_NLS variable

ushare is not an autoconf/automake based package, so it does not have
the standard behavior of autoconf that every enable/disable option
supports both --enable-foo and --disable-foo.

For example, it supports --disable-nls, but not
--enable-nls. Currently, DISABLE_NLS is either empty or --disable-nls,
but this will be changed in a follow-up commit. As a preparation, this
commit modifies ushare to no longer use DISABLE_NLS, but instead
calculate itself whether --disable-nls should be passed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk
index 3a5f178a8da6d966b75a3c668285cb4f97782005..32aa4451266f1433c86707c7f3992c7b8d282522 100644 (file)
--- a/package/ushare/ushare.mk
+++ b/package/ushare/ushare.mk
@@ -11,17 +11,27 @@ USHARE_DEPENDENCIES = host-pkgconf libupnp
 USHARE_LICENSE = GPL-2.0+
 USHARE_LICENSE_FILES = COPYING
 
+USHARE_CONF_OPTS = \
+       --prefix=/usr \
+       --cross-compile \
+       --cross-prefix="$(TARGET_CROSS)" \
+       --sysconfdir=/etc \
+       --disable-strip
+
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 USHARE_DEPENDENCIES += gettext
 USHARE_LDFLAGS += -lintl
 endif
 
+ifeq ($(BR2_ENABLE_LOCALE),)
+USHARE_CONF_OPTS += --disable-nls
+endif
+
 define USHARE_CONFIGURE_CMDS
        (cd $(@D); \
                $(TARGET_CONFIGURE_OPTS) \
-               ./configure --prefix=/usr $(DISABLE_NLS) --cross-compile \
-               --cross-prefix="$(TARGET_CROSS)" --sysconfdir=/etc \
-               --disable-strip \
+               ./configure \
+                       $(USHARE_CONF_OPTS) \
        )
 endef