From 336262f829c2ce2f4e2a4594dca1220b2888d431 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Tue, 17 Nov 2009 10:47:22 +0000 Subject: [PATCH] 2009-11-17 Robert Millan * 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. --- ChangeLog.gettext | 8 ++++++++ Makefile.in | 2 +- configure.ac | 1 + util/i386/pc/grub-mkimage.c | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog.gettext b/ChangeLog.gettext index 1549302fb..19e83f0bb 100644 --- a/ChangeLog.gettext +++ b/ChangeLog.gettext @@ -1,3 +1,11 @@ +2009-11-17 Robert Millan + + * 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 * gnulib/progname.c: New file (imported from Gnulib). diff --git a/Makefile.in b/Makefile.in index 3a4c158c6..07f0b6fec 100644 --- 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 3178f6c4a..587f2118d 100644 --- 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 249a40976..2001804c3 100644 --- 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)