2009-01-01 Yves Blusseau <yves.blusseau@zetam.org>

* configure.ac: check external intl library * Makefile.in: add compiler and linker flags to properly compile with intl library * include/grub/i18n.h: add a check to disable NLS * util/misc.c (grub_util_init_nls): new function * include/grub/util/misc.h: likewise * util/elf/grub-mkimage.c: use the new function below to initialize NLS * util/grub-editenv.c: likewise * util/grub-emu.c: likewise * util/grub-fstest.c: likewise * util/grub-mkdevicemap.c: likewise * util/grub-mkfont.c: likewise * util/grub-mkrelpath.c: likewise * util/grub-probe.c: likewise * util/i386/pc/grub-mkimage.c: likewise * util/i386/pc/grub-setup.c: likewise * util/sparc64/ieee1275/grub-mkimage.c: likewise * util/sparc64/ieee1275/grub-ofpathname.c: likewise * util/sparc64/ieee1275/grub-setup.c: likewise * util/mkisofs/mkisofs.h: add a check to disable NLS * util/mkisofs/mkisofs.c: likewise
2010-01-01 21:32:30 +01:00 · 2010-01-01 21:32:30 +01:00 · 2f1a3acf75
parent cec573c894
commit 2f1a3acf75
20 changed files with 115 additions and 70 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -1,6 +1,6 @@
 # -*- makefile -*-
 #
-# Copyright (C) 1994,1995,1996,1997,1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
+# Copyright (C) 1994,1995,1996,1997,1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
 #
 # This Makefile.in is free software; the author
 # gives unlimited permission to copy and/or distribute it,
@ -41,6 +41,9 @@ includedir = @includedir@
 pkgdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
 pkglibdir =  $(libdir)/`echo @PACKAGE_TARNAME@/$(target_cpu)-$(platform) | sed '$(transform)'`

+# Internationalization library.
+LIBINTL = @LIBINTL@
+
 XGETTEXT = @XGETTEXT@
 MSGMERGE = @MSGMERGE@
 MSGFMT = @MSGFMT@
@ -72,10 +75,12 @@ MKDIR_P = @MKDIR_P@

 mkinstalldirs = $(srcdir)/mkinstalldirs

+LIBS = @LIBS@ $(LIBINTL)
+
 CC = @CC@
 CFLAGS = @CFLAGS@
 ASFLAGS = @ASFLAGS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ $(LIBS)
 CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
 	 -DGRUB_LIBDIR=\"$(pkglibdir)\" -DLOCALEDIR=\"$(localedir)\"
 TARGET_CC = @TARGET_CC@
--- a/configure.ac
+++ b/configure.ac
@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.

-# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # This configure.ac is free software; the author
 # gives unlimited permission to copy and/or distribute it,
@ -178,7 +178,7 @@ AC_PROG_CC
 test "x$GCC" = xyes || AC_MSG_ERROR([GCC is required])

 AC_GNU_SOURCE
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
 AC_SYS_LARGEFILE

 # Identify characteristics of the host architecture.
--- a/include/grub/i18n.h
+++ b/include/grub/i18n.h
@ -1,6 +1,6 @@
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2009,2010  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
@ -19,17 +19,42 @@
 #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) grub_gettext(str)
+#include <config.h>
+#include <grub/symbol.h>

 const char *EXPORT_FUNC(grub_gettext_dummy) (const char *s);
 extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);

-#endif
+/* NLS can be disabled through the configure --disable-nls option.  */
+#if ENABLE_NLS
+
+# ifdef GRUB_UTIL
+
+#  include <locale.h>
+#  include <libintl.h>
+
+# endif /* GRUB_UTIL */
+
+#else /* ! ENABLE_NLS */
+
+/* Disabled NLS.
+   The casts to 'const char *' serve the purpose of producing warnings
+   for invalid uses of the value returned from these functions.
+   On pre-ANSI systems without 'const', the config.h file is supposed to
+   contain "#define const".  */
+# ifdef GRUB_UTIL
+#  define gettext(Msgid) ((const char *) (Msgid))
+# else
+#  define grub_gettext(str) ((const char *) (str))
+# endif /* GRUB_UTIL */
+
+#endif /* ENABLE_NLS */
+
+#ifdef GRUB_UTIL
+# define _(str) gettext(str)
+#else
+# define _(str) grub_gettext(str)
+#endif /* GRUB_UTIL */

 #define N_(str) str

--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@ -1,6 +1,6 @@
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2002,2003,2005,2006,2007,2008,2009,2010  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
@ -88,4 +88,6 @@ grub_int64_t grub_util_get_disk_size (char *name);

 char *make_system_path_relative_to_its_root (const char *path);

+void grub_util_init_nls (void);
+
 #endif /* ! GRUB_UTIL_MISC_HEADER */
--- a/util/elf/grub-mkimage.c
+++ b/util/elf/grub-mkimage.c
@ -1,6 +1,6 @@
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2004,2005,2006,2007,2008,2009,2010  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
@ -361,9 +361,8 @@ main (int argc, char *argv[])
  int chrp = 0;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  while (1)
    {
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@ -1,7 +1,7 @@
 /* grub-editenv.c - tool to edit environment block.  */
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008,2009 Free Software Foundation, Inc.
+ *  Copyright (C) 2008,2009,2010 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
@ -256,9 +256,8 @@ main (int argc, char *argv[])
  char *command;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  /* Check for options.  */
  while (1)
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@ -1,6 +1,6 @@
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2003,2004,2005,2006,2007,2008,2009,2010  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
@ -159,9 +159,8 @@ main (int argc, char *argv[])
  int opt;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  while ((opt = getopt_long (argc, argv, "r:d:m:vH:hV", options, 0)) != -1)
    switch (opt)
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@ -1,7 +1,7 @@
 /* grub-fstest.c - debug tool for filesystem driver */
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008,2009 Free Software Foundation, Inc.
+ *  Copyright (C) 2008,2009,2010 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
@ -384,9 +384,8 @@ main (int argc, char *argv[])
  int i, cmd, num_opts, image_index, num_disks = 1;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  /* Find the first non option entry.  */
  for (num_opts = 1; num_opts < argc; num_opts++)
--- a/util/grub-mkdevicemap.c
+++ b/util/grub-mkdevicemap.c
@ -1,7 +1,7 @@
 /* grub-mkdevicemap.c - make a device map file automatically */
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009 Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010 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
@ -112,9 +112,8 @@ main (int argc, char *argv[])
  int floppy_disks = 1;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  /* Check for options.  */
  while (1)
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@ -1,6 +1,6 @@
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009 Free Software Foundation, Inc.
+ *  Copyright (C) 2009,2010 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
@ -476,9 +476,8 @@ main (int argc, char *argv[])
  memset (&font_info, 0, sizeof (font_info));

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  /* Check for options.  */
  while (1)
--- a/util/grub-mkrelpath.c
+++ b/util/grub-mkrelpath.c
@ -1,7 +1,7 @@
 /* grub-mkrelpath.c - make a system path relative to its root */
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009 Free Software Foundation, Inc.
+ *  Copyright (C) 2009,2010 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
@ -56,9 +56,8 @@ main (int argc, char *argv[])
  char *argument, *relpath;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  /* Check for options.  */
  while (1)
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@ -1,7 +1,7 @@
 /* grub-probe.c - probe device information for a given path */
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2006,2007,2008,2009,2010  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
@ -338,9 +338,8 @@ main (int argc, char *argv[])
  char *argument;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  /* Check for options.  */
  while (1)
--- a/util/i386/pc/grub-mkimage.c
+++ b/util/i386/pc/grub-mkimage.c
@ -1,7 +1,7 @@
 /* grub-mkimage.c - make a bootable image */
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010  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
@ -351,9 +351,8 @@ main (int argc, char *argv[])
  FILE *fp = stdout;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  while (1)
    {
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@ -1,7 +1,7 @@
 /* grub-setup.c - make GRUB usable */
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010  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
@ -641,9 +641,8 @@ main (int argc, char *argv[])
  int must_embed = 0, force = 0, fs_probe = 1;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  /* Check for options.  */
  while (1)
--- a/util/misc.c
+++ b/util/misc.c
@ -1,6 +1,6 @@
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2002,2003,2005,2006,2007,2008,2009,2010  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
@ -38,6 +38,7 @@
 #include <grub/mm.h>
 #include <grub/term.h>
 #include <grub/time.h>
+#include <grub/i18n.h>

 #include "progname.h"

@ -566,3 +567,13 @@ make_system_path_relative_to_its_root (const char *path)

  return buf3;
 }
+
+void
+grub_util_init_nls (void)
+{
+#if ENABLE_NLS
+  setlocale (LC_ALL, "");
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+#endif /* ENABLE_NLS */
+}
--- a/util/mkisofs/mkisofs.c
+++ b/util/mkisofs/mkisofs.c
@ -6,7 +6,7 @@

   Copyright 1993 Yggdrasil Computing, Incorporated

-   Copyright (C) 2009  Free Software Foundation, Inc.
+   Copyright (C) 2009,2010  Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@ -645,9 +645,11 @@ int FDECL2(main, int, argc, char **, argv){
  char *log_file = 0;

  set_program_name (argv[0]);
+#if ENABLE_NLS
  setlocale (LC_ALL, "");
  bindtextdomain (PACKAGE, LOCALEDIR);
  textdomain (PACKAGE);
+#endif /* ENABLE_NLS */

  if (argc < 2)
    usage();
--- a/util/mkisofs/mkisofs.h
+++ b/util/mkisofs/mkisofs.h
@ -5,7 +5,7 @@

   Copyright 1993 Yggdrasil Computing, Incorporated

-   Copyright (C) 2009  Free Software Foundation, Inc.
+   Copyright (C) 2009,2010  Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@ -30,8 +30,21 @@
 #include <prototyp.h>
 #include <sys/stat.h>

-#include <locale.h>
-#include <libintl.h>
+#if ENABLE_NLS
+
+#  include <locale.h>
+#  include <libintl.h>
+
+#else /* ! ENABLE_NLS */
+
+/* Disabled NLS.
+   The casts to 'const char *' serve the purpose of producing warnings
+   for invalid uses of the value returned from these functions.
+   On pre-ANSI systems without 'const', the config.h file is supposed to
+   contain "#define const".  */
+#  define gettext(Msgid) ((const char *) (Msgid))
+#endif /* ENABLE_NLS */
+
 #define _(str) gettext(str)
 #define N_(str) str

--- a/util/sparc64/ieee1275/grub-mkimage.c
+++ b/util/sparc64/ieee1275/grub-mkimage.c
@ -1,7 +1,7 @@
 /* grub-mkimage.c - make a bootable image */
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2008,2009,2010  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
@ -222,9 +222,8 @@ main (int argc, char *argv[])
  FILE *fp = stdout;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_ls ();

  while (1)
    {
--- a/util/sparc64/ieee1275/grub-ofpathname.c
+++ b/util/sparc64/ieee1275/grub-ofpathname.c
@ -1,7 +1,7 @@
 /* grub-ofpathname.c - Find OpenBOOT path for a given device */
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2009,2010  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
@ -29,9 +29,8 @@ int main(int argc, char **argv)
  char *of_path;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  if (argc != 2)
    {
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@ -1,7 +1,7 @@
 /* grub-setup.c - make GRUB usable */
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010  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
@ -620,9 +620,8 @@ main (int argc, char *argv[])
  struct grub_setup_info ginfo;

  set_program_name (argv[0]);
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+
+  grub_util_init_nls ();

  init_info (&ginfo);
  if (!parse_options (&ginfo, argc, argv))