Merge my gettext branch (gettext support in build system for GRUB utilities)

diff --cc ChangeLog
index ac8bed7348ad47037bab38e51ca495514119ec10,b0958fc917ccd403e29439de3eed83d41e93e7ad..6d7a25be45453c6f2d0d9714e5b2c8bb44057e40
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,98 -1,3 +1,162 @@@
++2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>
++
++      * INSTALL: Document Automake is needed for bootstrap.
++      * po/ca.po: Fix PO-Revision-Date and Language-Team fields.
++      * util/grub.d/10_kfreebsd.in (bindir): New variable.
++      Add gettext initialization.
++      (kfreebsd_entry): Make menuentry output translatable.
++
++2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>
++
++      * Makefile.in (XGETTEXT, MSGMERGE, MSGFMT): New variables.
++      (po/$(PACKAGE).pot): Replace `xgettext' with `$(XGETTEXT)'.
++      (po/*.po): Replace `msgmerge' with `$(MSGMERGE)'.
++      (po/%.mo): Replace `msgfmt' with `$(MSGFMT)'.
++      (LINGUAS): Auto-generate using `po/LINGUAS'.
++      * po/LINGUAS: New file.
++
++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).
++      * gnulib/progname.h: Likewise.
++      * conf/i386-pc.rmk (grub_mkimage_SOURCES): Add `gnulib/progname.c'.
++      * util/i386/pc/grub-mkimage.c: Include `"progname.h"'.
++      (usage): Replace `progname' with `program_name'.
++      (main): Use set_program_name() for program name initialization.
++
++2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>
++
++      * conf/common.rmk (grub_mkisofs_CFLAGS): Move `-I$(srcdir)/gnulib'
++      from here ...
++      * Makefile.in (CPPFLAGS): ... to here.
++
++2009-11-16  Robert Millan  <rmh.grub@aybabtu.com>
++
++      * aclocal.m4: Move from here ...
++      * acinclude.m4: ... to here.
++      * autogen.sh: Add call to `aclocal'.
++      * configure.ac: Add AM_INIT_AUTOMAKE() after AC_INIT() call.
++
++2009-11-16  Robert Millan  <rmh.grub@aybabtu.com>
++
++      * Makefile.in (CLEANFILES): Add `po/*.mo'.
++      (LINGUAS): New variable.
++      (all-local): Add `$(foreach lang, $(LINGUAS), po/$(lang).mo)'.
++      (install-local): Install MO files.
++      (po/$(PACKAGE).pot, po/*.po, po/%.mo): New rules.
++      * include/grub/i18n.h: New file.
++      * po/POTFILES: New file.
++      * po/ca.po: New file.
++      * util/grub.d/10_linux.in (bindir): New variable.
++      Add gettext initialization.
++      (linux_entry): Make menuentry output translatable.
++      * util/i386/pc/grub-mkimage.c: Include `<grub/i18n.h>'.
++      (usage): Make --help output translatable.
++      (main): Initialize gettext.
++
 +2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>
 +
 +      * import_gcry.py: New file (written by Vladimir with minor
 +      adjustments).
 +      * autogen.sh: Use import_gcry.py to auto-generate GRUB-ified
 +      ciphers.
 +      * INSTALL: Document that Python is required for bootstrap.
 +
 +2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>
 +
 +      Import ciphers from libgcrypt 1.4.4.
 +
 +       * lib/libgcrypt/cipher/ChangeLog
 +       * lib/libgcrypt/cipher/ac.c
 +       * lib/libgcrypt/cipher/arcfour.c
 +       * lib/libgcrypt/cipher/bithelp.h
 +       * lib/libgcrypt/cipher/blowfish.c
 +       * lib/libgcrypt/cipher/camellia-glue.c
 +       * lib/libgcrypt/cipher/camellia.c
 +       * lib/libgcrypt/cipher/camellia.h
 +       * lib/libgcrypt/cipher/cast5.c
 +       * lib/libgcrypt/cipher/cipher.c
 +       * lib/libgcrypt/cipher/crc.c
 +       * lib/libgcrypt/cipher/des.c
 +       * lib/libgcrypt/cipher/dsa.c
 +       * lib/libgcrypt/cipher/ecc.c
 +       * lib/libgcrypt/cipher/elgamal.c
 +       * lib/libgcrypt/cipher/hash-common.c
 +       * lib/libgcrypt/cipher/hash-common.h
 +       * lib/libgcrypt/cipher/hmac-tests.c
 +       * lib/libgcrypt/cipher/md.c
 +       * lib/libgcrypt/cipher/md4.c
 +       * lib/libgcrypt/cipher/md5.c
 +       * lib/libgcrypt/cipher/primegen.c
 +       * lib/libgcrypt/cipher/pubkey.c
 +       * lib/libgcrypt/cipher/rfc2268.c
 +       * lib/libgcrypt/cipher/rijndael-tables.h
 +       * lib/libgcrypt/cipher/rijndael.c
 +       * lib/libgcrypt/cipher/rmd.h
 +       * lib/libgcrypt/cipher/rmd160.c
 +       * lib/libgcrypt/cipher/rsa.c
 +       * lib/libgcrypt/cipher/seed.c
 +       * lib/libgcrypt/cipher/serpent.c
 +       * lib/libgcrypt/cipher/sha1.c
 +       * lib/libgcrypt/cipher/sha256.c
 +       * lib/libgcrypt/cipher/sha512.c
 +       * lib/libgcrypt/cipher/tiger.c
 +       * lib/libgcrypt/cipher/twofish.c
 +       * lib/libgcrypt/cipher/whirlpool.c
 +
 +2009-11-16  Robert Millan  <rmh.grub@aybabtu.com>
 +
 +      Fix build for systems without error().
 +
 +      * gnulib/error.c: New file (imported from Gnulib).
 +      * gnulib/error.h: Likewise.
 +      * conf/common.rmk (grub_mkisofs_SOURCES): Add `gnulib/error.c'.
 +      * util/mkisofs/mkisofs.c (program_name): Remove `static' qualifier
 +      (this variable is now used by error()).
 +
 +2009-11-16  Felix Zielcke  <fzielcke@z-51.de>
 +
 +      * util/mkisofs/name.c (iso9660_file_length): Use isascii macro
 +      instead of relying that char is signed.
 +
 +2009-11-16  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * fs/i386/pc/pxe.c (grub_pxefs_open): Correctly handle PXE choosing
 +      blocksize different from specified.
 +      (grub_pxefs_read): Likewise.
 +
 +2009-11-16  Felix Zielcke  <fzielcke@z-51.de>
 +
 +      Enable ata.mod on x86_64-efi, i386-efi and i386-ieee1275.
 +
 +      * disk/ata.c (grub_ata_dumpinfo): Add a cast.
 +      (grub_ata_readwrite): Likewise.  Update 2 format strings.
 +      (grub_atapi_read): Likewise.
 +
 +      * conf/i386-coreboot.rmk (pkglib_MODULES): Move `ata.mod' from here ...
 +      * conf/i386.rmk (pkglib_MODULES): ... to here ...
 +      * conf/x86_64-efi.rmk (pkglib_MODULES): ... and here.
 +      * conf/i386-coreboot.rmk (ata_mod_SOURCES, ata_mod_CFLAGS)
 +      (ata_mod_LDFLAGS): Move from here ...
 +      * conf/i386.rmk: ... to here ...
 +      * conf/x86_64-efi.rmk: ... and here.
 +      * conf/i386-pc.rmk (pkglib_MODULES): Remove `ata.mod'
 +      (ata_mod_SOURCES, ata_mod_CFLAGS, ata_mod_LDFLAGS): Remove.
 +
 +2009-11-16  Robert Millan  <rmh.grub@aybabtu.com>
 +
 +      Relicense multiboot.h, with RMS' blessing.
 +
 +      * include/multiboot.h: Change to X11 license.
 +
  2009-11-15  Robert Millan  <rmh.grub@aybabtu.com>
  
        Support --version in grub-mkisofs.

diff --cc INSTALL
index d1d17d1b5c11f96549a8b2a5bf9933a39fc737f5,74bf3d490a321c643f170ebc40501ce98becb171..e7f9e89368837a6b5a095edff61296d57d947b47
--- 1/INSTALL
--- 2/INSTALL
+++ b/INSTALL
@@@ -21,8 -21,8 +21,9 @@@ If you use a development snapshot or wa
  need the following.
  
  * Ruby 1.6 or later
 +* Python 2.5.2 or later
  * Autoconf 2.59d or later
+ * Automake 1.10.1 or later
  
  Configuring the GRUB
  ====================

diff --cc autogen.sh
index 94322b15e9fd19b8a559cbe46c3e3a1bcd1033f0,8e5a29215c62f60ed483d46df88eb55c927bf1de..5cbdbb489509830d251184fbbf60b67406cc230d
--- 1/autogen.sh
--- 2/autogen.sh
+++ b/autogen.sh
@@@ -2,13 -2,10 +2,14 @@@
  
  set -e
  
+ aclocal
  autoconf
  autoheader
 +
  echo timestamp > stamp-h.in
 +
 +python util/import_gcry.py lib/libgcrypt/ .
 +
  for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
    if test -e $rmk ; then
      ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`

diff --cc conf/common.rmk
index 54bec37b0c64eaaf8daa146dca020a5251a01aa0,57b47a6690681fcdfdead82eaa044b3b11057a97..9888ab7e05f8f8d943c57aac7bb7620cf9c7f85f
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -36,10 -36,9 +36,10 @@@ grub_mkisofs_SOURCES = util/mkisofs/elt
        util/mkisofs/rock.c util/mkisofs/tree.c                         \
        util/mkisofs/write.c                                            \
        \
 -      gnulib/fnmatch.c gnulib/getopt1.c gnulib/getopt.c
 +      gnulib/fnmatch.c gnulib/getopt1.c gnulib/getopt.c               \
 +      gnulib/error.c
  grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64                          \
-       -I$(srcdir)/util/mkisofs/include -I$(srcdir)/gnulib             \
+       -I$(srcdir)/util/mkisofs/include                                \
        -Wno-all -Werror
  
  # For grub-fstest.

diff --cc conf/i386-pc.rmk
Simple merge