From 63bbd0876fd289bb563e6c47ea159d09d2c33ba7 Mon Sep 17 00:00:00 2001
From: Yuri Vasilevski <yvasilev@duke.math.cinvestav.mx>
Date: Sun, 30 Oct 2005 15:03:20 -0800
Subject: [PATCH] --- yaml --- r: 11887 b: refs/heads/master c:
 70a6a0cb92f24fd6bbe2e75299168909f735676a h: refs/heads/master i:   11885:
 527d5c04d5883c2ab8ad2460d9c07395f3d32334   11883:
 a522c7f9f981b6d402a2297bfebaf9290d3bb698   11879:
 14e67cf63ed954ccd05c2def012c2289e06c565b   11871:
 1060488a84e56262f375909d94762ff42bf81385 v: v3

---
 [refs]                         | 2 +-
 trunk/scripts/kconfig/Makefile | 9 +++++++++
 trunk/scripts/kconfig/lkc.h    | 8 +++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b0e315bb4600..2ce4fb379405 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b39f72fef241ce0ce971ed21922b4d64aefaf916
+refs/heads/master: 70a6a0cb92f24fd6bbe2e75299168909f735676a
diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile
index 2fcb244a9e18..0dd96919de3e 100644
--- a/trunk/scripts/kconfig/Makefile
+++ b/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)
diff --git a/trunk/scripts/kconfig/lkc.h b/trunk/scripts/kconfig/lkc.h
index c3d25786a64d..5fba1feff2a8 100644
--- a/trunk/scripts/kconfig/lkc.h
+++ b/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" {