2005-01-30 Yoshinori K. Okuji <okuji@enbug.org>

        * configure.ac (AC_INIT): Upgraded to 0.96.

diff --git a/ChangeLog b/ChangeLog
index 882d871bb2f7a0a8c22cb5518bf64f1cca8e107a..acae8f7da04425c7eb49e9593d45f00281400860 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
+2005-01-30  Yoshinori K. Okuji  <okuji@enbug.org>
+
+        * configure.ac (AC_INIT): Upgraded to 0.96.
+
 2004-10-11 Jason Thomas <jason@staff.pnc.com.au>
+
        Patch from Stefanus Du Toit  <sjdutoit@uwaterloo.ca>
        * docs/kernel.c.texi (cmain): Incremement mod by one, instead of
        sizeof(module_t), since it's already a pointer of type module_t.

diff --git a/NEWS b/NEWS
index d0660c9e5caf843c615befd6e19ca9b9db016c94..fd75e7dc039fc2796a8d6580bc59941979ab15a5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 NEWS - list of user-visible changes between releases of GRUB
 
-New:
+New in 0.96 - 2005-01-30:
 * The command "fallback" supports mutiple fallback entries.
 * The command "savedefault" supports an optional argument which
   is the number of next boot entry or the special keyword `fallback'.

diff --git a/aclocal.m4 b/aclocal.m4
index c2245d86da93789e2722c20c4017af2f72ae11df..f9101126b1d7ace626ada07fa8fa748c573cd28b 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-        [AM_AUTOMAKE_VERSION([1.8.2])])
+        [AM_AUTOMAKE_VERSION([1.8.5])])
 
 # AM_AUX_DIR_EXPAND
 
@@ -149,7 +149,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.])
 fi])])
 
-# serial 6                                             -*- Autoconf -*-
+# serial 7                                             -*- Autoconf -*-
 
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -236,7 +236,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
@@ -264,9 +266,14 @@ AC_CACHE_CHECK([dependency style of $depcc],
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_$1_dependencies_compiler_type=$depmode
         break
       fi
@@ -312,7 +319,7 @@ AC_SUBST([AMDEPBACKSLASH])
 
 # Generate code to set up dependency tracking.   -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 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
@@ -351,14 +358,14 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
   # Extract the definition of DEP_FILES from the Makefile without
   # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
   # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
+  U=`sed -n 's/^U = //p' < "$mf"`
   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
   # We invoke sed twice because it is the simplest approach to
   # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
+  for file in `sed -n '
     /^DEP_FILES = .*\\\\$/ {
       s/^DEP_FILES = //
       :loop
@@ -757,8 +764,16 @@ fi
 #
 # Do not use -m 0755 and let people choose whatever they expect by
 # setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out.  Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p -- . 2>/dev/null; then
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
   # Keeping the `.' argument allows $(mkdir_p) to be used without
   # argument.  Indeed, we sometimes output rules like
   #   $(mkdir_p) $(somedir)
@@ -771,7 +786,7 @@ else
   # recognize any option.  It will interpret all options as
   # directories to create, and then abort because `.' already
   # exists.
-  for d in ./-p ./--;
+  for d in ./-p ./--version;
   do
     test -d $d && rmdir $d
   done

diff --git a/configure b/configure
index c69ebf946e9118fe5570d80abe0b19b4d72b74cc..fea6afefcc91f53576612d6d499ad7bd4e46fd66 100644 (file)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GRUB 0.95.
+# Generated by GNU Autoconf 2.59 for GRUB 0.96.
 #
 # Report bugs to <bug-grub@gnu.org>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GRUB'
 PACKAGE_TARNAME='grub'
-PACKAGE_VERSION='0.95'
-PACKAGE_STRING='GRUB 0.95'
+PACKAGE_VERSION='0.96'
+PACKAGE_STRING='GRUB 0.96'
 PACKAGE_BUGREPORT='bug-grub@gnu.org'
 
 ac_unique_file="stage2/stage2.c"
@@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GRUB 0.95 to adapt to many kinds of systems.
+\`configure' configures GRUB 0.96 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -846,7 +846,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GRUB 0.95:";;
+     short | recursive ) echo "Configuration of GRUB 0.96:";;
    esac
   cat <<\_ACEOF
 
@@ -1039,7 +1039,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GRUB configure 0.95
+GRUB configure 0.96
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1053,7 +1053,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GRUB $as_me 0.95, which was
+It was created by GRUB $as_me 0.96, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1568,7 +1568,7 @@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p -- . 2>/dev/null; then
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
   # Keeping the `.' argument allows $(mkdir_p) to be used without
   # argument.  Indeed, we sometimes output rules like
   #   $(mkdir_p) $(somedir)
@@ -1581,7 +1581,7 @@ else
   # recognize any option.  It will interpret all options as
   # directories to create, and then abort because `.' already
   # exists.
-  for d in ./-p ./--;
+  for d in ./-p ./--version;
   do
     test -d $d && rmdir $d
   done
@@ -1691,7 +1691,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='grub'
- VERSION='0.95'
+ VERSION='0.96'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3087,7 +3087,9 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
@@ -3115,9 +3117,14 @@ else
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CC_dependencies_compiler_type=$depmode
         break
       fi
@@ -3191,7 +3198,9 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
@@ -3219,9 +3228,14 @@ else
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CC_dependencies_compiler_type=$depmode
         break
       fi
@@ -6543,7 +6557,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GRUB $as_me 0.95, which was
+This file was extended by GRUB $as_me 0.96, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6606,7 +6620,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GRUB config.status 0.95
+GRUB config.status 0.96
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -7519,14 +7533,14 @@ echo X"$mf" |
   grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
   # Extract the definition of DEP_FILES from the Makefile without
   # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
   # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
+  U=`sed -n 's/^U = //p' < "$mf"`
   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
   # We invoke sed twice because it is the simplest approach to
   # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
+  for file in `sed -n '
     /^DEP_FILES = .*\\\\$/ {
       s/^DEP_FILES = //
       :loop

diff --git a/configure.ac b/configure.ac
index 7e337e02a63dc40bed45d540068dc711823d88ee..8b753f7c6e1563aec0203b345cb7ec022a488ba0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Configure script for GRUB.
-dnl Copyright 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
+dnl Copyright 1999,2000,2001,2002,2003,2004,2005 Free Software Foundation, Inc.
 
 dnl Permission to use, copy, modify and distribute this software and its
 dnl documentation is hereby granted, provided that both the copyright
@@ -13,7 +13,7 @@ dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
 dnl USE OF THIS SOFTWARE.
 
 AC_PREREQ(2.57)
-AC_INIT([GRUB], [0.95], [bug-grub@gnu.org])
+AC_INIT([GRUB], [0.96], [bug-grub@gnu.org])
 AC_CONFIG_SRCDIR([stage2/stage2.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE

diff --git a/docs/grub-install.8 b/docs/grub-install.8
index f23e5161517027c43158d8478fca4ff95259d530..d29bdd4637c467d8d3d7c51810569a29b6a69701 100644 (file)
--- a/docs/grub-install.8
+++ b/docs/grub-install.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-INSTALL "8" "August 2004" "grub-install (GNU GRUB 0.95)" FSF
+.TH GRUB-INSTALL "8" "January 2005" "grub-install (GNU GRUB 0.96)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS

diff --git a/docs/grub-md5-crypt.8 b/docs/grub-md5-crypt.8
index 00a5dba3076b5bdd1e4073addb25591205a92401..a3b3ab731aef3162472fc89b874deb3e4c593808 100644 (file)
--- a/docs/grub-md5-crypt.8
+++ b/docs/grub-md5-crypt.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-MD5-CRYPT "8" "June 2004" "grub-md5-crypt (GNU GRUB )" FSF
+.TH GRUB-MD5-CRYPT "8" "January 2005" "grub-md5-crypt (GNU GRUB )" FSF
 .SH NAME
 grub-md5-crypt \- Encrypt a password in MD5 format
 .SH SYNOPSIS

diff --git a/docs/grub-terminfo.8 b/docs/grub-terminfo.8
index 244d6afe2458ac150ad9d61c85d63a5d303d6d80..b3e211bd5ddce4182a217733ad5b20cd39cb803c 100644 (file)
--- a/docs/grub-terminfo.8
+++ b/docs/grub-terminfo.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-TERMINFO "8" "June 2004" "grub-terminfo (GNU GRUB 0.95)" FSF
+.TH GRUB-TERMINFO "8" "January 2005" "grub-terminfo (GNU GRUB 0.96)" FSF
 .SH NAME
 grub-terminfo \- Generate a terminfo command from a terminfo name
 .SH SYNOPSIS

diff --git a/docs/grub.8 b/docs/grub.8
index 6a31e656443111cf5ab165c43aef8986095a6fd4..6ee209533c0e9b43abe348f46d4c43bc39ae651b 100644 (file)
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB "8" "August 2004" "grub (GNU GRUB 0.95)" FSF
+.TH GRUB "8" "January 2005" "grub (GNU GRUB 0.96)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS

diff --git a/docs/mbchk.1 b/docs/mbchk.1
index 3a5e3188162504084ea9d98569f7d194aedc1b40..ce634216da938698cf565d4225f6344c51eee7c5 100644 (file)
--- a/docs/mbchk.1
+++ b/docs/mbchk.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH MBCHK "1" "June 2004" "mbchk (GNU GRUB 0.95)" FSF
+.TH MBCHK "1" "January 2005" "mbchk (GNU GRUB 0.96)" FSF
 .SH NAME
 mbchk \- check the format of a Multiboot kernel
 .SH SYNOPSIS

diff --git a/docs/stamp-vti b/docs/stamp-vti
index 6b078b2ef8f020fe40d19f02b6ce07c3a65a733d..4c2dbd4f7221c8a298559e9b54c1e64765c0077f 100644 (file)
--- a/docs/stamp-vti
+++ b/docs/stamp-vti
@@ -1,4 +1,4 @@
 @set UPDATED 20 September 2004
 @set UPDATED-MONTH September 2004
-@set EDITION 0.95
-@set VERSION 0.95
+@set EDITION 0.96
+@set VERSION 0.96

diff --git a/docs/version.texi b/docs/version.texi
index 6b078b2ef8f020fe40d19f02b6ce07c3a65a733d..4c2dbd4f7221c8a298559e9b54c1e64765c0077f 100644 (file)
--- a/docs/version.texi
+++ b/docs/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 20 September 2004
 @set UPDATED-MONTH September 2004
-@set EDITION 0.95
-@set VERSION 0.95
+@set EDITION 0.96
+@set VERSION 0.96