diff --git a/ChangeLog b/ChangeLog index c2869717e..0d07f5676 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +2000-07-29 OKUJI Yoshinori + + * configure.in (CPPFLAGS): Added -Wshadow, -Wpointer-arith and + -Wundef, as GCC sometimes more clever than me. :) + * stage2/shared.h [!ASM_FILE] (multi_boot): Change the name of + the second argument from "mbi" to "mb_info". + [!ASM_FILE] (biosdisk): Rename the first argument "read" to + "subfunc". + * lib/device.h (init_device_map): Change the name of the third + argument from "floppy_disks" to "no_floppies". + * lib/device.c (read_device_map): Rename the internal function + "print_error" to "show_error". + * stage2/builtins.c (install_func): Rename CONFIG_FILE to + REAL_CONFIG. + (setup_func): Rename INSTALL_DRIVE, INSTALL_PARTITION and + CONFIG_FILE to INSTALLED_DRIVE, INSTALLED_PARTITION and + CONFIG_FILENAME, respectively. + * stage2/char_io.c (convert_to_ascii): Rename the internal + variable C to TMP. + (get_cmdline): Rename KILL to KILL_BUF. + Rename the second argument for cl_print to REAL_ECHO_CHAR from + ECHO_CHAR. + * stage2/stage2.c (run_menu): Rename the internal variable + NUM_ENTRIES to NEW_NUM_ENTRIES. + (cmain): Rename KILL to KILL_BUF. + * stage2/disk_inode_ffs.h: Check if BYTE_MSF is defined before + checking the value. + * stage2/fsys_ext2fs.c (ext2fs_dir): Check if E2DEBUG is + defined, instead of if the value is non-zero. + * grub/asmstub.c: Check if __GLIBC__ is defined before checking + the value. + (biosdisk) [__linux__]: Likewise. + Rename the first argument for _llseek to "seeked_fd" from "fd". + (multi_boot): Rename the second argument to "mb_info" from + "mbi". + 2000-07-27 Gordon Matzigkeit * util/grub-image.in: Initial cut at a script for creating GRUB diff --git a/config.h.in b/config.h.in index d04a7eb0a..56db8bd27 100644 --- a/config.h.in +++ b/config.h.in @@ -27,44 +27,36 @@ /* Defined if an absolute indirect call/jump must NOT be prefixed with `*'. */ #undef ABSOLUTE_WITHOUT_ASTERISK -/* Define it to "addr32" or "addr32;" to make GAS happy */ -#undef ADDR32 - -/* Define it to "data32" or "data32;" to make GAS happy */ -#undef DATA32 - -/* Define if C symbols get an underscore after compilation */ -#undef HAVE_ASM_USCORE - -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_CURSES_H -/* Define if you have the `curses' library (-lcurses). */ -#undef HAVE_LIBCURSES - -/* Define if you have the `ncurses' library (-lncurses). */ -#undef HAVE_LIBNCURSES - -/* Define if you have the `util' library (-lutil). */ -#undef HAVE_LIBUTIL - -/* Define if you have the header file. */ -#undef HAVE_NCURSES_CURSES_H - -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_NCURSES_H -/* Define if opendisk() in -lutil can be used */ -#undef HAVE_OPENDISK +/* Define if you have the header file. */ +#undef HAVE_NCURSES_CURSES_H -/* Define if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_STRING_H +/* Define if you have the header file. */ +#undef HAVE_STRINGS_H + /* Name of package */ #undef PACKAGE /* Version number of package */ #undef VERSION + +/* Define if C symbols get an underscore after compilation */ +#undef HAVE_ASM_USCORE + +/* Define it to "addr32" or "addr32;" to make GAS happy */ +#undef ADDR32 + +/* Define it to "data32" or "data32;" to make GAS happy */ +#undef DATA32 + +/* Define if opendisk() in -lutil can be used */ +#undef HAVE_OPENDISK + diff --git a/configure b/configure index 6acdc0eb5..74ec472c5 100644 --- a/configure +++ b/configure @@ -1,18 +1,118 @@ #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using Autoconf version 2.14a. -# Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000 -# Free Software Foundation, Inc. +# Generated automatically using autoconf version 2.13 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. + # Defaults: +ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors" +ac_help="$ac_help + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" +ac_help="$ac_help + --with-binutils=DIR search the directory DIR to find binutils" +ac_help="$ac_help + --without-curses do not use curses" +ac_help="$ac_help + --disable-ext2fs disable ext2fs support in Stage 2" +ac_help="$ac_help + --disable-fat disable FAT support in Stage 2" +ac_help="$ac_help + --disable-ffs disable FFS support in Stage 2" +ac_help="$ac_help + --disable-minix disable Minix fs support in Stage 2" +ac_help="$ac_help + --disable-reiserfs disable ReiserFS support in Stage 2" +ac_help="$ac_help + --disable-gunzip disable decompression in Stage 2" +ac_help="$ac_help + --disable-packet-retransmission + turn off packet retransmission" +ac_help="$ac_help + --enable-pci-direct access PCI directly instead of using BIOS" +ac_help="$ac_help + --enable-3c509 enable 3Com509 driver" +ac_help="$ac_help + --enable-3c529 enable 3Com529 driver" +ac_help="$ac_help + --enable-3c590 enable 3Com590 driver" +ac_help="$ac_help + --enable-3c595 enable 3Com595 driver" +ac_help="$ac_help + --enable-3c90x enable 3Com90x driver" +ac_help="$ac_help + --enable-cs89x0 enable CS89x0 driver" +ac_help="$ac_help + --enable-depca enable DEPCA and EtherWORKS driver" +ac_help="$ac_help + --enable-eepro100 enable Etherexpress Pro/100 driver" +ac_help="$ac_help + --enable-epic100 enable SMC 83c170 EPIC/100 driver" +ac_help="$ac_help + --enable-3c507 enable 3Com507 driver" +ac_help="$ac_help + --enable-exos205 enable EXOS205 driver" +ac_help="$ac_help + --enable-ni5210 enable Racal-Interlan NI5210 driver" +ac_help="$ac_help + --enable-lance enable Lance PCI PCNet/32 driver" +ac_help="$ac_help + --enable-ne2100 enable Novell NE2100 driver" +ac_help="$ac_help + --enable-ni6510 enable Racal-Interlan NI6510 driver" +ac_help="$ac_help + --enable-3c503 enable 3Com503 driver" +ac_help="$ac_help + --enable-ne enable NE1000/2000 ISA driver" +ac_help="$ac_help + --enable-ns8390 enable NE2000 PCI driver" +ac_help="$ac_help + --enable-wd enable WD8003/8013, SMC8216/8416 driver" +ac_help="$ac_help + --enable-otulip enable old Tulip driver" +ac_help="$ac_help + --enable-rtl8139 enable Realtek 8139 driver" +ac_help="$ac_help + --enable-sk-g16 enable Schneider and Koch G16 driver" +ac_help="$ac_help + --enable-smc9000 enable SMC9000 driver" +ac_help="$ac_help + --enable-tiara enable Tiara driver" +ac_help="$ac_help + --enable-tulip enable Tulip driver" +ac_help="$ac_help + --enable-via-rhine enable Rhine-I/II driver" +ac_help="$ac_help + --enable-3c503-shmem use 3c503 shared memory mode" +ac_help="$ac_help + --enable-3c503-aui use AUI by default on 3c503 cards" +ac_help="$ac_help + --enable-3c509-hack make a 3c509 do bootp quicker" +ac_help="$ac_help + --enable-compex-rl2000-fix + specify this if you have a Compex RL2000 PCI" +ac_help="$ac_help + --enable-smc9000-scan=LIST + probe for SMC9000 I/O addresses using LIST" +ac_help="$ac_help + --enable-ne-scan=LIST probe for NE base address using LIST" +ac_help="$ac_help + --enable-wd-default-mem=MEM + set the default memory location for WD/SMC" +ac_help="$ac_help + --enable-cs-scan=LIST probe for CS89x0 base address using LIST" +ac_help="$ac_help + --enable-diskless enable diskless support" # Initialize some variables set by options. -ac_init_help=false -ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. build=NONE @@ -51,14 +151,12 @@ subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. -: ${ac_max_here_lines=48} -# Sed expression to map a string onto a valid sh and CPP variable names. -ac_tr_sh='sed -e y%*+%pp%;s%[^a-zA-Z0-9_]%_%g' -ac_tr_cpp='sed -e y%*abcdefghijklmnopqrstuvwxyz%PABCDEFGHIJKLMNOPQRSTUVWXYZ%;s%[^A-Z0-9_]%_%g' +ac_max_here_lines=12 ac_prev= for ac_option do + # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then eval "$ac_prev=\$ac_option" @@ -66,7 +164,10 @@ do continue fi - ac_optarg=`echo "$ac_option" | sed -n 's/^[^=]*=//p'` + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -96,23 +197,23 @@ do datadir="$ac_optarg" ;; -disable-* | --disable-*) - ac_feature=`echo "$ac_option"|sed -e 's/-*disable-//'` + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. - if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then - { echo "configure: error: invalid feature: $ac_feature" 1>&2; exit 1; } + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } fi ac_feature=`echo $ac_feature| sed 's/-/_/g'` eval "enable_${ac_feature}=no" ;; -enable-* | --enable-*) - ac_feature=`echo "$ac_option"|sed -e 's/-*enable-//' -e 's/=.*//'` + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then - { echo "configure: error: invalid feature: $ac_feature" 1>&2; exit 1; } + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } fi ac_feature=`echo $ac_feature| sed 's/-/_/g'` case "$ac_option" in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *=*) ;; *) ac_optarg=yes ;; esac eval "enable_${ac_feature}='$ac_optarg'" ;; @@ -130,8 +231,61 @@ do # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he | -h) - ac_init_help=: ;; + -help | --help | --hel | --he) + # 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 << EOF +Usage: configure [options] [host] +Options: [defaults in brackets after descriptions] +Configuration: + --cache-file=FILE cache test results in FILE + --help print this message + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages + --version print the version of autoconf that created configure +Directory and file names: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] +Features and packages: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi + exit 0 ;; + -host | --host | --hos | --ho) ac_prev=host ;; -host=* | --host=* | --hos=* | --ho=*) @@ -278,27 +432,28 @@ do -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.13" + exit 0 ;; -with-* | --with-*) - ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'` + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then - { echo "configure: error: invalid package: $ac_package" 1>&2; exit 1; } + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } fi ac_package=`echo $ac_package| sed 's/-/_/g'` case "$ac_option" in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *=*) ;; *) ac_optarg=yes ;; esac eval "with_${ac_package}='$ac_optarg'" ;; -without-* | --without-*) - ac_package=`echo "$ac_option"|sed -e 's/-*without-//'` + ac_package=`echo $ac_option|sed -e 's/-*without-//'` # Reject names that are not valid shell variable names. - if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then - { echo "configure: error: invalid package: $ac_package" 1>&2; exit 1; } + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } fi ac_package=`echo $ac_package| sed 's/-/_/g'` eval "with_${ac_package}=no" ;; @@ -321,23 +476,12 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries="$ac_optarg" ;; - -*) { echo "configure: error: unrecognized option: $ac_option -Try \`configure --help' for more information." 1>&2; exit 1; } + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *=*) - ac_envvar=`echo "$ac_option" | sed -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if echo "$ac_envvar" | grep '[^a-zA-Z0-9_]' >/dev/null 2>&1; then - { echo "configure: error: invalid variable name: $ac_envvar" 1>&2; exit 1; } - fi - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; - *) - if echo "$ac_option" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then - echo "configure: warning: invalid host type: $ac_option" 1>&2 + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 fi if test "x$nonopt" != xNONE; then { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } @@ -349,147 +493,9 @@ Try \`configure --help' for more information." 1>&2; exit 1; } done if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --\`echo $ac_prev | sed 's/_/-/g'\`" 1>&2; exit 1; } + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } fi -if $ac_init_help; 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 <<\EOF -`configure' configures software source code packages to adapt to many kinds -of systems. -Usage: configure [OPTION]... [VAR=VALUE]... [HOST] - -To safely assign special values to environment variables (e.g., CC, -CFLAGS...), give to `configure' the definition as VAR=VALUE. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help print this message - -V, --version print the version of autoconf that created configure - -q, --quiet, --silent do not print `checking...' messages - --cache-file=FILE cache test results in FILE - -n, --no-create do not create output files - -EOF - - cat <&5 # Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell meta-characters. +# Also quote any args containing shell metacharacters. ac_configure_args= for ac_arg do @@ -522,8 +528,7 @@ do | --no-cr | --no-c) ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) ac_configure_args="$ac_configure_args '$ac_arg'" ;; *) ac_configure_args="$ac_configure_args $ac_arg" ;; esac @@ -542,7 +547,7 @@ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +echo > confdefs.h # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. @@ -553,7 +558,7 @@ if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%/[^/][^/]*$%%'` + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then @@ -564,12 +569,12 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: cannot find sources in $ac_confdir or .." 1>&2; exit 1; } + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } else - { echo "configure: error: cannot find sources in $srcdir" 1>&2; exit 1; } + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } fi fi -srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'` +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then @@ -588,10 +593,10 @@ done if test -r "$cache_file"; then echo "loading cache $cache_file" - test -f "$cache_file" && . $cache_file + . $cache_file else echo "creating cache $cache_file" - >$cache_file + > $cache_file fi ac_ext=c @@ -603,47 +608,19 @@ cross_compiling=$ac_cv_prog_cc_cross ac_exeext= ac_objext=o -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#include -#if STDC_HEADERS -# include -# include -#else -# if HAVE_STDLIB_H -# include -# endif -#endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include -# endif -# include -#else -# if HAVE_STRINGS_H -# include -# endif -#endif -#if HAVE_INTTYPES_H -# include -#endif -#if HAVE_UNISTD_H -# include -#endif" - if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says Kaveh R. Ghazi. + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ECHO_N= ECHO_C=' -' ECHO_T=' ' + ac_n= ac_c=' +' ac_t=' ' else - ECHO_N=-n ECHO_C= ECHO_T= + ac_n=-n ac_c= ac_t= fi else - ECHO_N= ECHO_C='\c' ECHO_T= + ac_n= ac_c='\c' ac_t= fi + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -654,18 +631,14 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -678,11 +651,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6 -echo "configure:683: checking for a BSD compatible install" 1>&5 +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:656: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do @@ -699,10 +672,6 @@ else grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : - elif test $ac_prog = install && - grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -725,18 +694,18 @@ fi INSTALL="$ac_install_sh" fi fi -echo "$ECHO_T""$INSTALL" 1>&6 +echo "$ac_t""$INSTALL" 1>&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" 1>&6 -echo "configure:740: checking whether build environment is sane" 1>&5 +echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 +echo "configure:709: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -772,26 +741,27 @@ else Check your system clock" 1>&2; exit 1; } fi rm -f conftest* -echo "$ECHO_T""yes" 1>&6 +echo "$ac_t""yes" 1>&6 if test "$program_transform_name" = s,x,x,; then program_transform_name= else # Double any \ or $. echo might interpret backslashes. - cat <<\EOF_SED >conftestsed + cat <<\EOF_SED > conftestsed s,\\,\\\\,g; s,\$,$$,g EOF_SED - program_transform_name=`echo $program_transform_name|sed -f conftestsed` + program_transform_name="`echo $program_transform_name|sed -f conftestsed`" rm -f conftestsed fi test "$program_prefix" != NONE && - program_transform_name="s,^,${program_prefix},;$program_transform_name" + program_transform_name="s,^,${program_prefix},; $program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$\$,${program_suffix},;$program_transform_name" + program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" # sed with no file args requires a program. test "$program_transform_name" = "" && program_transform_name="s,x,x," + test x"${MISSING+set}" = xset || \ MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing" if eval "$MISSING --run :"; then @@ -806,46 +776,43 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:811: checking for $ac_word" 1>&5 -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:781: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - for ac_path in `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 - echo "$ac_dir/$ac_word" - fi -done -IFS="$ac_save_ifs" -`; do - ac_cv_prog_AWK="$ac_prog" - break + 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_prog_AWK="$ac_prog" + break + fi done + IFS="$ac_save_ifs" fi fi AWK="$ac_cv_prog_AWK" if test -n "$AWK"; then - echo "$ECHO_T""$AWK" 1>&6 + echo "$ac_t""$AWK" 1>&6 else - echo "$ECHO_T""no" 1>&6 + echo "$ac_t""no" 1>&6 fi test -n "$AWK" && break done -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" 1>&6 -echo "configure:844: checking whether ${MAKE-make} sets \${MAKE}" 1>&5 +echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +echo "configure:811: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftestmake <<\EOF + cat > conftestmake <<\EOF all: @echo 'ac_maketemp="${MAKE}"' EOF @@ -859,18 +826,20 @@ fi rm -f conftestmake fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ECHO_T""yes" 1>&6 + echo "$ac_t""yes" 1>&6 SET_MAKE= else - echo "$ECHO_T""no" 1>&6 + echo "$ac_t""no" 1>&6 SET_MAKE="MAKE=${MAKE-make}" fi + # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then enableval="$enable_dependency_tracking" : fi + if test "x$enable_dependency_tracking" = xno; then AMDEP="#" else @@ -888,12 +857,17 @@ else AMDEPBACKSLASH= fi + + + + if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then DEPDIR=.deps else DEPDIR=_deps fi + # test to see if srcdir already configured if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then @@ -903,28 +877,42 @@ fi # Define the identity of the package. PACKAGE=grub VERSION=0.5.96 -cat >>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <&6 -echo "configure:937: checking host system type" 1>&5 -if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then - # Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then :; else - { echo "configure: error: cannot run $ac_config_sub" 1>&2; exit 1; } - fi - ac_cv_host_alias=$host - case "$ac_cv_host_alias" in - NONE) - case $nonopt in - NONE) - if ac_cv_host_alias=`$ac_config_guess`; then : - else { echo "configure: error: cannot guess host type; you must specify one" 1>&2; exit 1; } - fi ;; *) ac_cv_host_alias=$nonopt ;; - esac ;; - esac - ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || exit 1 - ac_cv_host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -else - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + + + + +# Make sure we can run config.sub. +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi -echo "$ECHO_T""$ac_cv_host" 1>&6 +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:937: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 -host=$ac_cv_host -host_alias=$ac_cv_host_alias -host_cpu=$ac_cv_host_cpu -host_vendor=$ac_cv_host_vendor -host_os=$ac_cv_host_os case "$host_cpu" in i[3456]86) host_cpu=i386 ;; *) { echo "configure: error: unsupported CPU type" 1>&2; exit 1; } ;; esac + + + # # Options # -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" 1>&6 -echo "configure:982: checking whether to enable maintainer-specific portions of Makefiles" 1>&5 +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:971: 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" @@ -986,7 +975,9 @@ if test "${enable_maintainer_mode+set}" = set; then else USE_MAINTAINER_MODE=no fi - echo "$ECHO_T""$USE_MAINTAINER_MODE" 1>&6 + + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= @@ -996,25 +987,29 @@ else 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 $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:1005: checking for $ac_word" 1>&5 -if test "${ac_cv_path_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:997: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'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 + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_word"; then + if test -f $ac_dir/$ac_word; then ac_cv_path_PERL="$ac_dir/$ac_word" break fi @@ -1025,9 +1020,9 @@ esac fi PERL="$ac_cv_path_PERL" if test -n "$PERL"; then - echo "$ECHO_T""$PERL" 1>&6 + echo "$ac_t""$PERL" 1>&6 else - echo "$ECHO_T""no" 1>&6 + echo "$ac_t""no" 1>&6 fi if test -z "$PERL"; then @@ -1044,40 +1039,23 @@ fi # Programs # -echo $ECHO_N "checking build system type... $ECHO_C" 1>&6 -echo "configure:1049: checking build system type" 1>&5 -if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:1044: checking build system type" >&5 - # Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then :; else - { echo "configure: error: cannot run $ac_config_sub" 1>&2; exit 1; } - fi +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac - ac_cv_build_alias=$build - case "$ac_cv_build_alias" in - NONE) - case $nonopt in - NONE) - ac_cv_build_alias=$host_alias ;; - *) ac_cv_build_alias=$nonopt ;; - esac ;; - esac - - ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || exit 1 - ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -else - echo $ECHO_N "(cached) $ECHO_C" 1>&6 -fi - -echo "$ECHO_T""$ac_cv_build" 1>&6 - -build=$ac_cv_build -build_alias=$ac_cv_build_alias -build_cpu=$ac_cv_build_cpu -build_vendor=$ac_cv_build_vendor -build_os=$ac_cv_build_os +build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 if test $host != $build; then ac_tool_prefix=${host_alias}- @@ -1087,103 +1065,91 @@ 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 $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:1092: checking for $ac_word" 1>&5 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1070: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - for ac_path in `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 - echo "$ac_dir/$ac_word" - fi -done -IFS="$ac_save_ifs" -`; do - ac_cv_prog_CC="${ac_tool_prefix}gcc" - break + 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_prog_CC="${ac_tool_prefix}gcc" + break + fi done + IFS="$ac_save_ifs" test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc" fi fi CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$ECHO_T""$CC" 1>&6 + echo "$ac_t""$CC" 1>&6 else - echo "$ECHO_T""no" 1>&6 + echo "$ac_t""no" 1>&6 fi -case "${CFLAGS+set} $ac_configure_args" in - *" CFLAGS="* );; - "set "*) ac_configure_args="CFLAGS='$CFLAGS' $ac_configure_args";; -esac - # Extract the first word of "gcc", so it can be a program name with args. + +# Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:1130: checking for $ac_word" 1>&5 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1102: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - for ac_path in `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 - echo "$ac_dir/$ac_word" - fi -done -IFS="$ac_save_ifs" -`; do - ac_cv_prog_CC="gcc" - break + 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_prog_CC="gcc" + break + fi done + IFS="$ac_save_ifs" fi fi CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$ECHO_T""$CC" 1>&6 + echo "$ac_t""$CC" 1>&6 else - echo "$ECHO_T""no" 1>&6 + echo "$ac_t""no" 1>&6 fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. +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 $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:1163: checking for $ac_word" 1>&5 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1132: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_path in `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 - echo "$ac_dir/$ac_word" - fi -done -IFS="$ac_save_ifs" -`; do - if test "$ac_path" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break fi - ac_cv_prog_CC="cc" - break done + IFS="$ac_save_ifs" if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. set dummy $ac_cv_prog_CC @@ -1193,7 +1159,7 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_path" "$@" + set dummy "$ac_dir/$ac_word" "$@" shift ac_cv_prog_CC="$@" fi @@ -1202,56 +1168,50 @@ fi fi CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$ECHO_T""$CC" 1>&6 + echo "$ac_t""$CC" 1>&6 else - echo "$ECHO_T""no" 1>&6 + echo "$ac_t""no" 1>&6 fi - if test -z "$CC"; then - for ac_prog in cl -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:1217: checking for $ac_word" 1>&5 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # 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:1183: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - for ac_path in `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 - echo "$ac_dir/$ac_word" - fi -done -IFS="$ac_save_ifs" -`; do - ac_cv_prog_CC="$ac_prog" - break + 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_prog_CC="cl" + break + fi done + IFS="$ac_save_ifs" fi fi CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$ECHO_T""$CC" 1>&6 + echo "$ac_t""$CC" 1>&6 else - echo "$ECHO_T""no" 1>&6 + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi -test -n "$CC" && break -done - - fi - fi - -test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } - -echo $ECHO_N "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works... $ECHO_C" 1>&6 -echo "configure:1255: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" 1>&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1215: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1260,14 +1220,14 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat >conftest.$ac_ext < conftest.$ac_ext << EOF -#line 1266 "configure" +#line 1226 "configure" #include "confdefs.h" -int main(){return(0);} +main(){return(0);} EOF -if { (eval echo configure:1271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1231: \"$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 @@ -1288,32 +1248,33 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -echo "$ECHO_T""$ac_cv_prog_cc_works" 1>&6 +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 77; } + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi -echo $ECHO_N "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler... $ECHO_C" 1>&6 -echo "configure:1297: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" 1>&5 -echo "$ECHO_T""$ac_cv_prog_cc_cross" 1>&6 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:1257: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross -echo $ECHO_N "checking whether we are using GNU C... $ECHO_C" 1>&6 -echo "configure:1302: checking whether we are using GNU C" 1>&5 -if test "${ac_cv_prog_gcc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:1262: checking whether we are using GNU C" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.c < conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1271: \"$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 fi fi -echo "$ECHO_T""$ac_cv_prog_gcc" 1>&6 + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes @@ -1324,12 +1285,12 @@ fi ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= -echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" 1>&6 -echo "configure:1329: checking whether ${CC-cc} accepts -g" 1>&5 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:1290: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - echo 'void f(){}' >conftest.c + echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ac_cv_prog_cc_g=yes else @@ -1338,7 +1299,8 @@ fi rm -f conftest* fi -echo "$ECHO_T""$ac_cv_prog_cc_g" 1>&6 + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 if test "$ac_test_CFLAGS" = set; then CFLAGS="$ac_save_CFLAGS" elif test $ac_cv_prog_cc_g = yes; then @@ -1355,29 +1317,30 @@ else fi fi -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" 1>&6 -echo "configure:1360: checking how to run the C preprocessor" 1>&5 + +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:1323: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then -if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else # This must be in double quotes, not single quotes, because CPP may get # substituted into the Makefile and "${CC-cc}" will confuse make. CPP="${CC-cc} -E" # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. - cat >conftest.$ac_ext < conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1344: \"$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 : @@ -1387,14 +1350,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" - cat >conftest.$ac_ext < conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1361: \"$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 : @@ -1404,14 +1367,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* CPP="${CC-cc} -nologo -E" - cat >conftest.$ac_ext < conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1378: \"$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 : @@ -1433,16 +1396,22 @@ fi else ac_cv_prog_CPP="$CPP" fi -echo "$ECHO_T""$CPP" 1>&6 +echo "$ac_t""$CPP" 1>&6 + + + + + + depcc="$CC" depcpp="$CPP" -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" 1>&6 -echo "configure:1442: checking dependency style of $depcc" 1>&5 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6 +echo "configure:1411: checking dependency style of $depcc" >&5 +if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - + if test -z "$AMDEP"; then echo '#include "conftest.h"' > conftest.c echo 'int i;' > conftest.h @@ -1478,33 +1447,39 @@ fi fi -echo "$ECHO_T""$am_cv_CC_dependencies_compiler_type" 1>&6 +echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" + + # Check whether --with-binutils or --without-binutils was given. if test "${with_binutils+set}" = set; then withval="$with_binutils" : fi + if test "x$with_binutils" != x; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:1495: checking for $ac_word" 1>&5 -if test "${ac_cv_path_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1467: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else case "$RANLIB" in - [/\\]* | ?:[/\\]*) + /*) ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a dos path. + ;; *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy=""$with_binutils:$PATH"" - for ac_dir in $ac_dummy; do + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_word"; then + if test -f $ac_dir/$ac_word; then ac_cv_path_RANLIB="$ac_dir/$ac_word" break fi @@ -1516,43 +1491,40 @@ esac fi RANLIB="$ac_cv_path_RANLIB" if test -n "$RANLIB"; then - echo "$ECHO_T""$RANLIB" 1>&6 + echo "$ac_t""$RANLIB" 1>&6 else - echo "$ECHO_T""no" 1>&6 + echo "$ac_t""no" 1>&6 fi else # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:1529: checking for $ac_word" 1>&5 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1504: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - for ac_path in `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 - echo "$ac_dir/$ac_word" - fi -done -IFS="$ac_save_ifs" -`; do - ac_cv_prog_RANLIB="ranlib" - break + 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_prog_RANLIB="ranlib" + break + fi done + IFS="$ac_save_ifs" test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" fi fi RANLIB="$ac_cv_prog_RANLIB" if test -n "$RANLIB"; then - echo "$ECHO_T""$RANLIB" 1>&6 + echo "$ac_t""$RANLIB" 1>&6 else - echo "$ECHO_T""no" 1>&6 + echo "$ac_t""no" 1>&6 fi fi @@ -1567,27 +1539,23 @@ if test "x$ac_cv_prog_gcc" = xyes; then fi STAGE1_CFLAGS="-O2" GRUB_CFLAGS="-O2" - echo $ECHO_N "checking whether optimization for size works... $ECHO_C" 1>&6 -echo "configure:1572: checking whether optimization for size works" 1>&5 -if test "${size_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + echo $ac_n "checking whether optimization for size works""... $ac_c" 1>&6 +echo "configure:1544: checking whether optimization for size works" >&5 +if eval "test \"`echo '$''{'size_flag'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - + saved_CFLAGS=$CFLAGS CFLAGS="-Os -g" - cat >conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* size_flag=yes else @@ -1598,9 +1566,10 @@ else fi rm -f conftest* CFLAGS=$saved_CFLAGS - + fi -echo "$ECHO_T""$size_flag" 1>&6 + +echo "$ac_t""$size_flag" 1>&6 if test "x$size_flag" = xyes; then STAGE2_CFLAGS="-Os" else @@ -1609,27 +1578,35 @@ echo "$ECHO_T""$size_flag" 1>&6 fi fi + + + + # Enforce coding standards. -CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused" +CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused -Wshadow" +CPPFLAGS="$CPPFLAGS -Wpointer-arith -Wundef" if test "x$with_binutils" != x; then # Extract the first word of "objcopy", so it can be a program name with args. set dummy objcopy; ac_word=$2 -echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:1620: checking for $ac_word" 1>&5 -if test "${ac_cv_path_OBJCOPY+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1594: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else case "$OBJCOPY" in - [/\\]* | ?:[/\\]*) + /*) ac_cv_path_OBJCOPY="$OBJCOPY" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_OBJCOPY="$OBJCOPY" # Let the user override the test with a dos path. + ;; *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy=""$with_binutils:$PATH"" - for ac_dir in $ac_dummy; do + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_word"; then + if test -f $ac_dir/$ac_word; then ac_cv_path_OBJCOPY="$ac_dir/$ac_word" break fi @@ -1640,53 +1617,52 @@ esac fi OBJCOPY="$ac_cv_path_OBJCOPY" if test -n "$OBJCOPY"; then - echo "$ECHO_T""$OBJCOPY" 1>&6 + echo "$ac_t""$OBJCOPY" 1>&6 else - echo "$ECHO_T""no" 1>&6 + echo "$ac_t""no" 1>&6 fi else # 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 $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:1653: checking for $ac_word" 1>&5 -if test "${ac_cv_prog_OBJCOPY+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1630: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$OBJCOPY"; then ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test. else - for ac_path in `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 - echo "$ac_dir/$ac_word" - fi -done -IFS="$ac_save_ifs" -`; do - ac_cv_prog_OBJCOPY="${ac_tool_prefix}objcopy" - break + 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_prog_OBJCOPY="${ac_tool_prefix}objcopy" + break + fi done + IFS="$ac_save_ifs" test -z "$ac_cv_prog_OBJCOPY" && ac_cv_prog_OBJCOPY="objcopy" fi fi OBJCOPY="$ac_cv_prog_OBJCOPY" if test -n "$OBJCOPY"; then - echo "$ECHO_T""$OBJCOPY" 1>&6 + echo "$ac_t""$OBJCOPY" 1>&6 else - echo "$ECHO_T""no" 1>&6 + echo "$ac_t""no" 1>&6 fi + + fi # Defined in acinclude.m4. -echo $ECHO_N "checking if C symbols get an underscore after compilation... $ECHO_C" 1>&6 -echo "configure:1688: checking if C symbols get an underscore after compilation" 1>&5 -if test "${grub_cv_asm_uscore+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking if C symbols get an underscore after compilation""... $ac_c" 1>&6 +echo "configure:1664: checking if C symbols get an underscore after compilation" >&5 +if eval "test \"`echo '$''{'grub_cv_asm_uscore'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.c <<\EOF int @@ -1697,7 +1673,7 @@ func (int *list) } EOF -if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then +if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then true else { echo "configure: error: ${CC-cc} failed to produce assembly code" 1>&2; exit 1; } @@ -1712,19 +1688,20 @@ fi rm -f conftest* fi + if test "x$grub_cv_asm_uscore" = xyes; then - cat >>confdefs.h <> confdefs.h <&6 +echo "$ac_t""$grub_cv_asm_uscore" 1>&6 -echo $ECHO_N "checking whether ${OBJCOPY} works for absolute addresses... $ECHO_C" 1>&6 -echo "configure:1726: checking whether ${OBJCOPY} works for absolute addresses" 1>&5 -if test "${grub_cv_prog_objcopy_absolute+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking whether ${OBJCOPY} works for absolute addresses""... $ac_c" 1>&6 +echo "configure:1703: checking whether ${OBJCOPY} works for absolute addresses" >&5 +if eval "test \"`echo '$''{'grub_cv_prog_objcopy_absolute'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.c <<\EOF void @@ -1734,21 +1711,21 @@ cmain (void) } EOF -if { (eval echo configure:1738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then : +if { (eval echo configure:1715: \"$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='${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec'; { (eval echo configure:1744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : + if { ac_try='${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec'; { (eval echo configure:1721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : else { echo "configure: error: ${CC-cc} cannot link at address $link_addr" 1>&2; exit 1; } fi - if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : + if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1725: \"$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:1752: \"$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:1729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then mv -f conftest conftest.old else grub_cv_prog_objcopy_absolute=no @@ -1758,22 +1735,23 @@ done rm -f conftest* fi -echo "$ECHO_T""$grub_cv_prog_objcopy_absolute" 1>&6 +echo "$ac_t""$grub_cv_prog_objcopy_absolute" 1>&6 if test "x$grub_cv_prog_objcopy_absolute" != xyes; then { echo "configure: error: GRUB requires a working absolute objcopy; upgrade your binutils" 1>&2; exit 1; } fi -echo $ECHO_N "checking whether addr32 must be in the same line as the instruction... $ECHO_C" 1>&6 -echo "configure:1768: checking whether addr32 must be in the same line as the instruction" 1>&5 -if test "${grub_cv_asm_prefix_requirement+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + +echo $ac_n "checking whether addr32 must be in the same line as the instruction""... $ac_c" 1>&6 +echo "configure:1746: checking whether addr32 must be in the same line as the instruction" >&5 +if eval "test \"`echo '$''{'grub_cv_asm_prefix_requirement'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.s <<\EOF .code16 l1: addr32 movb %al, l1 EOF -if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then +if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1755: \"$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 @@ -1782,6 +1760,7 @@ fi rm -f conftest* fi + if test "x$grub_cv_asm_prefix_requirement" = xyes; then grub_tmp_addr32="addr32" grub_tmp_data32="data32" @@ -1790,20 +1769,23 @@ else grub_tmp_data32="data32;" fi -cat >>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <&6 -echo $ECHO_N "checking for .code16 addr32 assembler support... $ECHO_C" 1>&6 -echo "configure:1805: checking for .code16 addr32 assembler support" 1>&5 -if test "${grub_cv_asm_addr32+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo "$ac_t""$grub_cv_asm_prefix_requirement" 1>&6 + + + +echo $ac_n "checking for .code16 addr32 assembler support""... $ac_c" 1>&6 +echo "configure:1787: checking for .code16 addr32 assembler support" >&5 +if eval "test \"`echo '$''{'grub_cv_asm_addr32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.s.in <<\EOF .code16 @@ -1816,7 +1798,7 @@ else sed -e s/@ADDR32@/addr32\;/ < conftest.s.in > conftest.s fi -if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then +if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1802: \"$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 @@ -1825,24 +1807,26 @@ fi rm -f conftest* fi -echo "$ECHO_T""$grub_cv_asm_addr32" 1>&6 + +echo "$ac_t""$grub_cv_asm_addr32" 1>&6 if test "x$grub_cv_asm_addr32" != xyes; then { echo "configure: error: GRUB requires GAS .code16 addr32 support; upgrade your binutils" 1>&2; exit 1; } fi -echo $ECHO_N "checking whether an absolute indirect call/jump must not be prefixed with an asterisk... $ECHO_C" 1>&6 -echo "configure:1835: checking whether an absolute indirect call/jump must not be prefixed with an asterisk" 1>&5 -if test "${grub_cv_asm_absolute_without_asterisk+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + +echo $ac_n "checking whether an absolute indirect call/jump must not be prefixed with an asterisk""... $ac_c" 1>&6 +echo "configure:1819: checking whether an absolute indirect call/jump must not be prefixed with an asterisk" >&5 +if eval "test \"`echo '$''{'grub_cv_asm_absolute_without_asterisk'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.s <<\EOF - lcall *(offset) + lcall *(offset) offset: .long 0 .word 0 EOF -if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then +if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then grub_cv_asm_absolute_without_asterisk=no else grub_cv_asm_absolute_without_asterisk=yes @@ -1851,33 +1835,31 @@ fi rm -f conftest* fi + if test "x$grub_cv_asm_absolute_without_asterisk" = xyes; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define ABSOLUTE_WITHOUT_ASTERISK 1 EOF fi -echo "$ECHO_T""$grub_cv_asm_absolute_without_asterisk" 1>&6 +echo "$ac_t""$grub_cv_asm_absolute_without_asterisk" 1>&6 -echo $ECHO_N "checking if start is defined by the compiler... $ECHO_C" 1>&6 -echo "configure:1865: checking if start is defined by the compiler" 1>&5 -if test "${grub_cv_check_start_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + +echo $ac_n "checking if start is defined by the compiler""... $ac_c" 1>&6 +echo "configure:1851: checking if start is defined by the compiler" >&5 +if eval "test \"`echo '$''{'grub_cv_check_start_symbol'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_start_symbol=yes else @@ -1887,36 +1869,33 @@ else grub_cv_check_start_symbol=no fi rm -f conftest* - fi + if test "x$grub_cv_check_start_symbol" = xyes; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_START_SYMBOL 1 EOF fi -echo "$ECHO_T""$grub_cv_check_start_symbol" 1>&6 +echo "$ac_t""$grub_cv_check_start_symbol" 1>&6 -echo $ECHO_N "checking if _start is defined by the compiler... $ECHO_C" 1>&6 -echo "configure:1904: checking if _start is defined by the compiler" 1>&5 -if test "${grub_cv_check_uscore_start_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + +echo $ac_n "checking if _start is defined by the compiler""... $ac_c" 1>&6 +echo "configure:1887: checking if _start is defined by the compiler" >&5 +if eval "test \"`echo '$''{'grub_cv_check_uscore_start_symbol'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_uscore_start_symbol=yes else @@ -1926,41 +1905,38 @@ else grub_cv_check_uscore_start_symbol=no fi rm -f conftest* - fi + if test "x$grub_cv_check_uscore_start_symbol" = xyes; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_USCORE_START_SYMBOL 1 EOF fi -echo "$ECHO_T""$grub_cv_check_uscore_start_symbol" 1>&6 +echo "$ac_t""$grub_cv_check_uscore_start_symbol" 1>&6 if test "x$grub_cv_check_start_symbol" != "xyes" \ -a "x$grub_cv_check_uscore_start_symbol" != "xyes"; then { echo "configure: error: Neither start nor _start is defined" 1>&2; exit 1; } fi -echo $ECHO_N "checking if __bss_start is defined by the compiler... $ECHO_C" 1>&6 -echo "configure:1948: checking if __bss_start is defined by the compiler" 1>&5 -if test "${grub_cv_check_uscore_uscore_bss_start_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + +echo $ac_n "checking if __bss_start is defined by the compiler""... $ac_c" 1>&6 +echo "configure:1928: checking if __bss_start is defined by the compiler" >&5 +if eval "test \"`echo '$''{'grub_cv_check_uscore_uscore_bss_start_symbol'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_uscore_uscore_bss_start_symbol=yes else @@ -1970,36 +1946,33 @@ else grub_cv_check_uscore_uscore_bss_start_symbol=no fi rm -f conftest* - fi + if test "x$grub_cv_check_uscore_uscore_bss_start_symbol" = xyes; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_USCORE_USCORE_BSS_START_SYMBOL 1 EOF fi -echo "$ECHO_T""$grub_cv_check_uscore_uscore_bss_start_symbol" 1>&6 +echo "$ac_t""$grub_cv_check_uscore_uscore_bss_start_symbol" 1>&6 -echo $ECHO_N "checking if _edata is defined by the compiler... $ECHO_C" 1>&6 -echo "configure:1987: checking if _edata is defined by the compiler" 1>&5 -if test "${grub_cv_check_uscore_edata_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + +echo $ac_n "checking if _edata is defined by the compiler""... $ac_c" 1>&6 +echo "configure:1964: checking if _edata is defined by the compiler" >&5 +if eval "test \"`echo '$''{'grub_cv_check_uscore_edata_symbol'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_uscore_edata_symbol=yes else @@ -2009,36 +1982,33 @@ else grub_cv_check_uscore_edata_symbol=no fi rm -f conftest* - fi + if test "x$grub_cv_check_uscore_edata_symbol" = xyes; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_USCORE_EDATA_SYMBOL 1 EOF fi -echo "$ECHO_T""$grub_cv_check_uscore_edata_symbol" 1>&6 +echo "$ac_t""$grub_cv_check_uscore_edata_symbol" 1>&6 -echo $ECHO_N "checking if edata is defined by the compiler... $ECHO_C" 1>&6 -echo "configure:2026: checking if edata is defined by the compiler" 1>&5 -if test "${grub_cv_check_edata_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + +echo $ac_n "checking if edata is defined by the compiler""... $ac_c" 1>&6 +echo "configure:2000: checking if edata is defined by the compiler" >&5 +if eval "test \"`echo '$''{'grub_cv_check_edata_symbol'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_edata_symbol=yes else @@ -2048,17 +2018,17 @@ else grub_cv_check_edata_symbol=no fi rm -f conftest* - fi + if test "x$grub_cv_check_edata_symbol" = xyes; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_EDATA_SYMBOL 1 EOF fi -echo "$ECHO_T""$grub_cv_check_edata_symbol" 1>&6 +echo "$ac_t""$grub_cv_check_edata_symbol" 1>&6 if test "x$grub_cv_check_uscore_uscore_bss_start_symbol" != "xyes" \ -a "x$grub_cv_check_uscore_edata_symbol" != "xyes" \ @@ -2066,24 +2036,21 @@ if test "x$grub_cv_check_uscore_uscore_bss_start_symbol" != "xyes" \ { echo "configure: error: None of __bss_start, _edata, edata defined" 1>&2; exit 1; } fi -echo $ECHO_N "checking if end is defined by the compiler... $ECHO_C" 1>&6 -echo "configure:2071: checking if end is defined by the compiler" 1>&5 -if test "${grub_cv_check_end_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + +echo $ac_n "checking if end is defined by the compiler""... $ac_c" 1>&6 +echo "configure:2042: checking if end is defined by the compiler" >&5 +if eval "test \"`echo '$''{'grub_cv_check_end_symbol'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_end_symbol=yes else @@ -2093,36 +2060,33 @@ else grub_cv_check_end_symbol=no fi rm -f conftest* - fi + if test "x$grub_cv_check_end_symbol" = xyes; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_END_SYMBOL 1 EOF fi -echo "$ECHO_T""$grub_cv_check_end_symbol" 1>&6 +echo "$ac_t""$grub_cv_check_end_symbol" 1>&6 -echo $ECHO_N "checking if _end is defined by the compiler... $ECHO_C" 1>&6 -echo "configure:2110: checking if _end is defined by the compiler" 1>&5 -if test "${grub_cv_check_uscore_end_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + +echo $ac_n "checking if _end is defined by the compiler""... $ac_c" 1>&6 +echo "configure:2078: checking if _end is defined by the compiler" >&5 +if eval "test \"`echo '$''{'grub_cv_check_uscore_end_symbol'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_uscore_end_symbol=yes else @@ -2132,17 +2096,17 @@ else grub_cv_check_uscore_end_symbol=no fi rm -f conftest* - fi + if test "x$grub_cv_check_uscore_end_symbol" = xyes; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_USCORE_END_SYMBOL 1 EOF fi -echo "$ECHO_T""$grub_cv_check_uscore_end_symbol" 1>&6 +echo "$ac_t""$grub_cv_check_uscore_end_symbol" 1>&6 if test "x$grub_cv_check_end_symbol" != "xyes" \ -a "x$grub_cv_check_uscore_end_symbol" != "xyes"; then @@ -2156,187 +2120,190 @@ if test "${with_curses+set}" = set; then : fi + # Get the filename or the whole disk and open it. # Known to work on NetBSD. -echo $ECHO_N "checking for opendisk in -lutil... $ECHO_C" 1>&6 -echo "configure:2163: checking for opendisk in -lutil" 1>&5 -if test "${ac_cv_lib_util_opendisk+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +echo $ac_n "checking for opendisk in -lutil""... $ac_c" 1>&6 +echo "configure:2128: checking for opendisk in -lutil" >&5 +ac_lib_var=`echo util'_'opendisk | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" -cat >conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_lib_util_opendisk=yes + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_lib_util_opendisk=no + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* - LIBS="$ac_save_LIBS" + fi -echo "$ECHO_T""$ac_cv_lib_util_opendisk" 1>&6 -if test $ac_cv_lib_util_opendisk = yes; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 GRUB_LIBS="$GRUB_LIBS -lutil" - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_OPENDISK 1 EOF +else + echo "$ac_t""no" 1>&6 fi + # Unless the user specify --without-curses, check for curses. if test "x$with_curses" != "xno"; then - echo $ECHO_N "checking for wgetch in -lncurses... $ECHO_C" 1>&6 -echo "configure:2210: checking for wgetch in -lncurses" 1>&5 -if test "${ac_cv_lib_ncurses_wgetch+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + echo $ac_n "checking for wgetch in -lncurses""... $ac_c" 1>&6 +echo "configure:2175: checking for wgetch in -lncurses" >&5 +ac_lib_var=`echo ncurses'_'wgetch | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" -cat >conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_lib_ncurses_wgetch=yes + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_lib_ncurses_wgetch=no + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* - LIBS="$ac_save_LIBS" + fi -echo "$ECHO_T""$ac_cv_lib_ncurses_wgetch" 1>&6 -if test $ac_cv_lib_ncurses_wgetch = yes; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 GRUB_LIBS="$GRUB_LIBS -lncurses" - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_LIBCURSES 1 EOF else - echo $ECHO_N "checking for wgetch in -lcurses... $ECHO_C" 1>&6 -echo "configure:2254: checking for wgetch in -lcurses" 1>&5 -if test "${ac_cv_lib_curses_wgetch+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for wgetch in -lcurses""... $ac_c" 1>&6 +echo "configure:2217: checking for wgetch in -lcurses" >&5 +ac_lib_var=`echo curses'_'wgetch | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" -cat >conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_lib_curses_wgetch=yes + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_lib_curses_wgetch=no + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* - LIBS="$ac_save_LIBS" + fi -echo "$ECHO_T""$ac_cv_lib_curses_wgetch" 1>&6 -if test $ac_cv_lib_curses_wgetch = yes; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 GRUB_LIBS="$GRUB_LIBS -lcurses" - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_LIBCURSES 1 EOF +else + echo "$ac_t""no" 1>&6 fi fi fi + + # Check for headers. -for ac_header in string.h strings.h ncurses/curses.h ncurses.h curses.h +for ac_hdr in string.h strings.h ncurses/curses.h ncurses.h curses.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6 -echo "configure:2307: checking for $ac_header" 1>&5 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" 1>&6 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2271: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext < conftest.$ac_ext < - +#include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2281: \"$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* - eval "$ac_ac_Header=yes" + eval "ac_cv_header_$ac_safe=yes" else echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "$ac_ac_Header=no" + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* fi -echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done + # Check for user options. # filesystems support. @@ -2346,6 +2313,7 @@ if test "${enable_ext2fs+set}" = set; then : fi + if test x"$enable_ext2fs" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_EXT2FS=1" fi @@ -2356,6 +2324,7 @@ if test "${enable_fat+set}" = set; then : fi + if test x"$enable_fat" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_FAT=1" fi @@ -2366,6 +2335,7 @@ if test "${enable_ffs+set}" = set; then : fi + if test x"$enable_ffs" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_FFS=1" fi @@ -2376,6 +2346,7 @@ if test "${enable_minix+set}" = set; then : fi + if test x"$enable_minix" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_MINIX=1" fi @@ -2386,25 +2357,30 @@ if test "${enable_reiserfs+set}" = set; then : fi + if test x"$enable_reiserfs" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_REISERFS=1" fi + # Check whether --enable-gunzip or --disable-gunzip was given. if test "${enable_gunzip+set}" = set; then enableval="$enable_gunzip" : fi + if test x"$enable_gunzip" = xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DNO_DECOMPRESSION=1" fi + # Check whether --enable-packet-retransmission or --disable-packet-retransmission was given. if test "${enable_packet_retransmission+set}" = set; then enableval="$enable_packet_retransmission" : fi + if test "x$enable_packet_retransmission" != xno; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1" fi @@ -2414,6 +2390,7 @@ if test "${enable_pci_direct+set}" = set; then enableval="$enable_pci_direct" : fi + if test "x$enable_pci_direct" = xyes; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONFIG_PCI_DIRECT=1" fi @@ -2423,6 +2400,7 @@ if test "${enable_3c509+set}" = set; then enableval="$enable_3c509" : fi + if test "x$enable_3c509" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C509" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c509.o" @@ -2433,6 +2411,7 @@ if test "${enable_3c529+set}" = set; then enableval="$enable_3c529" : fi + if test "x$enable_3c529" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C529=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c529.o" @@ -2443,6 +2422,7 @@ if test "${enable_3c590+set}" = set; then enableval="$enable_3c590" : fi + if test "x$enable_3c590" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C590=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c590.o" @@ -2453,6 +2433,7 @@ if test "${enable_3c595+set}" = set; then enableval="$enable_3c595" : fi + if test "x$enable_3c595" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C595=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c595.o" @@ -2463,6 +2444,7 @@ if test "${enable_3c90x+set}" = set; then enableval="$enable_3c90x" : fi + if test "x$enable_3c90x" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C90X=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c90x.o" @@ -2473,6 +2455,7 @@ if test "${enable_cs89x0+set}" = set; then enableval="$enable_cs89x0" : fi + if test "x$enable_cs89x0" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_CS89X0=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS cs89x0.o" @@ -2483,6 +2466,7 @@ if test "${enable_depca+set}" = set; then enableval="$enable_depca" : fi + if test "x$enable_depca" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_DEPCA=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS depca.o" @@ -2493,6 +2477,7 @@ if test "${enable_eepro100+set}" = set; then enableval="$enable_eepro100" : fi + if test "x$enable_eepro100" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EEPRO100=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS eepro100.o" @@ -2503,6 +2488,7 @@ if test "${enable_epic100+set}" = set; then enableval="$enable_epic100" : fi + if test "x$enable_epic100" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EPIC100=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS epic100.o" @@ -2513,6 +2499,7 @@ if test "${enable_3c507+set}" = set; then enableval="$enable_3c507" : fi + if test "x$enable_3c507" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C507=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c507.o" @@ -2523,6 +2510,7 @@ if test "${enable_exos205+set}" = set; then enableval="$enable_exos205" : fi + if test "x$enable_exos205" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EXOS205=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS exos205.o" @@ -2533,6 +2521,7 @@ if test "${enable_ni5210+set}" = set; then enableval="$enable_ni5210" : fi + if test "x$enable_ni5210" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5210=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5210.o" @@ -2543,6 +2532,7 @@ if test "${enable_lance+set}" = set; then enableval="$enable_lance" : fi + if test "x$enable_lance" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_LANCE=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS lance.o" @@ -2553,6 +2543,7 @@ if test "${enable_ne2100+set}" = set; then enableval="$enable_ne2100" : fi + if test "x$enable_ne2100" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE2100=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne2100.o" @@ -2563,6 +2554,7 @@ if test "${enable_ni6510+set}" = set; then enableval="$enable_ni6510" : fi + if test "x$enable_ni6510" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI6510=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni6510.o" @@ -2573,6 +2565,7 @@ if test "${enable_3c503+set}" = set; then enableval="$enable_3c503" : fi + if test "x$enable_3c503" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C503=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c503.o" @@ -2583,6 +2576,7 @@ if test "${enable_ne+set}" = set; then enableval="$enable_ne" : fi + if test "x$enable_ne" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne.o" @@ -2593,6 +2587,7 @@ if test "${enable_ns8390+set}" = set; then enableval="$enable_ns8390" : fi + if test "x$enable_ns8390" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NS8390=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS ns8390.o" @@ -2603,6 +2598,7 @@ if test "${enable_wd+set}" = set; then enableval="$enable_wd" : fi + if test "x$enable_wd" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_WD=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS wd.o" @@ -2613,6 +2609,7 @@ if test "${enable_otulip+set}" = set; then enableval="$enable_otulip" : fi + if test "x$enable_otulip" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_OTULIP=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS otulip.o" @@ -2623,6 +2620,7 @@ if test "${enable_rtl8139+set}" = set; then enableval="$enable_rtl8139" : fi + if test "x$enable_rtl8139" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_RTL8139=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS rtl8139.o" @@ -2633,6 +2631,7 @@ if test "${enable_sk_g16+set}" = set; then enableval="$enable_sk_g16" : fi + if test "x$enable_sk_g16" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SK_G16=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS sk_g16.o" @@ -2643,6 +2642,7 @@ if test "${enable_smc9000+set}" = set; then enableval="$enable_smc9000" : fi + if test "x$enable_smc9000" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SMC9000=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS smc9000.o" @@ -2653,6 +2653,7 @@ if test "${enable_tiara+set}" = set; then enableval="$enable_tiara" : fi + if test "x$enable_tiara" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TIARA=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS tiara.o" @@ -2663,6 +2664,7 @@ if test "${enable_tulip+set}" = set; then enableval="$enable_tulip" : fi + if test "x$enable_tulip" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TULIP=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS tulip.o" @@ -2673,11 +2675,14 @@ if test "${enable_via_rhine+set}" = set; then enableval="$enable_via_rhine" : fi + if test "x$enable_via_rhine" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_VIA_RHINE=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS via_rhine.o" fi + + if test "x$NET_CFLAGS" != x; then NETBOOT_SUPPORT_TRUE= NETBOOT_SUPPORT_FALSE='#' @@ -2694,6 +2699,7 @@ if test "${enable_3c503_shmem+set}" = set; then enableval="$enable_3c503_shmem" : fi + if test "x$enable_3c503_shmem" = xyes; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_SHMEM=1" fi @@ -2703,6 +2709,7 @@ if test "${enable_3c503_aui+set}" = set; then enableval="$enable_3c503_aui" : fi + if test "x$enable_3c503_aui" = xyes; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_AUI=1" fi @@ -2712,6 +2719,7 @@ if test "${enable_3c509_hack+set}" = set; then enableval="$enable_3c509_hack" : fi + if test "x$enable_3c509_hack" = xyes; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT509HACK=1" fi @@ -2721,6 +2729,7 @@ if test "${enable_compex_rl2000_fix+set}" = set; then enableval="$enable_compex_rl2000_fix" : fi + if test "x$enable_compex_rl2000_fix" = xyes; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCOMPEX_RL2000_FIX=1" fi @@ -2731,6 +2740,7 @@ if test "${enable_smc9000_scan+set}" = set; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DSMC9000_SCAN=$enable_smc9000_scan" fi + # Check whether --enable-ne-scan or --disable-ne-scan was given. if test "${enable_ne_scan+set}" = set; then enableval="$enable_ne_scan" @@ -2739,6 +2749,7 @@ else NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DNE_SCAN=0x280,0x300,0x320,0x340" fi + # Check whether --enable-wd-default-mem or --disable-wd-default-mem was given. if test "${enable_wd_default_mem+set}" = set; then enableval="$enable_wd_default_mem" @@ -2747,18 +2758,22 @@ else NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=0xCC000" fi + # Check whether --enable-cs-scan or --disable-cs-scan was given. if test "${enable_cs_scan+set}" = set; then enableval="$enable_cs_scan" NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCS_SCAN=$enable_cs_scan" fi + # Check whether --enable-diskless or --disable-diskless was given. if test "${enable_diskless+set}" = set; then enableval="$enable_diskless" : fi + + if test "x$enable_diskless" = xyes; then DISKLESS_SUPPORT_TRUE= DISKLESS_SUPPORT_FALSE='#' @@ -2774,8 +2789,14 @@ if test "x$enable_diskless" = xyes; then fi fi + + + + + + trap '' 1 2 15 -cat >confcache <<\EOF +cat > confcache <<\EOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure # scripts and configure runs. It is not useful on other systems. @@ -2809,11 +2830,13 @@ EOF # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' ;; - esac >>confcache -if cmp -s $cache_file confcache; then :; else + esac >> confcache +if cmp -s $cache_file confcache; then + : +else if test -w $cache_file; then echo "updating cache $cache_file" - cat confcache >$cache_file + cat confcache > $cache_file else echo "not updating unwritable cache $cache_file" fi @@ -2833,12 +2856,16 @@ if test "x$srcdir" = x.; then ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' fi +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + DEFS=-DHAVE_CONFIG_H +# Without the "./", some shells look in PATH for config.status. : ${CONFIG_STATUS=./config.status} -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + echo creating $CONFIG_STATUS -cat >$CONFIG_STATUS < $CONFIG_STATUS <$CONFIG_STATUS <> $CONFIG_STATUS <>$CONFIG_STATUS <<\EOF -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -if $ac_need_defaults; then - : ${CONFIG_FILES=$config_files} - : ${CONFIG_HEADERS=$config_headers} - : ${CONFIG_COMMANDS=$config_commands} -fi +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF +$ac_vpsub +$extrasub +s%@SHELL@%$SHELL%g +s%@CFLAGS@%$CFLAGS%g +s%@CPPFLAGS@%$CPPFLAGS%g +s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%$LDFLAGS%g +s%@LIBS@%$LIBS%g +s%@exec_prefix@%$exec_prefix%g +s%@prefix@%$prefix%g +s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@PACKAGE@%$PACKAGE%g +s%@VERSION@%$VERSION%g +s%@ACLOCAL@%$ACLOCAL%g +s%@AUTOCONF@%$AUTOCONF%g +s%@AUTOMAKE@%$AUTOMAKE%g +s%@AUTOHEADER@%$AUTOHEADER%g +s%@MAKEINFO@%$MAKEINFO%g +s%@AMTAR@%$AMTAR%g +s%@install_sh@%$install_sh%g +s%@AWK@%$AWK%g +s%@SET_MAKE@%$SET_MAKE%g +s%@AMDEP@%$AMDEP%g +s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g +s%@DEPDIR@%$DEPDIR%g +s%@host@%$host%g +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%@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 +s%@build_vendor@%$build_vendor%g +s%@build_os@%$build_os%g +s%@CC@%$CC%g +s%@CPP@%$CPP%g +s%@CCDEPMODE@%$CCDEPMODE%g +s%@RANLIB@%$RANLIB%g +s%@STAGE1_CFLAGS@%$STAGE1_CFLAGS%g +s%@STAGE2_CFLAGS@%$STAGE2_CFLAGS%g +s%@GRUB_CFLAGS@%$GRUB_CFLAGS%g +s%@OBJCOPY@%$OBJCOPY%g +s%@GRUB_LIBS@%$GRUB_LIBS%g +s%@NETBOOT_SUPPORT_TRUE@%$NETBOOT_SUPPORT_TRUE%g +s%@NETBOOT_SUPPORT_FALSE@%$NETBOOT_SUPPORT_FALSE%g +s%@DISKLESS_SUPPORT_TRUE@%$DISKLESS_SUPPORT_TRUE%g +s%@DISKLESS_SUPPORT_FALSE@%$DISKLESS_SUPPORT_FALSE%g +s%@FSYS_CFLAGS@%$FSYS_CFLAGS%g +s%@NET_CFLAGS@%$NET_CFLAGS%g +s%@NET_EXTRAFLAGS@%$NET_EXTRAFLAGS%g +s%@NETBOOT_DRIVERS@%$NETBOOT_DRIVERS%g -# Trap to remove the temp files. -trap 'rm -fr $ac_cs_root*; exit 1' 1 2 15 - -EOF - -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <\$ac_cs_root.subs <<\\CEOF -s%@ECHO_C@%$ECHO_C%;t t -s%@ECHO_N@%$ECHO_N%;t t -s%@ECHO_T@%$ECHO_T%;t t -s%@SHELL@%$SHELL%;t t -s%@CFLAGS@%$CFLAGS%;t t -s%@CPPFLAGS@%$CPPFLAGS%;t t -s%@CXXFLAGS@%$CXXFLAGS%;t t -s%@FFLAGS@%$FFLAGS%;t t -s%@DEFS@%$DEFS%;t t -s%@LDFLAGS@%$LDFLAGS%;t t -s%@LIBS@%$LIBS%;t t -s%@exec_prefix@%$exec_prefix%;t t -s%@prefix@%$prefix%;t t -s%@program_transform_name@%$program_transform_name%;t t -s%@bindir@%$bindir%;t t -s%@sbindir@%$sbindir%;t t -s%@libexecdir@%$libexecdir%;t t -s%@datadir@%$datadir%;t t -s%@sysconfdir@%$sysconfdir%;t t -s%@sharedstatedir@%$sharedstatedir%;t t -s%@localstatedir@%$localstatedir%;t t -s%@libdir@%$libdir%;t t -s%@includedir@%$includedir%;t t -s%@oldincludedir@%$oldincludedir%;t t -s%@infodir@%$infodir%;t t -s%@mandir@%$mandir%;t t -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%;t t -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%;t t -s%@INSTALL_DATA@%$INSTALL_DATA%;t t -s%@PACKAGE@%$PACKAGE%;t t -s%@VERSION@%$VERSION%;t t -s%@ACLOCAL@%$ACLOCAL%;t t -s%@AUTOCONF@%$AUTOCONF%;t t -s%@AUTOMAKE@%$AUTOMAKE%;t t -s%@AUTOHEADER@%$AUTOHEADER%;t t -s%@MAKEINFO@%$MAKEINFO%;t t -s%@AMTAR@%$AMTAR%;t t -s%@install_sh@%$install_sh%;t t -s%@AWK@%$AWK%;t t -s%@SET_MAKE@%$SET_MAKE%;t t -s%@AMDEP@%$AMDEP%;t t -s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%;t t -s%@DEPDIR@%$DEPDIR%;t t -s%@host@%$host%;t t -s%@host_alias@%$host_alias%;t t -s%@host_cpu@%$host_cpu%;t t -s%@host_vendor@%$host_vendor%;t t -s%@host_os@%$host_os%;t t -s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%;t t -s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%;t t -s%@MAINT@%$MAINT%;t t -s%@PERL@%$PERL%;t t -s%@build@%$build%;t t -s%@build_alias@%$build_alias%;t t -s%@build_cpu@%$build_cpu%;t t -s%@build_vendor@%$build_vendor%;t t -s%@build_os@%$build_os%;t t -s%@CC@%$CC%;t t -s%@CPP@%$CPP%;t t -s%@CCDEPMODE@%$CCDEPMODE%;t t -s%@RANLIB@%$RANLIB%;t t -s%@STAGE1_CFLAGS@%$STAGE1_CFLAGS%;t t -s%@STAGE2_CFLAGS@%$STAGE2_CFLAGS%;t t -s%@GRUB_CFLAGS@%$GRUB_CFLAGS%;t t -s%@OBJCOPY@%$OBJCOPY%;t t -s%@GRUB_LIBS@%$GRUB_LIBS%;t t -s%@NETBOOT_SUPPORT_TRUE@%$NETBOOT_SUPPORT_TRUE%;t t -s%@NETBOOT_SUPPORT_FALSE@%$NETBOOT_SUPPORT_FALSE%;t t -s%@DISKLESS_SUPPORT_TRUE@%$DISKLESS_SUPPORT_TRUE%;t t -s%@DISKLESS_SUPPORT_FALSE@%$DISKLESS_SUPPORT_FALSE%;t t -s%@FSYS_CFLAGS@%$FSYS_CFLAGS%;t t -s%@NET_CFLAGS@%$NET_CFLAGS%;t t -s%@NET_EXTRAFLAGS@%$NET_EXTRAFLAGS%;t t -s%@NETBOOT_DRIVERS@%$NETBOOT_DRIVERS%;t t CEOF - EOF - cat >>$CONFIG_STATUS <<\EOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds="" - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag - else - sed "${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag - fi - if test ! -s $ac_cs_root.sfrag; then - ac_more_lines=false - rm -f $ac_cs_root.sfrag - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $ac_cs_root.sfrag) >$ac_cs_root.s$ac_sed_frag - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $ac_cs_root.s$ac_sed_frag" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $ac_cs_root.s$ac_sed_frag" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file fi -fi # test -n "$CONFIG_FILES" - + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi EOF -cat >>$CONFIG_STATUS <<\EOF + +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file" | sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file" | sed 's%:.*%%'` ;; + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo "$ac_file" | sed 's%/[^/][^/]*$%%'` + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then # The file is in a subdirectory. test ! -d "$ac_dir" && mkdir "$ac_dir" ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's%/[^/]*%../%g'` + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` else ac_dir_suffix= ac_dots= fi @@ -3143,212 +3049,154 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then case "$ac_given_srcdir" in .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots | sed 's%/$%%'`; fi ;; - [/\\]* | ?:[/\\]* ) - srcdir="$ac_given_srcdir$ac_dir_suffix"; - top_srcdir=$ac_given_srcdir ;; + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; esac case "$ac_given_INSTALL" in - [/\\$]* | ?:[/\\]* ) INSTALL="$ac_given_INSTALL" ;; + [/$]*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac echo creating "$ac_file" rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in | - sed 's%.*/%%'` by configure." + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." case "$ac_file" in - *[Mm]akefile*) ac_comsub="1i\\ + *Makefile*) ac_comsub="1i\\ # $configure_input" ;; *) ac_comsub= ;; esac - # Don't redirect the output to AC_FILE directly: use `mv' so that updating - # is atomic, and doesn't need trapping. - ac_file_inputs=`echo "$ac_file_in" | - sed -e "s%^%$ac_given_srcdir/%;s%:% $ac_given_srcdir/%g"` - for ac_file_input in $ac_file_inputs; - do - test -f "$ac_file_input" || - { echo "configure: error: cannot find input file \`$ac_file_input'" 1>&2; exit 1; } - done -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s%@configure_input@%$configure_input%;t t -s%@srcdir@%$srcdir%;t t -s%@top_srcdir@%$top_srcdir%;t t -s%@INSTALL@%$INSTALL%;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$ac_cs_root.out - mv $ac_cs_root.out $ac_file - +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +s%@INSTALL@%$INSTALL%g +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file fi; done -rm -f $ac_cs_root.s* -EOF -cat >>$CONFIG_STATUS <<\EOF - -# -# CONFIG_HEADER section. -# +rm -f conftest.s* # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$%\1#\2' -ac_dC=' ' -ac_dD='%;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' +ac_dC='\3' +ac_dD='%g' +# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$%\1#\2define\3' +ac_uB='\([ ]\)%\1#\2define\3' ac_uC=' ' -ac_uD='%;t' +ac_uD='\4%g' +# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_eB='$%\1#\2define\3' +ac_eC=' ' +ac_eD='%g' +if test "${CONFIG_HEADERS+set}" != set; then +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +fi for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file" | sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file" | sed 's%:.*%%'` ;; + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac echo creating $ac_file - rm -f $ac_cs_root.frag $ac_cs_root.in $ac_cs_root.out - ac_file_inputs=`echo "$ac_file_in" | - sed -e "s%^%$ac_given_srcdir/%;s%:% $ac_given_srcdir/%g"` - for ac_file_input in $ac_file_inputs; - do - test -f "$ac_file_input" || - { echo "configure: error: cannot find input file \`$ac_file_input'" 1>&2; exit 1; } - done - # Remove the trailing spaces. - sed -e 's/[ ]*$//' $ac_file_inputs >$ac_cs_root.in + rm -f conftest.frag conftest.in conftest.out + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in EOF -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -cat >$ac_cs_root.hdr <<\EOF +# Transform confdefs.h into a sed script conftest.vals that substitutes +# the proper values into config.h.in to produce config.h. And first: +# Protect against being on the right side of a sed subst in config.status. +# Protect against being in an unquoted here document in config.status. +rm -f conftest.vals +cat > conftest.hdr <<\EOF s/[\\&%]/\\&/g s%[\\$`]%\\&%g -t clear -: clear -s%^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$%${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD}%gp -t cleanup -s%^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -: cleanup +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +s%ac_d%ac_u%gp +s%ac_u%ac_e%gp EOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC_DEFINE to be honored. -uniq confdefs.h | sed -n -f $ac_cs_root.hdr >conftest.defines -sed -e 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f $ac_cs_root.hdr +sed -n -f conftest.hdr confdefs.h > conftest.vals +rm -f conftest.hdr # This sed command replaces #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\EOF +cat >> conftest.vals <<\EOF s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% EOF -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if egrep "^[ ]*#[ ]*define" $ac_cs_root.in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $ac_cs_root.frag. - echo ' cat >$ac_cs_root.frag <>$CONFIG_STATUS - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f $ac_cs_root.frag $ac_cs_root.in >$ac_cs_root.out - rm -f $ac_cs_root.in - mv $ac_cs_root.out $ac_cs_root.in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines -echo ' fi # egrep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS +# Break up conftest.vals because some shells have a limit on +# the size of here documents, and old seds have small limits too. -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS rm -f conftest.tail -while grep . conftest.undefs >/dev/null +while : do - # Write a limited-size here document to $ac_cs_root.frag. - echo ' cat >$ac_cs_root.frag <>$CONFIG_STATUS - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS + ac_lines=`grep -c . conftest.vals` + # grep -c gives empty output for an empty file on some AIX systems. + if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi + # Write a limited-size here document to conftest.frag. + echo ' cat > conftest.frag <> $CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS echo 'CEOF - sed -f $ac_cs_root.frag $ac_cs_root.in >$ac_cs_root.out - rm -f $ac_cs_root.in - mv $ac_cs_root.out $ac_cs_root.in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs + sed -f conftest.frag conftest.in > conftest.out + rm -f conftest.in + mv conftest.out conftest.in +' >> $CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail + rm -f conftest.vals + mv conftest.tail conftest.vals done -rm -f conftest.undefs +rm -f conftest.vals -cat >>$CONFIG_STATUS <<\EOF - rm -f $ac_cs_root.frag $ac_cs_root.h - echo "/* $ac_file. Generated automatically by configure. */" >$ac_cs_root.h - cat $ac_cs_root.in >>$ac_cs_root.h - rm -f $ac_cs_root.in - if cmp -s $ac_file $ac_cs_root.h 2>/dev/null; then +cat >> $CONFIG_STATUS <<\EOF + rm -f conftest.frag conftest.h + echo "/* $ac_file. Generated automatically by configure. */" > conftest.h + cat conftest.in >> conftest.h + rm -f conftest.in + if cmp -s $ac_file conftest.h 2>/dev/null; then echo "$ac_file is unchanged" - rm -f $ac_cs_root.h + rm -f conftest.h else # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo "$ac_file" | sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then # The file is in a subdirectory. test ! -d "$ac_dir" && mkdir "$ac_dir" fi rm -f $ac_file - mv $ac_cs_root.h $ac_file + mv conftest.h $ac_file fi fi; done + EOF -cat >>$CONFIG_STATUS <<\EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h - case "$ac_dest" in - default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;; - default-2 ) test x"$AMDEP" != x"" || for mf in $CONFIG_FILES; do case "$mf" in @@ -3386,18 +3234,11 @@ for mf in $CONFIG_FILES; do echo '# dummy' > "$dirpart/$file" done done - ;; - esac -fi;done -EOF -cat >>$CONFIG_STATUS <<\EOF exit 0 EOF chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files -trap 'exit 1' 1 2 15 - -test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1 +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 diff --git a/configure.in b/configure.in index a3620264a..428f07119 100644 --- a/configure.in +++ b/configure.in @@ -93,7 +93,8 @@ AC_SUBST(STAGE2_CFLAGS) AC_SUBST(GRUB_CFLAGS) # Enforce coding standards. -CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused" +CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused -Wshadow" +CPPFLAGS="$CPPFLAGS -Wpointer-arith -Wundef" if test "x$with_binutils" != x; then dnl AC_PATH_TOOL(OBJCOPY, objcopy, , "$with_binutils:$PATH") diff --git a/grub/asmstub.c b/grub/asmstub.c index 1bbb77062..5fe0dd1f1 100644 --- a/grub/asmstub.c +++ b/grub/asmstub.c @@ -42,7 +42,8 @@ int grub_stage2 (void); #ifdef __linux__ # include /* ioctl */ -# if (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1)) +# if !defined(__GLIBC__) || \ + ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))) /* Maybe libc doesn't have large file support. */ # include /* _llseek */ # include /* BLKFLSBUF */ @@ -274,7 +275,7 @@ big_linux_boot (void) /* booting a multiboot executable */ void -multi_boot (int start, int mbi) +multi_boot (int start, int mb_info) { stop (); } @@ -742,13 +743,14 @@ biosdisk (int subfunc, int drive, struct geometry *geometry, return BIOSDISK_ERROR_GEOMETRY; /* Seek to the specified location. */ -#if defined(__linux__) \ - && ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))) +#if defined(__linux__) && (!defined(__GLIBC__) || \ + ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1)))) /* Maybe libc doesn't have large file support. */ { loff_t offset, result; - static int _llseek (uint fd, ulong hi, ulong lo, loff_t *res, uint wh); - _syscall5 (int, _llseek, uint, fd, ulong, hi, ulong, lo, + static int _llseek (uint seeked_fd, ulong hi, ulong lo, + loff_t *res, uint wh); + _syscall5 (int, _llseek, uint, seeked_fd, ulong, hi, ulong, lo, loff_t *, res, uint, wh); offset = (loff_t) sector * (loff_t) SECTOR_SIZE; diff --git a/lib/device.c b/lib/device.c index ffbf1996d..9114b0ccc 100644 --- a/lib/device.c +++ b/lib/device.c @@ -300,7 +300,7 @@ check_device (const char *device) static int read_device_map (FILE *fp, char **map, const char *map_file) { - static void print_error (int no, const char *msg) + static void show_error (int no, const char *msg) { fprintf (stderr, "%s:%d: error: %s\n", map_file, no, msg); } @@ -330,14 +330,14 @@ read_device_map (FILE *fp, char **map, const char *map_file) if (*ptr != '(') { - print_error (line_number, "No open parenthesis found"); + show_error (line_number, "No open parenthesis found"); return 0; } ptr++; if ((*ptr != 'f' && *ptr != 'h') || *(ptr + 1) != 'd') { - print_error (line_number, "Bad drive name"); + show_error (line_number, "Bad drive name"); return 0; } @@ -348,7 +348,7 @@ read_device_map (FILE *fp, char **map, const char *map_file) drive = strtoul (ptr, &ptr, 10); if (drive < 0 || drive > 8) { - print_error (line_number, "Bad device number"); + show_error (line_number, "Bad device number"); return 0; } @@ -357,7 +357,7 @@ read_device_map (FILE *fp, char **map, const char *map_file) if (*ptr != ')') { - print_error (line_number, "No close parenthesis found"); + show_error (line_number, "No close parenthesis found"); return 0; } @@ -368,7 +368,7 @@ read_device_map (FILE *fp, char **map, const char *map_file) if (! *ptr) { - print_error (line_number, "No filename found"); + show_error (line_number, "No filename found"); return 0; } diff --git a/lib/device.h b/lib/device.h index 7385c60de..9eb419725 100644 --- a/lib/device.h +++ b/lib/device.h @@ -36,7 +36,7 @@ extern void get_drive_geometry (struct geometry *geom, char **map, int drive); extern int check_device (const char *device); extern int init_device_map (char ***map, const char *map_file, - int floppy_disks); + int no_floppies); extern void restore_device_map (char **map); #endif /* DEVICE_MAP_HEADER */ diff --git a/stage2/asm.S b/stage2/asm.S index e62a1b0a8..0c351377a 100644 --- a/stage2/asm.S +++ b/stage2/asm.S @@ -1735,7 +1735,7 @@ ENTRY(big_linux_boot) /* - * multi_boot(int start, int mbi) + * multi_boot(int start, int mb_info) * * This starts a kernel in the manner expected of the multiboot standard. */ diff --git a/stage2/builtins.c b/stage2/builtins.c index 49d0a07a7..0711f6bfb 100644 --- a/stage2/builtins.c +++ b/stage2/builtins.c @@ -1735,19 +1735,19 @@ install_func (char *arg, int flags) grub_strcpy (config_file_location, ptr); else { - char *config_file; + char *real_config; unsigned long device; /* Translate the external device syntax to the internal device syntax. */ - if (! (config_file = set_device (ptr))) + if (! (real_config = set_device (ptr))) { /* The Stage 2 PTR does not contain the device name, so use the root device instead. */ errnum = ERR_NONE; current_drive = saved_drive; current_partition = saved_partition; - config_file = ptr; + real_config = ptr; } if (current_drive == src_drive) @@ -1761,7 +1761,8 @@ install_func (char *arg, int flags) device = (current_drive << 24) | current_partition; grub_memmove (config_file_location, (char *) &device, sizeof (device)); - grub_strcpy (config_file_location + sizeof (device), config_file); + grub_strcpy (config_file_location + sizeof (device), + real_config); } /* If a Stage 1.5 is used, then we need to modify the Stage2. */ @@ -2718,12 +2719,12 @@ setup_func (char *arg, int flags) /* Point to the string of the drive/parition where the GRUB images reside. */ char *image_ptr; - unsigned long install_drive, install_partition; + unsigned long installed_drive, installed_partition; unsigned long image_drive, image_partition; unsigned long tmp_drive, tmp_partition; char stage1[64]; char stage2[64]; - char config_file[64]; + char config_filename[64]; char cmd_arg[256]; char device[16]; char *buffer = (char *) RAW_ADDR (0x100000); @@ -2765,7 +2766,7 @@ setup_func (char *arg, int flags) /* Initialize some strings. */ grub_strcpy (stage1, "/boot/grub/stage1"); grub_strcpy (stage2, "/boot/grub/stage2"); - grub_strcpy (config_file, "/boot/grub/menu.lst"); + grub_strcpy (config_filename, "/boot/grub/menu.lst"); tmp_drive = saved_drive; tmp_partition = saved_partition; @@ -2785,8 +2786,8 @@ setup_func (char *arg, int flags) if (errnum) return 1; - install_drive = current_drive; - install_partition = current_partition; + installed_drive = current_drive; + installed_partition = current_partition; /* Mount the drive pointed by IMAGE_PTR. */ if (*image_ptr) @@ -2824,7 +2825,7 @@ setup_func (char *arg, int flags) /* If the drive where stage2 resides is a hard disk, try to use a Stage 1.5. */ - if ((image_drive & 0x80) && (install_drive & 0x80)) + if ((image_drive & 0x80) && (installed_drive & 0x80)) { char *fsys = fsys_table[fsys_type].name; int i; @@ -2840,14 +2841,14 @@ setup_func (char *arg, int flags) int blocksize = (filemax + SECTOR_SIZE - 1) >> SECTOR_BITS; grub_close (); - grub_strcpy (config_file, stage2); + grub_strcpy (config_filename, stage2); grub_strcpy (stage2, stage1_5_map[i].name); - if (install_partition == 0xFFFFFF) + if (installed_partition == 0xFFFFFF) { /* We install GRUB into the MBR, so try to embed the Stage 1.5 in the sectors right after the MBR. */ - sprint_device (install_drive, install_partition); + sprint_device (installed_drive, installed_partition); grub_sprintf (cmd_arg, "%s %s", stage2, device); /* Notify what will be run. */ @@ -2862,8 +2863,8 @@ setup_func (char *arg, int flags) /* Need to prepend the device name to the configuration filename. */ sprint_device (image_drive, image_partition); - grub_sprintf (buffer, "%s%s", device, config_file); - grub_strcpy (config_file, buffer); + grub_sprintf (buffer, "%s%s", device, config_filename); + grub_strcpy (config_filename, buffer); } else goto fail; @@ -2884,28 +2885,28 @@ setup_func (char *arg, int flags) /* Construct a string that is used by the command "install" as its arguments. */ - sprint_device (install_drive, install_partition); + sprint_device (installed_drive, installed_partition); #ifdef NO_BUGGY_BIOS_IN_THE_WORLD /* I prefer this, but... */ grub_sprintf (cmd_arg, "%s%s %s%s %s p %s", is_force_lba? "--force-lba " : "", stage1, - (install_drive != image_drive) ? "d " : "", + (installed_drive != image_drive) ? "d " : "", device, stage2, - config_file); + config_filename); #else /* ! NO_BUGGY_BIOS_IN_THE_WORLD */ /* Actually, there are several buggy BIOSes in the world, so we may not expect that your BIOS will pass a booting drive to stage1 correctly. Thus, always specify the option `d', whether - INSTALL_DRIVE is identical with IMAGE_DRIVE or not. *sigh* */ + INSTALLED_DRIVE is identical with IMAGE_DRIVE or not. *sigh* */ grub_sprintf (cmd_arg, "%s%s d %s %s p %s", is_force_lba? "--force-lba " : "", stage1, device, stage2, - config_file); + config_filename); #endif /* ! NO_BUGGY_BIOS_IN_THE_WORLD */ /* Notify what will be run. */ diff --git a/stage2/char_io.c b/stage2/char_io.c index 57448bfd5..c5ad71bb9 100644 --- a/stage2/char_io.c +++ b/stage2/char_io.c @@ -64,9 +64,9 @@ convert_to_ascii (char *buf, int c,...) char *ptr2 = buf; while (ptr1 > ptr2) { - int c = *ptr1; + int tmp = *ptr1; *ptr1 = *ptr2; - *ptr2 = c; + *ptr2 = tmp; ptr1--; ptr2++; } @@ -228,14 +228,14 @@ get_cmdline (char *prompt, char *cmdline, int maxlen, /* The working buffer for the command-line. */ char *buf = (char *) CMDLINE_BUF; /* The kill buffer. */ - char *kill = (char *) KILL_BUF; + char *kill_buf = (char *) KILL_BUF; /* nested function definition for code simplicity */ - static void cl_print (char *str, int echo_char) + static void cl_print (char *str, int real_echo_char) { while (*str != 0) { - putchar (echo_char ? echo_char : *str); + putchar (real_echo_char ? real_echo_char : *str); str++; if (++xend > 78) { @@ -465,9 +465,9 @@ get_cmdline (char *prompt, char *cmdline, int maxlen, case 21: /* C-u kill to beginning of line */ if (lpos == 0) break; - /* Copy the string being deleted to KILL. */ - grub_memmove (kill, buf, lpos); - kill[lpos] = 0; + /* Copy the string being deleted to KILL_BUF. */ + grub_memmove (kill_buf, buf, lpos); + kill_buf[lpos] = 0; grub_memmove (buf, buf + lpos, llen - lpos + 1); lpos = llen - lpos; cl_setcpos (); @@ -480,12 +480,12 @@ get_cmdline (char *prompt, char *cmdline, int maxlen, case 11: /* C-k kill to end of line */ if (lpos == llen) break; - /* Copy the string being deleted to KILL. */ - grub_memmove (kill, buf + lpos, llen - lpos + 1); + /* Copy the string being deleted to KILL_BUF. */ + grub_memmove (kill_buf, buf + lpos, llen - lpos + 1); cl_kill_to_end (); break; case 25: /* C-y yank the kill buffer */ - cl_insert (kill); + cl_insert (kill_buf); break; case 16: /* C-p fetch the previous command */ { diff --git a/stage2/disk_inode_ffs.h b/stage2/disk_inode_ffs.h index 11170727d..1c8caa158 100644 --- a/stage2/disk_inode_ffs.h +++ b/stage2/disk_inode_ffs.h @@ -56,7 +56,7 @@ #define i_nlink ic_nlink #define i_uid ic_uid #define i_gid ic_gid -#if BYTE_MSF +#if defined(BYTE_MSF) && BYTE_MSF #define i_size ic_size.val[1] #else /* BYTE_LSF */ #define i_size ic_size.val[0] diff --git a/stage2/fsys_ext2fs.c b/stage2/fsys_ext2fs.c index 16130b2dc..5c39532d9 100644 --- a/stage2/fsys_ext2fs.c +++ b/stage2/fsys_ext2fs.c @@ -636,7 +636,7 @@ ext2fs_dir (char *dirname) memmove (linkbuf, (char *) INODE->i_block, len); } -#if E2DEBUG +#ifdef E2DEBUG printf ("symlink=%s\n", linkbuf); #endif diff --git a/stage2/fsys_reiserfs.c b/stage2/fsys_reiserfs.c index ca4b1f670..d2f698efd 100644 --- a/stage2/fsys_reiserfs.c +++ b/stage2/fsys_reiserfs.c @@ -1,3 +1,4 @@ +/* fsys_reiserfs.c - an implementation for the ReiserFS filesystem */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 2000 Free Software Foundation, Inc. diff --git a/stage2/shared.h b/stage2/shared.h index 3e2ec51cc..6f2e7ecf4 100644 --- a/stage2/shared.h +++ b/stage2/shared.h @@ -611,7 +611,7 @@ void linux_boot (void) __attribute__ ((noreturn)); void big_linux_boot (void) __attribute__ ((noreturn)); /* booting a multiboot executable */ -void multi_boot (int start, int mbi) __attribute__ ((noreturn)); +void multi_boot (int start, int mb_info) __attribute__ ((noreturn)); /* If LINEAR is nonzero, then set the Intel processor to linear mode. Otherwise, bit 20 of all memory accesses is always forced to zero, @@ -688,7 +688,7 @@ void set_attrib (int attr); /* Low-level disk I/O */ int get_diskinfo (int drive, struct geometry *geometry); -int biosdisk (int read, int drive, struct geometry *geometry, +int biosdisk (int subfunc, int drive, struct geometry *geometry, int sector, int nsec, int segment); void stop_floppy (void); diff --git a/stage2/stage2.c b/stage2/stage2.c index 2a4d847bd..5b8ee25a9 100644 --- a/stage2/stage2.c +++ b/stage2/stage2.c @@ -465,7 +465,7 @@ restart: { if (c == 'e') { - int num_entries = 0, i = 0; + int new_num_entries = 0, i = 0; char *new_heap; if (config_entries) @@ -487,7 +487,7 @@ restart: do { while ((*(new_heap++) = cur_entry[i++]) != 0); - num_entries++; + new_num_entries++; } while (config_entries && cur_entry[i]); @@ -496,7 +496,7 @@ restart: *(new_heap++) = 0; if (config_entries) - run_menu (heap, NULL, num_entries, new_heap, 0); + run_menu (heap, NULL, new_num_entries, new_heap, 0); else { cls (); @@ -646,13 +646,13 @@ cmain (void) { int config_len, menu_len, num_entries; char *config_entries, *menu_entries; - char *kill = (char *) KILL_BUF; + char *kill_buf = (char *) KILL_BUF; /* Initialize the environment for restarting Stage 2. */ grub_setjmp (restart_env); /* Initialize the kill buffer. */ - *kill = 0; + *kill_buf = 0; /* Never return. */ for (;;) diff --git a/util/Makefile.in b/util/Makefile.in index 5fe7d5f42..62a95a4fb 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -1,6 +1,6 @@ # Makefile.in generated automatically by automake 1.4a from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -31,8 +31,6 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -57,6 +55,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +@SET_MAKE@ host_alias = @host_alias@ host_triplet = @host@ AMDEP = @AMDEP@ @@ -118,13 +118,14 @@ CFLAGS = @CFLAGS@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(mbchk_SOURCES) +depcomp = $(SHELL) $(top_srcdir)/depcomp +DEP_FILES = @AMDEP@ $(DEPDIR)/mbchk.Po DIST_COMMON = Makefile.am Makefile.in grub-image.in grub-install.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) GZIP_ENV = --best -DEP_FILES = .deps/mbchk.P SOURCES = $(mbchk_SOURCES) OBJECTS = $(am_mbchk_OBJECTS) @@ -134,7 +135,7 @@ all: all-redirect $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu util/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -206,8 +207,6 @@ uninstall-sbinSCRIPTS: echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ rm -f $(DESTDIR)$(sbindir)/$$f; \ done -.c.o: - $(COMPILE) -c $< tags: TAGS @@ -218,7 +217,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -242,56 +241,40 @@ distclean-tags: maintainer-clean-tags: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu util/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - -DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) - --include $(DEP_FILES) +@AMDEP@include $(DEPDIR)/mbchk.Po mostlyclean-depend: clean-depend: distclean-depend: - -rm -rf .deps + -rm -rf $(DEPDIR) maintainer-clean-depend: -%.o: %.c - @echo '$(COMPILE) -c -o $@ $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< - @-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \ - tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*D)/$(*F).P; \ - rm .deps/$(*D)/$(*F).pp +@AMDEP@CCDEPMODE = @CCDEPMODE@ -%.lo: %.c - @echo '$(LTCOMPILE) -c -o $@ $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \ - tr ' ' '\012' < .deps/$(*D)/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*D)/$(*F).P; \ - rm -f .deps/$(*D)/$(*F).pp +.c.o: +@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done info-am: info: info-am dvi-am: @@ -328,6 +311,7 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: + -rm -f Makefile.in mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ mostlyclean-tags mostlyclean-depend mostlyclean-generic @@ -357,8 +341,8 @@ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile uninstall-sbinSCRIPTS install-sbinSCRIPTS tags \ mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -distdir mostlyclean-depend distclean-depend clean-depend \ -maintainer-clean-depend info-am info dvi-am dvi check check-am \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend distdir info-am info dvi-am dvi check check-am \ installcheck-am installcheck install-exec-am install-exec \ install-data-am install-data install-am install uninstall-am uninstall \ all-redirect all-am all install-strip installdirs mostlyclean-generic \