2009-11-17 Robert Millan <rmh.grub@aybabtu.com>

        * configure.ac: Call AM_GNU_GETTEXT() (defines localedir, among
        other things).
        * Makefile.in (CPPFLAGS): Add `-DLOCALEDIR=\"$(localedir)\"'.
        * util/i386/pc/grub-mkimage.c (main): Issue setlocale() and
        bindtextdomain() calls for gettext initialization.

diff --git a/ChangeLog.gettext b/ChangeLog.gettext
index 1549302fbb0a0bb7defeb7c8b522b477bc139aa1..19e83f0bb5d0adb6fd7a183df72923f8dc5f7737 100644 (file)
--- a/ChangeLog.gettext
+++ b/ChangeLog.gettext
@@ -1,3 +1,11 @@
+2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * configure.ac: Call AM_GNU_GETTEXT() (defines localedir, among
+       other things).
+       * Makefile.in (CPPFLAGS): Add `-DLOCALEDIR=\"$(localedir)\"'.
+       * util/i386/pc/grub-mkimage.c (main): Issue setlocale() and
+       bindtextdomain() calls for gettext initialization.
+
 2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>
 
        * gnulib/progname.c: New file (imported from Gnulib).

diff --git a/Makefile.in b/Makefile.in
index 3a4c158c6bdc77285097aff8ee9a38cfccbbe0ba..07f0b6fec2b77aca2643dcf8a79b6d6b06c29d89 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,7 +72,7 @@ CFLAGS = @CFLAGS@
 ASFLAGS = @ASFLAGS@
 LDFLAGS = @LDFLAGS@
 CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
-        -DGRUB_LIBDIR=\"$(pkglibdir)\"
+        -DGRUB_LIBDIR=\"$(pkglibdir)\" -DLOCALEDIR=\"$(localedir)\"
 TARGET_CC = @TARGET_CC@
 TARGET_CFLAGS = @TARGET_CFLAGS@
 TARGET_ASFLAGS = @TARGET_ASFLAGS@

diff --git a/configure.ac b/configure.ac
index 3178f6c4a96d6995caa691a4a783c535fae68066..587f2118dd2b7a66be3e06b94709c8543f4f60d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@ dnl type.
 
 AC_INIT([GRUB],[1.97],[bug-grub@gnu.org])
 AM_INIT_AUTOMAKE()
+AM_GNU_GETTEXT()
 AC_PREREQ(2.59d)
 AC_CONFIG_SRCDIR([include/grub/dl.h])
 AC_CONFIG_HEADER([config.h])

diff --git a/util/i386/pc/grub-mkimage.c b/util/i386/pc/grub-mkimage.c
index 249a409767bc3a9f9d815219f95e75908e2f3a08..2001804c36e76cac7768d1c2126224febbada01c 100644 (file)
--- a/util/i386/pc/grub-mkimage.c
+++ b/util/i386/pc/grub-mkimage.c
@@ -351,6 +351,8 @@ main (int argc, char *argv[])
   FILE *fp = stdout;
 
   set_program_name (argv[0]);
+  setlocale (LC_ALL, "");
+  bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
   while (1)