grep: gettext/libintl is only required if locale is enabled

diff --git a/package/grep/Config.in b/package/grep/Config.in
index 3d488e3260ef02751d29890ab2e9dbfaaa6b8578..3795330cef6ab35fa26ba31939ed57ab79734e4b 100644 (file)
--- a/package/grep/Config.in
+++ b/package/grep/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_GREP
        bool "grep"
-       select BR2_PACKAGE_GETTEXT
-       select BR2_PACKAGE_LIBINTL
+       select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
        help
          The GNU regular expression matcher.
-         Needs gettext
+
          http://www.gnu.org/software/grep/grep.html

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index c12b1df1c4740fd6fac8cb0c6d4e17daf6119345..0e99698e0d8f2d7e20523c02edf0b8ea4ab7e3f7 100644 (file)
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -11,6 +11,10 @@ GNUGREP_CAT:=$(ZCAT)
 GNUGREP_BINARY:=src/grep
 GNUGREP_TARGET_BINARY:=bin/grep
 
+ifeq ($(BR2_ENABLE_LOCALE),y)
+GNUGREP_EXTRA_DEPS:=gettext libintl
+endif
+
 $(DL_DIR)/$(GNUGREP_SOURCE):
         $(WGET) -P $(DL_DIR) $(GNUGREP_SITE)/$(GNUGREP_SOURCE)
 
@@ -65,7 +69,7 @@ grep-target_binary: $(GNUGREP_DIR)/$(GNUGREP_BINARY)
            cp -a $(GNUGREP_DIR)/src/grep $(GNUGREP_DIR)/src/egrep \
                $(GNUGREP_DIR)/src/fgrep $(TARGET_DIR)/bin/; fi
 
-grep: uclibc gettext libintl grep-target_binary
+grep: uclibc $(GNUGREP_EXTRA_DEPS) grep-target_binary
 
 grep-clean:
        $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUGREP_DIR) uninstall