Move i18n declarations to their own file.

include/grub/i18n.h

@@ -0,0 +1,30 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef	GRUB_I18N_H
+#define	GRUB_I18N_H	1
+
+#ifdef GRUB_UTIL
+# include <locale.h>
+# include <libintl.h>
+# define _(str) gettext(str)
+#else
+# define _(str) str
+#endif
+
+#endif /* GRUB_I18N_H */

util/i386/pc/grub-mkimage.c

@@ -22,6 +22,7 @@
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
 #include <grub/machine/memory.h>
+#include <grub/i18n.h>
 #include <grub/kernel.h>
 #include <grub/disk.h>
 #include <grub/util/misc.h>
@@ -33,10 +34,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <locale.h>
-#include <libintl.h>
-#define _(str) gettext(str)
-
 #define _GNU_SOURCE	1
 #include <getopt.h>