* grub-core/Makefile.core.def: Add osdep/init.c on emu.

	* grub-core/kern/emu/main.c: Add missing include.
	* grub-core/osdep/basic/init.c (grub_util_host_init) [!GRUB_UTIL]:
	Don't call grub_util_init_nls.
	* grub-core/osdep/windows/init.c (grub_util_host_init) [!GRUB_UTIL]:
	Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2a51cd796f48191e8ccb9eb41d856fefc90ad0b8..a67a71e7fde10db36cef6e4237eebc2422a266a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-10-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/Makefile.core.def: Add osdep/init.c on emu.
+       * grub-core/kern/emu/main.c: Add missing include.
+       * grub-core/osdep/basic/init.c (grub_util_host_init) [!GRUB_UTIL]:
+       Don't call grub_util_init_nls.
+       * grub-core/osdep/windows/init.c (grub_util_host_init) [!GRUB_UTIL]:
+       Likewise.
+
 2013-10-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/misc.c (grub_util_get_image_size): Use FILE functions rather than

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index d00a21ba8af99fd7934c13185c65102c76d64964..2d3ced74fda584d282fc1c8fc36e35792fa82517 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -254,6 +254,7 @@ kernel = {
   emu = kern/emu/cache.c;
   emu = term/emu/console.c;
   emu = osdep/sleep.c;
+  emu = osdep/init.c;
 
   videoinkernel = term/gfxterm.c;
   videoinkernel = font/font.c;

diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 49e17f15d88efb0e1aa63c627d2d066156ad767d..08526129a25e1b00b09e745c91d331a444992ffc 100644 (file)
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -43,6 +43,7 @@
 #include <grub/env.h>
 #include <grub/partition.h>
 #include <grub/i18n.h>
+#include <grub/util/misc.h>
 
 #include "progname.h"
 #include <argp.h>

diff --git a/grub-core/osdep/basic/init.c b/grub-core/osdep/basic/init.c
index d01725fc5653efa27060684f739c194df24974fa..f4a673b649c901e92cb9cd3ab170b86acf60030c 100644 (file)
--- a/grub-core/osdep/basic/init.c
+++ b/grub-core/osdep/basic/init.c
@@ -29,5 +29,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)),
 {
   set_program_name ((*argv)[0]);
 
+#ifdef GRUB_UTIL
   grub_util_init_nls ();
+#endif
 }

diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c
index e6ad301b80fd2f2fa763bac21bfaf57663adb021..45554f1b2ec8fb23a5205dc69ba6660ca8eba0f0 100644 (file)
--- a/grub-core/osdep/windows/init.c
+++ b/grub-core/osdep/windows/init.c
@@ -139,5 +139,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)),
 
   set_program_name ((*argv)[0]);
 
+#ifdef GRUB_UTIL
   grub_util_init_nls ();
+#endif
 }