summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--loader/lang.c9
-rw-r--r--loader/loader.c5
2 files changed, 9 insertions, 5 deletions
diff --git a/loader/lang.c b/loader/lang.c
index 227b646d9..700e64b89 100644
--- a/loader/lang.c
+++ b/loader/lang.c
@@ -26,6 +26,8 @@
#define errorWindow(String) \
newtWinMessage(_("Error"), _("OK"), String, strerror (errno));
+extern int haveKon;
+
struct aString {
unsigned int hash;
short length;
@@ -106,10 +108,8 @@ static void loadLanguageList(int flags) {
code, keyboard, timezone) != 7) {
logMessage("bad line %d in lang-table", lineNum);
} else {
-#ifndef INCLUDE_KON
- if (!strcmp (name, "Japanese"))
+ if (!haveKon && !strcmp (name, "Japanese"))
continue;
-#endif
languages[numLanguages].lang = strdup(name);
languages[numLanguages].key = strdup(key);
languages[numLanguages].font = strdup(sun);
@@ -315,7 +315,7 @@ int chooseLanguage(char ** lang, int flags) {
numStrings = allocedStrings = 0;
}
-#ifdef INCLUDE_KON
+ if (haveKon)
{
extern int continuing;
extern void stopNewt(void);
@@ -333,7 +333,6 @@ int chooseLanguage(char ** lang, int flags) {
execv(FL_TESTING(flags) ? "./loader" : "/sbin/loader", args);
}
}
-#endif
loadLanguage (NULL, flags);
if (languages[choice].map)
diff --git a/loader/loader.c b/loader/loader.c
index b9a9eefbf..bb41c1088 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -135,6 +135,11 @@ static int numMethods = sizeof(installMethods) / sizeof(struct installMethod);
static int newtRunning = 0;
int continuing = 0;
+#ifdef INCLUDE_KON
+int haveKon = 1;
+#else
+int haveKon = 0;
+#endif
void doSuspend(void) {
newtFinished();