From df25a2fd0779277dd0f43d070e4a15f0dc16bacc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 28 Aug 2009 21:34:47 +0200
Subject: make it compile without locale support

---
 config/Makefile | 8 ++++----
 config/conf.c   | 2 ++
 config/mconf.c  | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'config')

diff --git a/config/Makefile b/config/Makefile
index ae7a293dd..d7bfd630f 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -44,16 +44,16 @@ MCONF_OBJS=$(patsubst %.c,%.o, $(MCONF_SRC))
 SHARED_OBJS=$(patsubst %.c,%.o, $(SHARED_SRC))
 
 conf: $(CONF_OBJS) $(SHARED_OBJS)
-	$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@
+	$(HOSTCC) -DKBUILD_NO_NLS $(NATIVE_LDFLAGS) $^ -o $@
 
 mconf: $(MCONF_OBJS) $(SHARED_OBJS)
-	$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
+	$(HOSTCC) -DKBUILD_NO_NLS $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
 
 $(CONF_OBJS): %.o : %.c $(SHARED_DEPS)
-	$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
+	$(HOSTCC) -DKBUILD_NO_NLS $(HOSTCFLAGS) -I. -c $< -o $@
 
 $(MCONF_OBJS): %.o : %.c $(SHARED_DEPS)
-	$(HOSTCC) $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@
+	$(HOSTCC) -DKBUILD_NO_NLS $(HOSTCFLAGS) $(HOSTNCURSES) -I. -c $< -o $@
 
 glob.o: glob.c $(SHARED_DEPS)
 	$(HOSTCC) $(HOSTCFLAGS) -I. -c glob.c -o $@
diff --git a/config/conf.c b/config/conf.c
index 3baaaecd6..74be7e779 100644
--- a/config/conf.c
+++ b/config/conf.c
@@ -435,9 +435,11 @@ int main(int ac, char **av)
 	const char *name;
 	struct stat tmpstat;
 
+#ifndef KBUILD_NO_NLS 
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {
 		switch (opt) {
diff --git a/config/mconf.c b/config/mconf.c
index 9516a5715..6aa2c0d88 100644
--- a/config/mconf.c
+++ b/config/mconf.c
@@ -875,9 +875,11 @@ int main(int ac, char **av)
 	char *mode;
 	int res;
 
+#ifndef KBUILD_NO_NLS
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+#endif
 
 	conf_parse(av[1]);
 	conf_read(NULL);
-- 
cgit v1.2.3