1.1 --- a/kconfig/kconfig.mk	Fri Oct 17 09:51:19 2008 +0000
     1.2 +++ b/kconfig/kconfig.mk	Fri Oct 17 12:47:53 2008 +0000
     1.3 @@ -12,15 +12,6 @@
     1.4  obj = kconfig
     1.5  PHONY += clean help oldconfig menuconfig defoldconfig
     1.6  
     1.7 -# Darwin (MacOS-X) does not have proper libintl support
     1.8 -ifeq ($(shell uname -s),Darwin)
     1.9 -KBUILD_NO_NLS:=1
    1.10 -endif
    1.11 -
    1.12 -ifneq ($(KBUILD_NO_NLS),)
    1.13 -CFLAGS += -DKBUILD_NO_NLS
    1.14 -endif
    1.15 -
    1.16  #-----------------------------------------------------------
    1.17  # List all config files, source and generated
    1.18  
    1.19 @@ -212,9 +203,12 @@
    1.20  # What is the compiler?
    1.21  HOST_CC ?= gcc -funsigned-char
    1.22  
    1.23 +# Compiler flags to use gettext
    1.24 +EXTRA_CFLAGS += $(shell $(SHELL) $(CT_LIB_DIR)/kconfig/check-gettext.sh $(HOST_CC) $(CFLAGS))
    1.25 +
    1.26  # Compiler and linker flags to use ncurses
    1.27 -CFLAGS += $(shell $(CT_LIB_DIR)/kconfig/lxdialog/check-lxdialog.sh -ccflags)
    1.28 -LDFLAGS += $(shell $(CT_LIB_DIR)/kconfig/lxdialog/check-lxdialog.sh -ldflags $(HOST_CC))
    1.29 +EXTRA_CFLAGS += $(shell $(SHELL) $(CT_LIB_DIR)/kconfig/lxdialog/check-lxdialog.sh -ccflags)
    1.30 +EXTRA_LDFLAGS += $(shell $(SHELL) $(CT_LIB_DIR)/kconfig/lxdialog/check-lxdialog.sh -ldflags $(HOST_CC))
    1.31  
    1.32  # Common source files, and lxdialog source files
    1.33  SRC = kconfig/zconf.tab.c
    1.34 @@ -241,7 +235,7 @@
    1.35  	   mkdir -p $(obj)/lxdialog;        \
    1.36  	 fi
    1.37  	@$(ECHO) "  DEP   $@"
    1.38 -	$(SILENT)$(HOST_CC) $(CFLAGS) -MM $< |sed -r -e 's|([^:]+.o)( *:+)|$(<:.c=.o) $@\2|;' >$@
    1.39 +	$(SILENT)$(HOST_CC) $(CFLAGS) $(EXTRA_CFLAGS) -MM $< |sed -r -e 's|([^:]+.o)( *:+)|$(<:.c=.o) $@\2|;' >$@
    1.40  -include $(DEPS)
    1.41  
    1.42  # Each .o must depend on the corresponding .c (obvious, isn't it?),
    1.43 @@ -259,15 +253,15 @@
    1.44  	   mkdir -p $(obj)/lxdialog;        \
    1.45  	 fi
    1.46  	@$(ECHO) "  CC    $@"
    1.47 -	$(SILENT)$(HOST_CC) $(CFLAGS) -o $@ -c $<
    1.48 +	$(SILENT)$(HOST_CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
    1.49  
    1.50  $(obj)/mconf: $(mconf_OBJ)
    1.51  	@$(ECHO) '  LD    $@'
    1.52 -	$(SILENT)$(HOST_CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
    1.53 +	$(SILENT)$(HOST_CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -o $@ $^
    1.54  
    1.55  $(obj)/conf: $(conf_OBJ)
    1.56  	@$(ECHO) '  LD    $@'
    1.57 -	$(SILENT)$(HOST_CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
    1.58 +	$(SILENT)$(HOST_CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -o $@ $^
    1.59  
    1.60  #-----------------------------------------------------------
    1.61  # Cleaning up the mess...