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

* configure.ac (AC_INIT): Upgraded to 0.96.
This commit is contained in:
okuji 2005-01-30 01:09:34 +00:00
parent cce5686ea2
commit eb5d4d6776
12 changed files with 82 additions and 48 deletions

View file

@ -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> 2004-10-11 Jason Thomas <jason@staff.pnc.com.au>
Patch from Stefanus Du Toit <sjdutoit@uwaterloo.ca> Patch from Stefanus Du Toit <sjdutoit@uwaterloo.ca>
* docs/kernel.c.texi (cmain): Incremement mod by one, instead of * docs/kernel.c.texi (cmain): Incremement mod by one, instead of
sizeof(module_t), since it's already a pointer of type module_t. sizeof(module_t), since it's already a pointer of type module_t.

2
NEWS
View file

@ -1,6 +1,6 @@
NEWS - list of user-visible changes between releases of GRUB 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 "fallback" supports mutiple fallback entries.
* The command "savedefault" supports an optional argument which * The command "savedefault" supports an optional argument which
is the number of next boot entry or the special keyword `fallback'. is the number of next boot entry or the special keyword `fallback'.

41
aclocal.m4 vendored
View file

@ -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 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc. # 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. # Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.8.2])]) [AM_AUTOMAKE_VERSION([1.8.5])])
# AM_AUX_DIR_EXPAND # AM_AUX_DIR_EXPAND
@ -149,7 +149,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]) Usually this means the macro was only invoked conditionally.])
fi])]) fi])])
# serial 6 -*- Autoconf -*- # serial 7 -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
@ -236,7 +236,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
: > sub/conftest.c : > sub/conftest.c
for i in 1 2 3 4 5 6; do for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c 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 done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf 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 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings # icc doesn't choke on unknown options, it will just issue warnings
# (even with -Werror). So we grep stderr for any message # or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored. # that says an option was ignored or not supported.
if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else # 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 am_cv_$1_dependencies_compiler_type=$depmode
break break
fi fi
@ -312,7 +319,7 @@ AC_SUBST([AMDEPBACKSLASH])
# Generate code to set up dependency tracking. -*- Autoconf -*- # 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 # 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 # 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 grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
# Extract the definition of DEP_FILES from the Makefile without # Extract the definition of DEP_FILES from the Makefile without
# running `make'. # running `make'.
DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue test -z "$DEPDIR" && continue
# When using ansi2knr, U may be empty or an underscore; expand it # 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" test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
# We invoke sed twice because it is the simplest approach to # We invoke sed twice because it is the simplest approach to
# changing $(DEPDIR) to its actual value in the expansion. # changing $(DEPDIR) to its actual value in the expansion.
for file in `sed -n -e ' for file in `sed -n '
/^DEP_FILES = .*\\\\$/ { /^DEP_FILES = .*\\\\$/ {
s/^DEP_FILES = // s/^DEP_FILES = //
:loop :loop
@ -757,8 +764,16 @@ fi
# #
# Do not use -m 0755 and let people choose whatever they expect by # Do not use -m 0755 and let people choose whatever they expect by
# setting umask. # 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], 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 # Keeping the `.' argument allows $(mkdir_p) to be used without
# argument. Indeed, we sometimes output rules like # argument. Indeed, we sometimes output rules like
# $(mkdir_p) $(somedir) # $(mkdir_p) $(somedir)
@ -771,7 +786,7 @@ else
# recognize any option. It will interpret all options as # recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already # directories to create, and then abort because `.' already
# exists. # exists.
for d in ./-p ./--; for d in ./-p ./--version;
do do
test -d $d && rmdir $d test -d $d && rmdir $d
done done

60
configure vendored
View file

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

View file

@ -1,5 +1,5 @@
dnl Configure script for GRUB. 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 Permission to use, copy, modify and distribute this software and its
dnl documentation is hereby granted, provided that both the copyright 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. dnl USE OF THIS SOFTWARE.
AC_PREREQ(2.57) 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_SRCDIR([stage2/stage2.c])
AC_CONFIG_HEADER([config.h]) AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE

View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. .\" 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 .SH NAME
grub-install \- install GRUB on your drive grub-install \- install GRUB on your drive
.SH SYNOPSIS .SH SYNOPSIS

View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. .\" 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 .SH NAME
grub-md5-crypt \- Encrypt a password in MD5 format grub-md5-crypt \- Encrypt a password in MD5 format
.SH SYNOPSIS .SH SYNOPSIS

View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. .\" 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 .SH NAME
grub-terminfo \- Generate a terminfo command from a terminfo name grub-terminfo \- Generate a terminfo command from a terminfo name
.SH SYNOPSIS .SH SYNOPSIS

View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. .\" 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 .SH NAME
grub \- the grub shell grub \- the grub shell
.SH SYNOPSIS .SH SYNOPSIS

View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. .\" 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 .SH NAME
mbchk \- check the format of a Multiboot kernel mbchk \- check the format of a Multiboot kernel
.SH SYNOPSIS .SH SYNOPSIS

View file

@ -1,4 +1,4 @@
@set UPDATED 20 September 2004 @set UPDATED 20 September 2004
@set UPDATED-MONTH September 2004 @set UPDATED-MONTH September 2004
@set EDITION 0.95 @set EDITION 0.96
@set VERSION 0.95 @set VERSION 0.96

View file

@ -1,4 +1,4 @@
@set UPDATED 20 September 2004 @set UPDATED 20 September 2004
@set UPDATED-MONTH September 2004 @set UPDATED-MONTH September 2004
@set EDITION 0.95 @set EDITION 0.96
@set VERSION 0.95 @set VERSION 0.96