---

yaml
---
r: 11887
b: refs/heads/master
c: 70a6a0c
h: refs/heads/master
i:
  11885: 527d5c0
  11883: a522c7f
  11879: 14e67cf
  11871: 1060488
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b39f72fef241ce0ce971ed21922b4d64aefaf916
+refs/heads/master: 70a6a0cb92f24fd6bbe2e75299168909f735676a

trunk/scripts/kconfig/Makefile

@@ -116,6 +116,15 @@ endif
 clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck \
 		   .tmp_gtkcheck zconf.tab.c zconf.tab.h lex.zconf.c
 
+# Needed for systems without gettext
+KBUILD_HAVE_NLS := $(shell \
+     if echo "\#include <libint.h>" | $(HOSTCC) $(HOSTCFLAGS) -E - > /dev/null 2>&1 ; \
+     then echo yes ; \
+     else echo no ; fi)
+ifeq ($(KBUILD_HAVE_NLS),no)
+HOSTCFLAGS	+= -DKBUILD_NO_NLS
+endif
+
 # generated files seem to need this to find local include files
 HOSTCFLAGS_lex.zconf.o	:= -I$(src)
 HOSTCFLAGS_zconf.tab.o	:= -I$(src)

trunk/scripts/kconfig/lkc.h

@@ -8,7 +8,13 @@
 
 #include "expr.h"
 
-#include <libintl.h>
+#ifndef KBUILD_NO_NLS
+# include <libintl.h>
+#else
+# define gettext(Msgid) ((const char *) (Msgid))
+# define textdomain(Domainname) ((const char *) (Domainname))
+# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+#endif
 
 #ifdef __cplusplus
 extern "C" {