From 694616c180b56d15e8da971f98d64f80a45e6c08 Mon Sep 17 00:00:00 2001 From: okuji Date: Mon, 13 Sep 1999 13:32:31 +0000 Subject: [PATCH] modify the implement of the maintainer mode. --- ChangeLog | 17 +++++ Makefile.in | 14 ++-- aclocal.m4 | 20 ++++++ configure | 168 ++++++++++++++++++++++++++++----------------- configure.in | 16 ++--- debian/Makefile.in | 4 +- docs/Makefile.am | 4 +- docs/Makefile.in | 14 ++-- docs/grub.8 | 6 ++ grub/Makefile.in | 4 +- stage1/Makefile.in | 4 +- stage2/Makefile.in | 4 +- stage2/disk_io.c | 6 +- stage2/pc_slice.h | 5 +- stamp-h.in | 1 + 15 files changed, 193 insertions(+), 94 deletions(-) diff --git a/ChangeLog b/ChangeLog index 128534499..533a450f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +1999-09-13 OKUJI Yoshinori + + * configure.in (--enable-maintainer-mode): Do not use our own + rule, but use AM_MAINTAINER_MODE instead. If the maintainer mode + is enabled, then check for perl, and if it is not found, print + an error message and abort. + * docs/Makefile.am (grub.8): Regenerated if MAINTAINER_MODE is + defined, instead of GRUB_MAINT. Use the variable PERL rather + than running help2man directly. + +1999-09-13 Pavel Roskin + + * stage2/pc_slice.h (IS_PC_SLICE_TYPE_EXTENDED): New macro. + * stage2/disk_io.c (real_open_partition): Use + IS_PC_SLICE_TYPE_EXTENDED instead of comparing CURRENT_SLICE + with the extended partition types. + 1999-09-11 Pavel Roskin * acconfig.h: New file for autoheader support. diff --git a/Makefile.in b/Makefile.in index a5b2ab6ae..1ec012d28 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67,9 +67,11 @@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ LD = @LD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ +PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ @@ -89,8 +91,8 @@ CONFIG_CLEAN_FILES = DIST_SOURCES = DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 \ -aclocal.m4 config.guess config.sub configure configure.in install-sh \ -missing mkinstalldirs +aclocal.m4 config.guess config.h.in config.sub configure configure.in \ +install-sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -98,19 +100,19 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): configure.in acinclude.m4 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) config.h: stamp-h @@ -125,7 +127,7 @@ stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status && CONFIG_FILES= CONFIG_HEADERS=config.h \ $(SHELL) ./config.status @mv stamp-hT stamp-h -$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/./stamp-h.in @if test ! -f $@; then \ rm -f $(srcdir)/./stamp-h.in; \ $(MAKE) $(srcdir)/./stamp-h.in; \ diff --git a/aclocal.m4 b/aclocal.m4 index c8ca7f238..8f1c325a6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -273,6 +273,26 @@ for am_file in <<$1>>; do done<<>>dnl>>) changequote([,]))]) +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# serial 1 + +AC_DEFUN(AM_MAINTAINER_MODE, +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + # Define a conditional. AC_DEFUN(AM_CONDITIONAL, diff --git a/configure b/configure index d69e42fb9..d7d401d45 100644 --- a/configure +++ b/configure @@ -12,8 +12,8 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --enable-maintainer-mode - enable the maintainer mode" + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" ac_help="$ac_help --disable-ext2fs disable ext2fs support in Stage 2" ac_help="$ac_help @@ -934,26 +934,68 @@ esac # Options # -# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:939: checking whether to enable maintainer-specific portions of Makefiles" >&5 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" - case "x${enableval}" in - xyes) maintainermode=yes ;; - xno) maintainermode=no ;; - *) { echo "configure: error: invalid value ${enableval} for --enable-maintainer-mode" 1>&2; exit 1; } ;; -esac + USE_MAINTAINER_MODE=$enableval else - maintainermode=no + USE_MAINTAINER_MODE=no fi + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + - -if test "x${maintainermode}" = xyes; then - GRUB_MAINT_TRUE= - GRUB_MAINT_FALSE='#' +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' else - GRUB_MAINT_TRUE='#' - GRUB_MAINT_FALSE= + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + MAINT=$MAINTAINER_MODE_TRUE + + +if test "x$enable_maintainer_mode" = xyes; then + # Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:965: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_path_PERL+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PERL" in + /*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PERL="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +PERL="$ac_cv_path_PERL" +if test -n "$PERL"; then + echo "$ac_t""$PERL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -z "$PERL"; then + { echo "configure: error: perl not found" 1>&2; exit 1; } + fi fi # This should be checked before AC_PROG_CC @@ -967,7 +1009,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:971: checking build system type" >&5 +echo "configure:1013: checking build system type" >&5 if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then # Make sure we can run config.sub. @@ -1014,7 +1056,7 @@ fi # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1018: checking for $ac_word" >&5 +echo "configure:1060: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1046,7 +1088,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1050: checking for $ac_word" >&5 +echo "configure:1092: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1076,7 +1118,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1080: checking for $ac_word" >&5 +echo "configure:1122: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1127,7 +1169,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1131: checking for $ac_word" >&5 +echo "configure:1173: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1159,7 +1201,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1163: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 +echo "configure:1205: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1170,12 +1212,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1174 "configure" +#line 1216 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1201,12 +1243,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1205: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1247: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1210: checking whether we are using GNU C" >&5 +echo "configure:1252: checking whether we are using GNU C" >&5 if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1215,7 +1257,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1234,7 +1276,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1238: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1280: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1268,7 +1310,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1272: checking for $ac_word" >&5 +echo "configure:1314: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_RANLIB+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1303,7 +1345,7 @@ if test "x$ac_cv_prog_gcc" = xyes; then STAGE1_CFLAGS="-O2" GRUB_CFLAGS="-O2" echo $ac_n "checking whether optimization for size works""... $ac_c" 1>&6 -echo "configure:1307: checking whether optimization for size works" >&5 +echo "configure:1349: checking whether optimization for size works" >&5 if eval "test \"\${size_flag+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,14 +1353,14 @@ else saved_CFLAGS=$CFLAGS CFLAGS="-Os -g" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* size_flag=yes else @@ -1351,7 +1393,7 @@ CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused" # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1355: checking for $ac_word" >&5 +echo "configure:1397: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_LD+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1383,7 +1425,7 @@ fi # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args. set dummy ${ac_tool_prefix}objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1387: checking for $ac_word" >&5 +echo "configure:1429: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_OBJCOPY+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1416,7 +1458,7 @@ fi # Defined in acinclude.m4. echo $ac_n "checking if C symbols get an underscore after compilation""... $ac_c" 1>&6 -echo "configure:1420: checking if C symbols get an underscore after compilation" >&5 +echo "configure:1462: checking if C symbols get an underscore after compilation" >&5 if eval "test \"\${grub_cv_asm_uscore+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1429,7 +1471,7 @@ func (int *list) } EOF -if { ac_try='${CC-cc} -S conftest.c'; { (eval echo configure:1433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then : +if { ac_try='${CC-cc} -S conftest.c'; { (eval echo configure:1475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then : else { echo "configure: error: ${CC-cc} failed to produce assembly code" 1>&2; exit 1; } fi @@ -1451,7 +1493,7 @@ fi echo "$ac_t""$grub_cv_asm_uscore" 1>&6 echo $ac_n "checking whether ${OBJCOPY} works for absolute addresses""... $ac_c" 1>&6 -echo "configure:1455: checking whether ${OBJCOPY} works for absolute addresses" >&5 +echo "configure:1497: checking whether ${OBJCOPY} works for absolute addresses" >&5 if eval "test \"\${grub_cv_prog_objcopy_absolute+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1463,21 +1505,21 @@ blah (void) } EOF -if { (eval echo configure:1467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then : +if { (eval echo configure:1509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then : else { echo "configure: error: ${CC-cc} cannot compile C source code" 1>&2; exit 1; } fi grub_cv_prog_objcopy_absolute=yes for link_addr in 2000 8000 7C00; do - if { ac_try='${LD-ld} -N -Ttext $link_addr conftest.o -o conftest.exec'; { (eval echo configure:1473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : + if { ac_try='${LD-ld} -N -Ttext $link_addr conftest.o -o conftest.exec'; { (eval echo configure:1515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : else { echo "configure: error: ${LD-ld} cannot link at address $link_addr" 1>&2; exit 1; } fi - if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : + if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : else { echo "configure: error: ${OBJCOPY-objcopy} cannot create binary files" 1>&2; exit 1; } fi - if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then mv -f conftest conftest.old else grub_cv_prog_objcopy_absolute=no @@ -1494,7 +1536,7 @@ fi echo $ac_n "checking for .code16 addr32 assembler support""... $ac_c" 1>&6 -echo "configure:1498: checking for .code16 addr32 assembler support" >&5 +echo "configure:1540: checking for .code16 addr32 assembler support" >&5 if eval "test \"\${grub_cv_asm_addr32+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1504,7 +1546,7 @@ l1: addr32 movb %al, l1 EOF -if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then +if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then grub_cv_asm_addr32=yes else grub_cv_asm_addr32=no @@ -1519,7 +1561,7 @@ fi echo $ac_n "checking whether addr32 must be in the same line as the instruction""... $ac_c" 1>&6 -echo "configure:1523: checking whether addr32 must be in the same line as the instruction" >&5 +echo "configure:1565: checking whether addr32 must be in the same line as the instruction" >&5 if eval "test \"\${grub_cv_asm_prefix_requirement+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1528,7 +1570,7 @@ else l1: addr32 movb %al, l1 EOF -if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then +if { ac_try='${CC-cc} -c conftest.s'; { (eval echo configure:1574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then grub_cv_asm_prefix_requirement=yes else grub_cv_asm_prefix_requirement=no @@ -1559,7 +1601,7 @@ fi # Check for curses libraries. echo $ac_n "checking for wgetch in -lncurses""... $ac_c" 1>&6 -echo "configure:1563: checking for wgetch in -lncurses" >&5 +echo "configure:1605: checking for wgetch in -lncurses" >&5 ac_lib_var=`echo ncurses'_'wgetch | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1567,7 +1609,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1601,7 +1643,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wgetch in -lcurses""... $ac_c" 1>&6 -echo "configure:1605: checking for wgetch in -lcurses" >&5 +echo "configure:1647: checking for wgetch in -lcurses" >&5 ac_lib_var=`echo curses'_'wgetch | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1609,7 +1651,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1650,7 +1692,7 @@ fi # Check for headers. echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1654: checking how to run the C preprocessor" >&5 +echo "configure:1696: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1665,13 +1707,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1682,13 +1724,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1699,13 +1741,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1733,17 +1775,17 @@ for ac_hdr in string.h strings.h ncurses/curses.h ncurses.h curses.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1737: checking for $ac_hdr" >&5 +echo "configure:1779: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1986,8 +2028,10 @@ s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g s%@host_vendor@%$host_vendor%g s%@host_os@%$host_os%g -s%@GRUB_MAINT_TRUE@%$GRUB_MAINT_TRUE%g -s%@GRUB_MAINT_FALSE@%$GRUB_MAINT_FALSE%g +s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g +s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g +s%@MAINT@%$MAINT%g +s%@PERL@%$PERL%g s%@build@%$build%g s%@build_alias@%$build_alias%g s%@build_cpu@%$build_cpu%g diff --git a/configure.in b/configure.in index 3eb02da64..e13ea8157 100644 --- a/configure.in +++ b/configure.in @@ -34,15 +34,13 @@ AC_SUBST(host_vendor) # Options # -AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode - enable the maintainer mode], -[case "x${enableval}" in - xyes) maintainermode=yes ;; - xno) maintainermode=no ;; - *) AC_MSG_ERROR(invalid value ${enableval} for --enable-maintainer-mode) ;; -esac],[maintainermode=no]) -AM_CONDITIONAL(GRUB_MAINT, test "x${maintainermode}" = xyes) +AM_MAINTAINER_MODE +if test "x$enable_maintainer_mode" = xyes; then + AC_PATH_PROG(PERL,perl) + if test -z "$PERL"; then + AC_MSG_ERROR([perl not found]) + fi +fi # This should be checked before AC_PROG_CC if test "x$CFLAGS" = x; then diff --git a/debian/Makefile.in b/debian/Makefile.in index 0b95a104b..6fac16a45 100644 --- a/debian/Makefile.in +++ b/debian/Makefile.in @@ -67,9 +67,11 @@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ LD = @LD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ +PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ @@ -93,7 +95,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu debian/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/docs/Makefile.am b/docs/Makefile.am index 8b469bc34..1c885ce8a 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -11,8 +11,8 @@ grub.info: grub.texi cd $(srcdir) \ && sed 's/@command/@file/g; s/ifnottex/ifinfo/' grub.texi | $(MAKEINFO) -if GRUB_MAINT +if MAINTAINER_MODE $(srcdir)/grub.8: ../grub/grub $(srcdir)/$(HELP2MAN) - $(srcdir)/$(HELP2MAN) --name="the grub shell" \ + $(PERL) $(srcdir)/$(HELP2MAN) --name="the grub shell" \ --section=8 --output=$@ $< endif diff --git a/docs/Makefile.in b/docs/Makefile.in index e6e5af690..40787677f 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -67,9 +67,11 @@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ LD = @LD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ +PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ @@ -110,7 +112,7 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: .SUFFIXES: .dvi .info .ps .texi .texinfo .txi -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) @@ -118,7 +120,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(srcdir)/version.texi: stamp-vti +$(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@stamp-vti @: $(srcdir)/stamp-vti: grub.texi $(top_srcdir)/configure.in @@ -139,7 +141,7 @@ clean-vti: distclean-vti: maintainer-clean-vti: - -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi + -@MAINTAINER_MODE_TRUE@rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi grub.info: grub.texi version.texi grub.dvi: grub.texi version.texi @@ -405,9 +407,9 @@ grub.info: grub.texi cd $(srcdir) \ && sed 's/@command/@file/g; s/ifnottex/ifinfo/' grub.texi | $(MAKEINFO) -@GRUB_MAINT_TRUE@$(srcdir)/grub.8: ../grub/grub $(srcdir)/$(HELP2MAN) -@GRUB_MAINT_TRUE@ $(srcdir)/$(HELP2MAN) --name="the grub shell" \ -@GRUB_MAINT_TRUE@ --section=8 --output=$@ $< +@MAINTAINER_MODE_TRUE@$(srcdir)/grub.8: ../grub/grub $(srcdir)/$(HELP2MAN) +@MAINTAINER_MODE_TRUE@ $(PERL) $(srcdir)/$(HELP2MAN) --name="the grub shell" \ +@MAINTAINER_MODE_TRUE@ --section=8 --output=$@ $< # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/docs/grub.8 b/docs/grub.8 index 3bf9bfd05..bd8388121 100644 --- a/docs/grub.8 +++ b/docs/grub.8 @@ -33,6 +33,12 @@ do not use the config file \fB\-\-no\-curses\fR do not use curses .TP +\fB\-\-no\-floppy\fR +do not probe any floppy drive +.TP +\fB\-\-probe\-second\-floppy\fR +probe the second floppy drive +.TP \fB\-\-read\-only\fR do not write anything to devices .TP diff --git a/grub/Makefile.in b/grub/Makefile.in index bd4473667..75b3ed45c 100644 --- a/grub/Makefile.in +++ b/grub/Makefile.in @@ -67,9 +67,11 @@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ LD = @LD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ +PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ @@ -121,7 +123,7 @@ OBJECTS = $(am_grub_OBJECTS) all: all-redirect .SUFFIXES: .SUFFIXES: .c .h .o -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu grub/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/stage1/Makefile.in b/stage1/Makefile.in index 0111ff98c..a6e696679 100644 --- a/stage1/Makefile.in +++ b/stage1/Makefile.in @@ -65,9 +65,11 @@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ LD = @LD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ +PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ @@ -128,7 +130,7 @@ OBJECTS = $(am_stage1_exec_OBJECTS) $(am_stage1_lba_exec_OBJECTS) all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .h .o -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu stage1/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/stage2/Makefile.in b/stage2/Makefile.in index ae54521f5..c3658a3c6 100644 --- a/stage2/Makefile.in +++ b/stage2/Makefile.in @@ -65,9 +65,11 @@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ LD = @LD@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ OBJCOPY = @OBJCOPY@ PACKAGE = @PACKAGE@ +PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ @@ -253,7 +255,7 @@ OBJECTS = $(am_libgrub_a_OBJECTS) $(am_e2fs_stage1_5_exec_OBJECTS) $(am_fat_stag all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .o -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu stage2/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/stage2/disk_io.c b/stage2/disk_io.c index 05e57b72a..23fc821f2 100644 --- a/stage2/disk_io.c +++ b/stage2/disk_io.c @@ -511,8 +511,7 @@ real_open_partition (int flags) /* * Is this an extended partition? */ - if (current_slice == PC_SLICE_TYPE_EXTENDED - || current_slice == PC_SLICE_TYPE_WIN95_EXTENDED) + if (IS_PC_SLICE_TYPE_EXTENDED (current_slice)) { if (ext == -1) { @@ -560,8 +559,7 @@ real_open_partition (int flags) * to one per valid entry. */ if (slice_no < PC_SLICE_MAX - || (current_slice != PC_SLICE_TYPE_EXTENDED - && current_slice != PC_SLICE_TYPE_EXTENDED + || (! IS_PC_SLICE_TYPE_EXTENDED (current_slice) && current_slice != PC_SLICE_TYPE_NONE)) slice_no++; } diff --git a/stage2/pc_slice.h b/stage2/pc_slice.h index 05f815081..077391c2b 100644 --- a/stage2/pc_slice.h +++ b/stage2/pc_slice.h @@ -117,7 +117,10 @@ || ((type) == PC_SLICE_TYPE_FAT16_LBA) \ || ((type) == PC_SLICE_TYPE_FAT32) \ || ((type) == PC_SLICE_TYPE_FAT32_LBA)) - + +#define IS_PC_SLICE_TYPE_EXTENDED(type) \ + (((type) == PC_SLICE_TYPE_EXTENDED) \ + || ((type) == PC_SLICE_TYPE_WIN95_EXTENDED)) /* these ones are special, as they use thier own partitioning scheme to subdivide the PC partitions from there. */ diff --git a/stamp-h.in b/stamp-h.in index e69de29bb..9788f7023 100644 --- a/stamp-h.in +++ b/stamp-h.in @@ -0,0 +1 @@ +timestamp