diff -urN grub-0.93/config.h.in grub-0.93-os/config.h.in --- grub-0.93/config.h.in Tue Apr 16 00:09:16 2002 +++ grub-0.93-os/config.h.in Sun Jan 5 14:20:02 2003 @@ -1,6 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ -/* This file is still needed because the defines below are - AC_DEFINEd in more than one place. */ +/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ /* Defined if you have a curses library (ncurses preferred). */ #undef HAVE_LIBCURSES @@ -35,74 +33,36 @@ /* Defined if the user specified --enable-auto-linux-mem-opt. */ #undef AUTO_LINUX_MEM_OPT -/* 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 to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_CURSES_H -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NCURSES_CURSES_H - -/* Define to 1 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 to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H +/* Define if you have the header file. */ +#undef HAVE_NCURSES_CURSES_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H +/* Define if you have the header file. */ +#undef HAVE_STRINGS_H /* Name of package */ #undef PACKAGE -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME +/* Version number of package */ +#undef VERSION -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING +/* Define if C symbols get an underscore after compilation */ +#undef HAVE_ASM_USCORE -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME +/* Define it to "addr32" or "addr32;" to make GAS happy */ +#undef ADDR32 -/* Define to the version of this package. */ -#undef PACKAGE_VERSION +/* Define it to "data32" or "data32;" to make GAS happy */ +#undef DATA32 -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS +/* Define if opendisk() in -lutil can be used */ +#undef HAVE_OPENDISK -/* Version number of package */ -#undef VERSION diff -urN grub-0.93/configure grub-0.93-os/configure --- grub-0.93/configure Fri Nov 29 21:28:30 2002 +++ grub-0.93-os/configure Sun Jan 5 15:59:13 2003 @@ -1,310 +1,160 @@ #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53. +# Generated automatically using autoconf version 2.13 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - - -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# NLS nuisances. -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } - - -# Name of the executable. -as_me=`(basename "$0") 2>/dev/null || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conftest.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } - - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -exec 6>&1 - -# -# Initializations. -# +# Defaults: +ac_help= ac_default_prefix=/usr/local -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - -ac_unique_file="stage2/stage2.c" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#if HAVE_SYS_TYPES_H -# include -#endif -#if HAVE_SYS_STAT_H -# include -#endif -#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 -#endif -#if HAVE_STRINGS_H -# include -#endif -#if HAVE_INTTYPES_H -# include -#else -# if HAVE_STDINT_H -# include -# endif -#endif -#if HAVE_UNISTD_H -# include -#endif" - +# 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-vstafs disable VSTa FS support in Stage 2" +ac_help="$ac_help + --disable-jfs disable IBM JFS support in Stage 2" +ac_help="$ac_help + --disable-xfs disable SGI XFS support in Stage 2" +ac_help="$ac_help + --disable-gunzip disable decompression in Stage 2" +ac_help="$ac_help + --disable-md5-password disable MD5 password support 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-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-davicom enable Davicom driver" +ac_help="$ac_help + --enable-depca enable DEPCA and EtherWORKS driver" +ac_help="$ac_help + --enable-eepro enable Etherexpress Pro/10 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-pcnet32 enable Uwe Dannowskis 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-natsemi enable NatSemi DP8381x driver" +ac_help="$ac_help + --enable-ni5010 enable Racal-Interlan NI5010 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-sis900 enable SIS 900 and SIS 7016 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-w89c840 enable Winbond W89c840, Compex RL100-ATX 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-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" +ac_help="$ac_help + --disable-hercules disable hercules terminal support" +ac_help="$ac_help + --disable-serial disable serial terminal support" +ac_help="$ac_help + --enable-serial-speed-simulation + simulate the slowness of a serial device" +ac_help="$ac_help + --enable-preset-menu=FILE + preset a menu file FILE in Stage 2" +ac_help="$ac_help + --enable-example-kernel + build the example Multiboot kernel" +ac_help="$ac_help + --disable-auto-linux-mem-opt + don't pass Linux mem= option automatically" # Initialize some variables set by options. -ac_init_help= -ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. -cache_file=/dev/null +build=NONE +cache_file=./config.cache exec_prefix=NONE +host=NONE no_create= +nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -313,15 +163,10 @@ silent= site= srcdir= +target=NONE verbose= x_includes=NONE x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' @@ -335,9 +180,17 @@ infodir='${prefix}/info' mandir='${prefix}/man' +# Initialize some other variables. +subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} +# Maximum number of lines to put in a shell here document. +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" @@ -345,59 +198,59 @@ continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + 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. - case $ac_option in + case "$ac_option" in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; + bindir="$ac_optarg" ;; -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; + ac_prev=build ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; + build="$ac_optarg" ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; + cache_file="$ac_optarg" ;; -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ | --da=*) - datadir=$ac_optarg ;; + datadir="$ac_optarg" ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + 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=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + 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=yes ;; esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval "enable_${ac_feature}='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -406,47 +259,95 @@ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; + exec_prefix="$ac_optarg" ;; -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; + -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_alias ;; + ac_prev=host ;; -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; + host="$ac_optarg" ;; -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; + includedir="$ac_optarg" ;; -infodir | --infodir | --infodi | --infod | --info | --inf) ac_prev=infodir ;; -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; + infodir="$ac_optarg" ;; -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; + libdir="$ac_optarg" ;; -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | --libexe | --libex | --libe) ac_prev=libexecdir ;; -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; + libexecdir="$ac_optarg" ;; -localstatedir | --localstatedir | --localstatedi | --localstated \ | --localstate | --localstat | --localsta | --localst \ @@ -455,19 +356,19 @@ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir=$ac_optarg ;; + localstatedir="$ac_optarg" ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; + mandir="$ac_optarg" ;; -nfp | --nfp | --nf) # Obsolete; use --without-fp. with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) + | --no-cr | --no-c) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -481,26 +382,26 @@ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; + oldincludedir="$ac_optarg" ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; + prefix="$ac_optarg" ;; -program-prefix | --program-prefix | --program-prefi | --program-pref \ | --program-pre | --program-pr | --program-p) ac_prev=program_prefix ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; + program_prefix="$ac_optarg" ;; -program-suffix | --program-suffix | --program-suffi | --program-suff \ | --program-suf | --program-su | --program-s) ac_prev=program_suffix ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; + program_suffix="$ac_optarg" ;; -program-transform-name | --program-transform-name \ | --program-transform-nam | --program-transform-na \ @@ -517,7 +418,7 @@ | --program-transfo=* | --program-transf=* \ | --program-trans=* | --program-tran=* \ | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; + program_transform_name="$ac_optarg" ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) @@ -527,7 +428,7 @@ ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; + sbindir="$ac_optarg" ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -538,57 +439,58 @@ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; + sharedstatedir="$ac_optarg" ;; -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) - site=$ac_optarg ;; + site="$ac_optarg" ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; + srcdir="$ac_optarg" ;; -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | --syscon | --sysco | --sysc | --sys | --sy) ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; + sysconfdir="$ac_optarg" ;; -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; + ac_prev=target ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; + target="$ac_optarg" ;; -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=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); 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"`;; + case "$ac_option" in + *=*) ;; *) ac_optarg=yes ;; esac - eval "with_$ac_package='$ac_optarg'" ;; + eval "with_${ac_package}='$ac_optarg'" ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_package=`echo $ac_option|sed -e 's/-*without-//'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + 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" ;; --x) # Obsolete; use --with-x. @@ -599,110 +501,99 @@ ac_prev=x_includes ;; -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; + x_includes="$ac_optarg" ;; -x-libraries | --x-libraries | --x-librarie | --x-librari \ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ac_prev=x_libraries ;; -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; + x_libraries="$ac_optarg" ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + 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; } + fi + nonopt="$ac_option" ;; esac done if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +# File descriptor usage: +# 0 standard input +# 1 file creation +# 2 errors and warnings +# 3 some systems may open it to /dev/tty +# 4 used on the Kubota Titan +# 6 checking for... messages and results +# 5 compiler messages saved in config.log +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 +fi +exec 5>./config.log -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir +echo "\ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +" 1>&5 + +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell metacharacters. +ac_configure_args= +for ac_arg do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --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_configure_args="$ac_configure_args '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; esac done -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- +# NLS nuisances. +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi -test "$silent" = yes && exec 6>/dev/null +# 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 +# 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. +ac_unique_file=stage2/stage2.c # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + ac_prog=$0 + 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 srcdir=.. @@ -712,450 +603,13 @@ fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } fi fi -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -_ACEOF - - cat <<_ACEOF -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] -_ACEOF - - cat <<\_ACEOF - -Program names: - --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 - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -_ACEOF -fi - -if test -n "$ac_init_help"; then - - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --disable-ext2fs disable ext2fs support in Stage 2 - --disable-fat disable FAT support in Stage 2 - --disable-ffs disable FFS support in Stage 2 - --disable-minix disable Minix fs support in Stage 2 - --disable-reiserfs disable ReiserFS support in Stage 2 - --disable-vstafs disable VSTa FS support in Stage 2 - --disable-jfs disable IBM JFS support in Stage 2 - --disable-xfs disable SGI XFS support in Stage 2 - --disable-gunzip disable decompression in Stage 2 - --disable-md5-password disable MD5 password support in Stage 2 - --disable-packet-retransmission - turn off packet retransmission - --enable-pci-direct access PCI directly instead of using BIOS - --enable-3c509 enable 3Com509 driver - --enable-3c529 enable 3Com529 driver - --enable-3c595 enable 3Com595 driver - --enable-3c90x enable 3Com90x driver - --enable-cs89x0 enable CS89x0 driver - --enable-davicom enable Davicom driver - --enable-depca enable DEPCA and EtherWORKS driver - --enable-eepro enable Etherexpress Pro/10 driver - --enable-eepro100 enable Etherexpress Pro/100 driver - --enable-epic100 enable SMC 83c170 EPIC/100 driver - --enable-3c507 enable 3Com507 driver - --enable-exos205 enable EXOS205 driver - --enable-ni5210 enable Racal-Interlan NI5210 driver - --enable-lance enable Lance PCI PCNet/32 driver - --enable-ne2100 enable Novell NE2100 driver - --enable-ni6510 enable Racal-Interlan NI6510 driver - --enable-natsemi enable NatSemi DP8381x driver - --enable-ni5010 enable Racal-Interlan NI5010 driver - --enable-3c503 enable 3Com503 driver - --enable-ne enable NE1000/2000 ISA driver - --enable-ns8390 enable NE2000 PCI driver - --enable-wd enable WD8003/8013, SMC8216/8416 driver - --enable-otulip enable old Tulip driver - --enable-rtl8139 enable Realtek 8139 driver - --enable-sis900 enable SIS 900 and SIS 7016 driver - --enable-sk-g16 enable Schneider and Koch G16 driver - --enable-smc9000 enable SMC9000 driver - --enable-tiara enable Tiara driver - --enable-tulip enable Tulip driver - --enable-via-rhine enable Rhine-I/II driver - --enable-w89c840 enable Winbond W89c840, Compex RL100-ATX driver - --enable-3c503-shmem use 3c503 shared memory mode - --enable-3c503-aui use AUI by default on 3c503 cards - --enable-compex-rl2000-fix - specify this if you have a Compex RL2000 PCI - --enable-smc9000-scan=LIST - probe for SMC9000 I/O addresses using LIST - --enable-ne-scan=LIST probe for NE base address using LIST - --enable-wd-default-mem=MEM - set the default memory location for WD/SMC - --enable-cs-scan=LIST probe for CS89x0 base address using LIST - --enable-diskless enable diskless support - --disable-hercules disable hercules terminal support - --disable-serial disable serial terminal support - --enable-serial-speed-simulation - simulate the slowness of a serial device - --enable-preset-menu=FILE - preset a menu file FILE in Stage 2 - --enable-example-kernel - build the example Multiboot kernel - --disable-auto-linux-mem-opt - don't pass Linux mem= option automatically - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-binutils=DIR search the directory DIR to find binutils - --without-curses do not use curses - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory - CPP C preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -_ACEOF -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir - done -fi - -test -n "$ac_init_help" && exit 0 -if $ac_init_version; then - cat <<\_ACEOF - -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit 0 -fi -exec 5>config.log -cat >&5 <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by $as_me, which was -generated by GNU Autoconf 2.53. Invocation command line was - - $ $0 $@ - -_ACEOF -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell meta-characters. -ac_configure_args= -ac_sep= -for ac_arg -do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n ) continue ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - esac - # Get rid of the leading space. -done - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -{ - (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) - sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; - *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} - echo - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - sed "/^$/d" confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core core.* *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status - ' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# 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 - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then @@ -1166,102 +620,39 @@ fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 + echo "loading site script $ac_site_file" . "$ac_site_file" fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; - esac - fi + echo "loading cache $cache_file" + . $cache_file else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + echo "creating cache $cache_file" + > $cache_file fi ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - +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 + +ac_exeext= +ac_objext=o +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # 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 + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi +else + ac_n= ac_c='\c' ac_t= +fi ac_aux_dir= @@ -1274,20 +665,18 @@ 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 "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); 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. + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +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. + + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -1296,78 +685,65 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # 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 "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:694: 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" >&6 +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + if test -f $ac_dir/$ac_prog; then + if test $ac_prog = install && + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi done - done - ;; -esac -done - + ;; + esac + done + IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install + INSTALL="$ac_cv_path_install" else # As a last resort, use the slow shell script. We don't cache a # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the path is relative. - INSTALL=$ac_install_sh + INSTALL="$ac_install_sh" fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&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 "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 +echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 +echo "configure:747: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftest.file @@ -1390,11 +766,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" 1>&2; exit 1; } fi test "$2" = conftest.file @@ -1403,30 +776,28 @@ # Ok. : else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: newly created file is older than distributed files! +Check your system clock" 1>&2; exit 1; } +fi +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 +s,\\,\\\\,g; s,\$,$$,g +EOF_SED + program_transform_name="`echo $program_transform_name|sed -f conftestsed`" + rm -f conftestsed fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 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" -# Double any \ or $. echo might interpret backslashes. -# By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed - + program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" -# expand $ac_aux_dir to an absolute path -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +# 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} $am_aux_dir/missing" # Use eval to expand $SHELL @@ -1435,84 +806,76 @@ else am_missing_run= am_backtick='`' - { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 -echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;} + echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2 fi -for ac_prog in gawk mawk nawk awk +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. +# Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:818: 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 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - + 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 +AWK="$ac_cv_prog_AWK" if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + echo "$ac_t""$AWK" 1>&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi - test -n "$AWK" && break +test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 -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" >&6 +echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +echo "configure:848: checking whether ${MAKE-make} sets \${MAKE}" >&5 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.make <<\_ACEOF + cat > conftestmake <<\EOF all: @echo 'ac_maketemp="${MAKE}"' -_ACEOF +EOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then eval ac_cv_prog_make_${ac_make}_set=yes else eval ac_cv_prog_make_${ac_make}_set=no fi -rm -f conftest.make +rm -f conftestmake fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&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 -fi; if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -1544,23 +907,19 @@ # test to see if srcdir already configured if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; } fi # Define the identity of the package. PACKAGE=grub -VERSION=0.93 - -cat >>confdefs.h <<_ACEOF +VERSION=0.93-os +cat >> confdefs.h <>confdefs.h <<_ACEOF +cat >> confdefs.h </dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +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 $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:976: 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 case "$host_cpu" in i[3456]86) host_cpu=i386 ;; -*) { { echo "$as_me:$LINENO: error: unsupported CPU type" >&5 -echo "$as_me: error: unsupported CPU type" >&2;} - { (exit 1); exit 1; }; } ;; +*) { echo "configure: error: unsupported CPU type" 1>&2; exit 1; } ;; esac @@ -1677,18 +1005,18 @@ # Options # -echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:1010: 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" USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no -fi; - echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 +fi + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= @@ -1698,52 +1026,46 @@ 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 "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1036: 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 - [\\/]* | ?:[\\/]*) + 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. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PERL="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -PERL=$ac_cv_path_PERL - +PERL="$ac_cv_path_PERL" if test -n "$PERL"; then - echo "$as_me:$LINENO: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6 + echo "$ac_t""$PERL" 1>&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi if test -z "$PERL"; then - { { echo "$as_me:$LINENO: error: perl not found" >&5 -echo "$as_me: error: perl not found" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: perl not found" 1>&2; exit 1; } fi fi @@ -1756,707 +1078,270 @@ # Programs # -if test -n "$ac_tool_prefix"; then - # 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 "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:1083: checking build system type" >&5 -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +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 - CC=$ac_ct_CC +if test $host != $build; then + ac_tool_prefix=${host_alias}- else - CC="$ac_cv_prog_CC" + ac_tool_prefix= fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +# 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 "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1109: 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 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - + 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 +CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + echo "$ac_t""$CC" 1>&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1141: 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 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - + 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 +CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + echo "$ac_t""$CC" 1>&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -fi 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 "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1171: 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 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - + 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 + 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 shift - if test $# != 0; then + if test $# -gt 0; then # We chose a different compiler from the bogus one. # 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 "$as_dir/$ac_word" ${1+"$@"} + set dummy "$ac_dir/$ac_word" "$@" shift ac_cv_prog_CC="$@" fi fi fi fi -CC=$ac_cv_prog_CC +CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + echo "$ac_t""$CC" 1>&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&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:1222: 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 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - + 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 +CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + echo "$ac_t""$CC" 1>&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - 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 "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + ;; + esac fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi - test -n "$ac_ct_CC" && break -done - - CC=$ac_ct_CC -fi - -fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1254: 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. +ac_cpp='$CPP $CPPFLAGS' +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 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } +cat > conftest.$ac_ext << EOF -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 1265 "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -echo "$as_me:$LINENO: checking for C compiler default output" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; - * ) break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 - -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no +main(){return(0);} +EOF +if { (eval echo configure:1270: \"$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 + ac_cv_prog_cc_cross=no else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} - { (exit 1); exit 1; }; } - fi + ac_cv_prog_cc_cross=yes fi -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -rm -f a.out a.exe conftest$ac_cv_exeext -ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +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 "$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 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:1296: 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 $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:1301: 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 <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +EOF +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" + ac_cv_prog_gcc=no +fi +fi -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -#ifndef __GNUC__ - choke me -#endif +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_compiler_gnu=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test $ac_cv_prog_gcc = yes; then + GCC=yes else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ + GCC= +fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:1329: 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 +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* + fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS + CFLAGS="$ac_save_CFLAGS" elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then CFLAGS="-g -O2" @@ -2470,130 +1355,7 @@ CFLAGS= fi fi -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -$ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -continue -fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_config_commands="$ac_config_commands default-1" am_make=${MAKE-make} cat > confinc << 'END' @@ -2601,8 +1363,8 @@ @echo done END # If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6 +echo "configure:1368: checking for style of include used by $am_make" >&5 am__include='#' am__quote= _am_result=none @@ -2629,17 +1391,16 @@ fi -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 +echo "$ac_t""$_am_result" 1>&6 rm -f confinc confmf depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6 +echo "configure:1402: 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_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -2698,8 +1459,8 @@ fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 + +echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" @@ -2707,10 +1468,10 @@ depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6 +echo "configure:1473: 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_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -2769,8 +1530,8 @@ fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 + +echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" @@ -2778,139 +1539,85 @@ AS="$CC" - # Check whether --with-binutils or --without-binutils was given. if test "${with_binutils+set}" = set; then withval="$with_binutils" + : +fi -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 "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1554: 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 - [\\/]* | ?:[\\/]*) + 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. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in "$with_binutils:$PATH" -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy=""$with_binutils:$PATH"" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_RANLIB="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" test -z "$ac_cv_path_RANLIB" && ac_cv_path_RANLIB=":" ;; esac fi -RANLIB=$ac_cv_path_RANLIB - +RANLIB="$ac_cv_path_RANLIB" if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + echo "$ac_t""$RANLIB" 1>&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi else - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1591: 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 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - + 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 +RANLIB="$ac_cv_prog_RANLIB" if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - RANLIB=$ac_ct_RANLIB + echo "$ac_t""$RANLIB" 1>&6 else - RANLIB="$ac_cv_prog_RANLIB" + echo "$ac_t""no" 1>&6 fi fi # optimization flags -if test "x$ac_cv_c_compiler_gnu" = xyes; then +if test "x$ac_cv_prog_gcc" = xyes; then if test "x$default_CFLAGS" = xyes; then CFLAGS="-g" # If the user specify the directory for binutils, add the option `-B'. @@ -2919,57 +1626,37 @@ fi STAGE1_CFLAGS="-O2" GRUB_CFLAGS="-O2" - echo "$as_me:$LINENO: checking whether optimization for size works" >&5 -echo $ECHO_N "checking whether optimization for size works... $ECHO_C" >&6 -if test "${size_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking whether optimization for size works""... $ac_c" 1>&6 +echo "configure:1631: 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 <<_ACEOF -#line $LINENO "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:1646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* size_flag=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -size_flag=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + size_flag=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* CFLAGS=$saved_CFLAGS - + fi -echo "$as_me:$LINENO: result: $size_flag" >&5 -echo "${ECHO_T}$size_flag" >&6 + +echo "$ac_t""$size_flag" 1>&6 if test "x$size_flag" = xyes; then STAGE2_CFLAGS="-Os" else @@ -2986,109 +1673,71 @@ CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused -Wshadow" CPPFLAGS="$CPPFLAGS -Wpointer-arith" -echo "$as_me:$LINENO: checking whether -Wundef works" >&5 -echo $ECHO_N "checking whether -Wundef works... $ECHO_C" >&6 -if test "${undef_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking whether -Wundef works""... $ac_c" 1>&6 +echo "configure:1678: checking whether -Wundef works" >&5 +if eval "test \"`echo '$''{'undef_flag'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - + saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-Wundef" - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:1693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* undef_flag=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -undef_flag=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + undef_flag=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* CPPFLAGS="$saved_CPPFLAGS" fi -echo "$as_me:$LINENO: result: $undef_flag" >&5 -echo "${ECHO_T}$undef_flag" >&6 + +echo "$ac_t""$undef_flag" 1>&6 # The options `-falign-*' are supported by gcc 3.0 or later. # Probably it is sufficient to only check for -falign-loops. -echo "$as_me:$LINENO: checking whether -falign-loops works" >&5 -echo $ECHO_N "checking whether -falign-loops works... $ECHO_C" >&6 -if test "${falign_loop_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking whether -falign-loops works""... $ac_c" 1>&6 +echo "configure:1712: checking whether -falign-loops works" >&5 +if eval "test \"`echo '$''{'falign_loop_flag'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - + saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-falign-loops=1" - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:1727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* falign_loop_flag=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -falign_loop_flag=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + falign_loop_flag=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* CPPFLAGS="$saved_CPPFLAGS" fi -echo "$as_me:$LINENO: result: $falign_loop_flag" >&5 -echo "${ECHO_T}$falign_loop_flag" >&6 + +echo "$ac_t""$falign_loop_flag" 1>&6 # Force no alignment to save space. if test "x$falign_loop_flag" = xyes; then @@ -3104,131 +1753,80 @@ 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 "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_OBJCOPY+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1758: 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 - [\\/]* | ?:[\\/]*) + 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. + ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in "$with_binutils:$PATH" -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_OBJCOPY="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy=""$with_binutils:$PATH"" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_OBJCOPY="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" ;; esac fi -OBJCOPY=$ac_cv_path_OBJCOPY - +OBJCOPY="$ac_cv_path_OBJCOPY" if test -n "$OBJCOPY"; then - echo "$as_me:$LINENO: result: $OBJCOPY" >&5 -echo "${ECHO_T}$OBJCOPY" >&6 + echo "$ac_t""$OBJCOPY" 1>&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi else - if test -n "$ac_tool_prefix"; then # 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 "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_OBJCOPY+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1794: 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 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OBJCOPY="${ac_tool_prefix}objcopy" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - + 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 +OBJCOPY="$ac_cv_prog_OBJCOPY" if test -n "$OBJCOPY"; then - echo "$as_me:$LINENO: result: $OBJCOPY" >&5 -echo "${ECHO_T}$OBJCOPY" >&6 + echo "$ac_t""$OBJCOPY" 1>&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - + echo "$ac_t""no" 1>&6 fi -if test -z "$ac_cv_prog_OBJCOPY"; then - ac_ct_OBJCOPY=$OBJCOPY - # Extract the first word of "objcopy", so it can be a program name with args. -set dummy objcopy; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_OBJCOPY"; then - ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OBJCOPY="objcopy" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -fi -fi -ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY -if test -n "$ac_ct_OBJCOPY"; then - echo "$as_me:$LINENO: result: $ac_ct_OBJCOPY" >&5 -echo "${ECHO_T}$ac_ct_OBJCOPY" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - OBJCOPY=$ac_ct_OBJCOPY -else - OBJCOPY="$ac_cv_prog_OBJCOPY" -fi fi # Defined in acinclude.m4. -echo "$as_me:$LINENO: checking if C symbols get an underscore after compilation" >&5 -echo $ECHO_N "checking if C symbols get an underscore after compilation... $ECHO_C" >&6 -if test "${grub_cv_asm_uscore+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking if C symbols get an underscore after compilation""... $ac_c" 1>&6 +echo "configure:1828: 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 @@ -3239,17 +1837,10 @@ } EOF -if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && test -s conftest.s; then +if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then true else - { { echo "$as_me:$LINENO: error: ${CC-cc} failed to produce assembly code" >&5 -echo "$as_me: error: ${CC-cc} failed to produce assembly code" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: ${CC-cc} failed to produce assembly code" 1>&2; exit 1; } fi if grep _func conftest.s >/dev/null 2>&1; then @@ -3263,20 +1854,18 @@ if test "x$grub_cv_asm_uscore" = xyes; then - -cat >>confdefs.h <<_ACEOF + cat >> confdefs.h <&5 -echo "${ECHO_T}$grub_cv_asm_uscore" >&6 +echo "$ac_t""$grub_cv_asm_uscore" 1>&6 -echo "$as_me:$LINENO: checking whether ${OBJCOPY} works for absolute addresses" >&5 -echo $ECHO_N "checking whether ${OBJCOPY} works for absolute addresses... $ECHO_C" >&6 -if test "${grub_cv_prog_objcopy_absolute+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking whether ${OBJCOPY} works for absolute addresses""... $ac_c" 1>&6 +echo "configure:1867: 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 @@ -3286,46 +1875,21 @@ } EOF -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest.o; then : -else - { { echo "$as_me:$LINENO: error: ${CC-cc} cannot compile C source code" >&5 -echo "$as_me: error: ${CC-cc} cannot compile C source code" >&2;} - { (exit 1); exit 1; }; } +if { (eval echo configure:1879: \"$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 "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then : + if { ac_try='${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec'; { (eval echo configure:1885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : else - { { echo "$as_me:$LINENO: error: ${CC-cc} cannot link at address $link_addr" >&5 -echo "$as_me: error: ${CC-cc} cannot link at address $link_addr" >&2;} - { (exit 1); exit 1; }; } + { 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 "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then : + if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : else - { { echo "$as_me:$LINENO: error: ${OBJCOPY-objcopy} cannot create binary files" >&5 -echo "$as_me: error: ${OBJCOPY-objcopy} cannot create binary files" >&2;} - { (exit 1); exit 1; }; } + { 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 "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then mv -f conftest conftest.old else grub_cv_prog_objcopy_absolute=no @@ -3335,31 +1899,23 @@ rm -f conftest* fi -echo "$as_me:$LINENO: result: $grub_cv_prog_objcopy_absolute" >&5 -echo "${ECHO_T}$grub_cv_prog_objcopy_absolute" >&6 +echo "$ac_t""$grub_cv_prog_objcopy_absolute" 1>&6 if test "x$grub_cv_prog_objcopy_absolute" != xyes; then - { { echo "$as_me:$LINENO: error: GRUB requires a working absolute objcopy; upgrade your binutils" >&5 -echo "$as_me: error: GRUB requires a working absolute objcopy; upgrade your binutils" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: GRUB requires a working absolute objcopy; upgrade your binutils" 1>&2; exit 1; } fi -echo "$as_me:$LINENO: checking whether addr32 must be in the same line as the instruction" >&5 -echo $ECHO_N "checking whether addr32 must be in the same line as the instruction... $ECHO_C" >&6 -if test "${grub_cv_asm_prefix_requirement+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking whether addr32 must be in the same line as the instruction""... $ac_c" 1>&6 +echo "configure:1910: 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 "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && test -s conftest.o; then +if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1919: \"$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 @@ -3377,26 +1933,23 @@ grub_tmp_data32="data32;" fi - -cat >>confdefs.h <<_ACEOF +cat >> confdefs.h <>confdefs.h <<_ACEOF +cat >> confdefs.h <&5 -echo "${ECHO_T}$grub_cv_asm_prefix_requirement" >&6 +echo "$ac_t""$grub_cv_asm_prefix_requirement" 1>&6 -echo "$as_me:$LINENO: checking for .code16 addr32 assembler support" >&5 -echo $ECHO_N "checking for .code16 addr32 assembler support... $ECHO_C" >&6 -if test "${grub_cv_asm_addr32+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for .code16 addr32 assembler support""... $ac_c" 1>&6 +echo "configure:1951: 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 @@ -3409,12 +1962,7 @@ sed -e s/@ADDR32@/addr32\;/ < conftest.s.in > conftest.s fi -if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && test -s conftest.o; then +if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1966: \"$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 @@ -3424,33 +1972,25 @@ fi -echo "$as_me:$LINENO: result: $grub_cv_asm_addr32" >&5 -echo "${ECHO_T}$grub_cv_asm_addr32" >&6 +echo "$ac_t""$grub_cv_asm_addr32" 1>&6 if test "x$grub_cv_asm_addr32" != xyes; then - { { echo "$as_me:$LINENO: error: GRUB requires GAS .code16 addr32 support; upgrade your binutils" >&5 -echo "$as_me: error: GRUB requires GAS .code16 addr32 support; upgrade your binutils" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: GRUB requires GAS .code16 addr32 support; upgrade your binutils" 1>&2; exit 1; } fi -echo "$as_me:$LINENO: checking whether an absolute indirect call/jump must not be prefixed with an asterisk" >&5 -echo $ECHO_N "checking whether an absolute indirect call/jump must not be prefixed with an asterisk... $ECHO_C" >&6 -if test "${grub_cv_asm_absolute_without_asterisk+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking whether an absolute indirect call/jump must not be prefixed with an asterisk""... $ac_c" 1>&6 +echo "configure:1983: 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 "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && test -s conftest.o; then +if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1994: \"$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 @@ -3461,629 +2001,423 @@ if test "x$grub_cv_asm_absolute_without_asterisk" = xyes; then - cat >>confdefs.h <<\_ACEOF + cat >> confdefs.h <<\EOF #define ABSOLUTE_WITHOUT_ASTERISK 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: result: $grub_cv_asm_absolute_without_asterisk" >&5 -echo "${ECHO_T}$grub_cv_asm_absolute_without_asterisk" >&6 +echo "$ac_t""$grub_cv_asm_absolute_without_asterisk" 1>&6 -echo "$as_me:$LINENO: checking if start is defined by the compiler" >&5 -echo $ECHO_N "checking if start is defined by the compiler... $ECHO_C" >&6 -if test "${grub_cv_check_start_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking if start is defined by the compiler""... $ac_c" 1>&6 +echo "configure:2015: 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 <<_ACEOF -#line $LINENO "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2027: \"$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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -grub_cv_check_start_symbol=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + grub_cv_check_start_symbol=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi if test "x$grub_cv_check_start_symbol" = xyes; then - cat >>confdefs.h <<\_ACEOF + cat >> confdefs.h <<\EOF #define HAVE_START_SYMBOL 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: result: $grub_cv_check_start_symbol" >&5 -echo "${ECHO_T}$grub_cv_check_start_symbol" >&6 +echo "$ac_t""$grub_cv_check_start_symbol" 1>&6 -echo "$as_me:$LINENO: checking if _start is defined by the compiler" >&5 -echo $ECHO_N "checking if _start is defined by the compiler... $ECHO_C" >&6 -if test "${grub_cv_check_uscore_start_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking if _start is defined by the compiler""... $ac_c" 1>&6 +echo "configure:2051: 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 <<_ACEOF -#line $LINENO "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2063: \"$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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -grub_cv_check_uscore_start_symbol=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + grub_cv_check_uscore_start_symbol=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi if test "x$grub_cv_check_uscore_start_symbol" = xyes; then - cat >>confdefs.h <<\_ACEOF + cat >> confdefs.h <<\EOF #define HAVE_USCORE_START_SYMBOL 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: result: $grub_cv_check_uscore_start_symbol" >&5 -echo "${ECHO_T}$grub_cv_check_uscore_start_symbol" >&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 "$as_me:$LINENO: error: Neither start nor _start is defined" >&5 -echo "$as_me: error: Neither start nor _start is defined" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Neither start nor _start is defined" 1>&2; exit 1; } fi -echo "$as_me:$LINENO: checking if __bss_start is defined by the compiler" >&5 -echo $ECHO_N "checking if __bss_start is defined by the compiler... $ECHO_C" >&6 -if test "${grub_cv_check_uscore_uscore_bss_start_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking if __bss_start is defined by the compiler""... $ac_c" 1>&6 +echo "configure:2092: 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 <<_ACEOF -#line $LINENO "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2104: \"$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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -grub_cv_check_uscore_uscore_bss_start_symbol=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + grub_cv_check_uscore_uscore_bss_start_symbol=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi if test "x$grub_cv_check_uscore_uscore_bss_start_symbol" = xyes; then - cat >>confdefs.h <<\_ACEOF + cat >> confdefs.h <<\EOF #define HAVE_USCORE_USCORE_BSS_START_SYMBOL 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: result: $grub_cv_check_uscore_uscore_bss_start_symbol" >&5 -echo "${ECHO_T}$grub_cv_check_uscore_uscore_bss_start_symbol" >&6 +echo "$ac_t""$grub_cv_check_uscore_uscore_bss_start_symbol" 1>&6 -echo "$as_me:$LINENO: checking if _edata is defined by the compiler" >&5 -echo $ECHO_N "checking if _edata is defined by the compiler... $ECHO_C" >&6 -if test "${grub_cv_check_uscore_edata_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking if _edata is defined by the compiler""... $ac_c" 1>&6 +echo "configure:2128: 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 <<_ACEOF -#line $LINENO "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2140: \"$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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -grub_cv_check_uscore_edata_symbol=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + grub_cv_check_uscore_edata_symbol=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi if test "x$grub_cv_check_uscore_edata_symbol" = xyes; then - cat >>confdefs.h <<\_ACEOF + cat >> confdefs.h <<\EOF #define HAVE_USCORE_EDATA_SYMBOL 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: result: $grub_cv_check_uscore_edata_symbol" >&5 -echo "${ECHO_T}$grub_cv_check_uscore_edata_symbol" >&6 +echo "$ac_t""$grub_cv_check_uscore_edata_symbol" 1>&6 -echo "$as_me:$LINENO: checking if edata is defined by the compiler" >&5 -echo $ECHO_N "checking if edata is defined by the compiler... $ECHO_C" >&6 -if test "${grub_cv_check_edata_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking if edata is defined by the compiler""... $ac_c" 1>&6 +echo "configure:2164: 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 <<_ACEOF -#line $LINENO "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2176: \"$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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -grub_cv_check_edata_symbol=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + grub_cv_check_edata_symbol=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi if test "x$grub_cv_check_edata_symbol" = xyes; then - cat >>confdefs.h <<\_ACEOF + cat >> confdefs.h <<\EOF #define HAVE_EDATA_SYMBOL 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: result: $grub_cv_check_edata_symbol" >&5 -echo "${ECHO_T}$grub_cv_check_edata_symbol" >&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" \ -a "x$grub_cv_check_edata_symbol" != "xyes"; then - { { echo "$as_me:$LINENO: error: None of __bss_start, _edata, edata defined" >&5 -echo "$as_me: error: None of __bss_start, _edata, edata defined" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: None of __bss_start, _edata, edata defined" 1>&2; exit 1; } fi -echo "$as_me:$LINENO: checking if end is defined by the compiler" >&5 -echo $ECHO_N "checking if end is defined by the compiler... $ECHO_C" >&6 -if test "${grub_cv_check_end_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking if end is defined by the compiler""... $ac_c" 1>&6 +echo "configure:2206: 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 <<_ACEOF -#line $LINENO "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2218: \"$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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -grub_cv_check_end_symbol=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + grub_cv_check_end_symbol=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi if test "x$grub_cv_check_end_symbol" = xyes; then - cat >>confdefs.h <<\_ACEOF + cat >> confdefs.h <<\EOF #define HAVE_END_SYMBOL 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: result: $grub_cv_check_end_symbol" >&5 -echo "${ECHO_T}$grub_cv_check_end_symbol" >&6 +echo "$ac_t""$grub_cv_check_end_symbol" 1>&6 -echo "$as_me:$LINENO: checking if _end is defined by the compiler" >&5 -echo $ECHO_N "checking if _end is defined by the compiler... $ECHO_C" >&6 -if test "${grub_cv_check_uscore_end_symbol+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking if _end is defined by the compiler""... $ac_c" 1>&6 +echo "configure:2242: 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 <<_ACEOF -#line $LINENO "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:2254: \"$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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -grub_cv_check_uscore_end_symbol=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + grub_cv_check_uscore_end_symbol=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi if test "x$grub_cv_check_uscore_end_symbol" = xyes; then - cat >>confdefs.h <<\_ACEOF + cat >> confdefs.h <<\EOF #define HAVE_USCORE_END_SYMBOL 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: result: $grub_cv_check_uscore_end_symbol" >&5 -echo "${ECHO_T}$grub_cv_check_uscore_end_symbol" >&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 - { { echo "$as_me:$LINENO: error: Neither end nor _end is defined" >&5 -echo "$as_me: error: Neither end nor _end is defined" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Neither end nor _end is defined" 1>&2; exit 1; } fi # Check for curses libraries. - # Check whether --with-curses or --without-curses was given. if test "${with_curses+set}" = set; then withval="$with_curses" + : +fi -fi; # Get the filename or the whole disk and open it. # Known to work on NetBSD. -echo "$as_me:$LINENO: checking for opendisk in -lutil" >&5 -echo $ECHO_N "checking for opendisk in -lutil... $ECHO_C" >&6 -if test "${ac_cv_lib_util_opendisk+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for opendisk in -lutil""... $ac_c" 1>&6 +echo "configure:2292: 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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_util_opendisk=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_util_opendisk=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_util_opendisk" >&5 -echo "${ECHO_T}$ac_cv_lib_util_opendisk" >&6 -if test $ac_cv_lib_util_opendisk = yes; then - GRUB_LIBS="$GRUB_LIBS -lutil" + builtin and then its argument prototype would still apply. */ +char opendisk(); + +int main() { +opendisk() +; return 0; } +EOF +if { (eval echo configure:2311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" -cat >>confdefs.h <<\_ACEOF +fi +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 #define HAVE_OPENDISK 1 -_ACEOF +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 "$as_me:$LINENO: checking for wgetch in -lncurses" >&5 -echo $ECHO_N "checking for wgetch in -lncurses... $ECHO_C" >&6 -if test "${ac_cv_lib_ncurses_wgetch+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for wgetch in -lncurses""... $ac_c" 1>&6 +echo "configure:2339: 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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ncurses_wgetch=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_ncurses_wgetch=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_wgetch" >&5 -echo "${ECHO_T}$ac_cv_lib_ncurses_wgetch" >&6 -if test $ac_cv_lib_ncurses_wgetch = yes; then + builtin and then its argument prototype would still apply. */ +char wgetch(); + +int main() { +wgetch() +; return 0; } +EOF +if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +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 <<\_ACEOF + cat >> confdefs.h <<\EOF #define HAVE_LIBCURSES 1 -_ACEOF +EOF else - echo "$as_me:$LINENO: checking for wgetch in -lcurses" >&5 -echo $ECHO_N "checking for wgetch in -lcurses... $ECHO_C" >&6 -if test "${ac_cv_lib_curses_wgetch+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for wgetch in -lcurses""... $ac_c" 1>&6 +echo "configure:2381: 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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_curses_wgetch=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_curses_wgetch=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_curses_wgetch" >&5 -echo "${ECHO_T}$ac_cv_lib_curses_wgetch" >&6 -if test $ac_cv_lib_curses_wgetch = yes; then + builtin and then its argument prototype would still apply. */ +char wgetch(); + +int main() { +wgetch() +; return 0; } +EOF +if { (eval echo configure:2400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +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 <<\_ACEOF + cat >> confdefs.h <<\EOF #define HAVE_LIBCURSES 1 -_ACEOF +EOF +else + echo "$ac_t""no" 1>&6 fi fi @@ -4093,520 +2427,124 @@ # Check for headers. -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:2432: 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" >&6 +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. + # 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. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + # not just through cpp. + cat > conftest.$ac_ext < - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2453: \"$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 : else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2470: \"$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 : else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +#include +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2487: \"$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 : else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -#include -#include -#include - -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no -fi -rm -f conftest.err conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no + rm -rf conftest* + CPP=/lib/cpp fi rm -f conftest* - fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no +rm -f conftest* fi rm -f conftest* - + ac_cv_prog_CPP="$CPP" fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : + CPP="$ac_cv_prog_CPP" else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - + ac_cv_prog_CPP="$CPP" fi +echo "$ac_t""$CPP" 1>&6 -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h +for ac_hdr in string.h strings.h ncurses/curses.h ncurses.h curses.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2515: 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 <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - - - - -for ac_header in string.h strings.h ncurses/curses.h ncurses.h curses.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat > conftest.$ac_ext < -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2525: \"$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_cv_header_$ac_safe=yes" else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - no:yes ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=$ac_header_preproc" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - +rm -f conftest* fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi - done @@ -4616,8 +2554,9 @@ # Check whether --enable-ext2fs or --disable-ext2fs was given. if test "${enable_ext2fs+set}" = set; then enableval="$enable_ext2fs" + : +fi -fi; if test x"$enable_ext2fs" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_EXT2FS=1" @@ -4626,8 +2565,9 @@ # Check whether --enable-fat or --disable-fat was given. if test "${enable_fat+set}" = set; then enableval="$enable_fat" + : +fi -fi; if test x"$enable_fat" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_FAT=1" @@ -4636,8 +2576,9 @@ # Check whether --enable-ffs or --disable-ffs was given. if test "${enable_ffs+set}" = set; then enableval="$enable_ffs" + : +fi -fi; if test x"$enable_ffs" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_FFS=1" @@ -4646,8 +2587,9 @@ # Check whether --enable-minix or --disable-minix was given. if test "${enable_minix+set}" = set; then enableval="$enable_minix" + : +fi -fi; if test x"$enable_minix" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_MINIX=1" @@ -4656,8 +2598,9 @@ # Check whether --enable-reiserfs or --disable-reiserfs was given. if test "${enable_reiserfs+set}" = set; then enableval="$enable_reiserfs" + : +fi -fi; if test x"$enable_reiserfs" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_REISERFS=1" @@ -4666,8 +2609,9 @@ # Check whether --enable-vstafs or --disable-vstafs was given. if test "${enable_vstafs+set}" = set; then enableval="$enable_vstafs" + : +fi -fi; if test x"$enable_vstafs" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_VSTAFS=1" @@ -4676,8 +2620,9 @@ # Check whether --enable-jfs or --disable-jfs was given. if test "${enable_jfs+set}" = set; then enableval="$enable_jfs" + : +fi -fi; if test x"$enable_jfs" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_JFS=1" @@ -4686,8 +2631,9 @@ # Check whether --enable-xfs or --disable-xfs was given. if test "${enable_xfs+set}" = set; then enableval="$enable_xfs" + : +fi -fi; if test x"$enable_xfs" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_XFS=1" @@ -4697,8 +2643,9 @@ # Check whether --enable-gunzip or --disable-gunzip was given. if test "${enable_gunzip+set}" = set; then enableval="$enable_gunzip" + : +fi -fi; if test x"$enable_gunzip" = xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DNO_DECOMPRESSION=1" @@ -4707,8 +2654,9 @@ # Check whether --enable-md5-password or --disable-md5-password was given. if test "${enable_md5_password+set}" = set; then enableval="$enable_md5_password" + : +fi -fi; if test "x$enable_md5_password" != xno; then FSYS_CFLAGS="$FSYS_CFLAGS -DUSE_MD5_PASSWORDS=1" fi @@ -4716,8 +2664,9 @@ # Check whether --enable-packet-retransmission or --disable-packet-retransmission was given. if test "${enable_packet_retransmission+set}" = set; then enableval="$enable_packet_retransmission" + : +fi -fi; if test "x$enable_packet_retransmission" != xno; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1" fi @@ -4725,8 +2674,9 @@ # Check whether --enable-pci-direct or --disable-pci-direct was given. if test "${enable_pci_direct+set}" = set; then enableval="$enable_pci_direct" + : +fi -fi; if test "x$enable_pci_direct" = xyes; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONFIG_PCI_DIRECT=1" fi @@ -4734,8 +2684,9 @@ # Check whether --enable-3c509 or --disable-3c509 was given. if test "${enable_3c509+set}" = set; then enableval="$enable_3c509" + : +fi -fi; if test "x$enable_3c509" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C509" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c509.o" @@ -4744,8 +2695,9 @@ # Check whether --enable-3c529 or --disable-3c529 was given. if test "${enable_3c529+set}" = set; then enableval="$enable_3c529" + : +fi -fi; if test "x$enable_3c529" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C529=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c529.o" @@ -4754,8 +2706,9 @@ # Check whether --enable-3c595 or --disable-3c595 was given. if test "${enable_3c595+set}" = set; then enableval="$enable_3c595" + : +fi -fi; if test "x$enable_3c595" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C595=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c595.o" @@ -4764,8 +2717,9 @@ # Check whether --enable-3c90x or --disable-3c90x was given. if test "${enable_3c90x+set}" = set; then enableval="$enable_3c90x" + : +fi -fi; if test "x$enable_3c90x" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C90X=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c90x.o" @@ -4774,8 +2728,9 @@ # Check whether --enable-cs89x0 or --disable-cs89x0 was given. if test "${enable_cs89x0+set}" = set; then enableval="$enable_cs89x0" + : +fi -fi; if test "x$enable_cs89x0" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_CS89X0=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS cs89x0.o" @@ -4784,8 +2739,9 @@ # Check whether --enable-davicom or --disable-davicom was given. if test "${enable_davicom+set}" = set; then enableval="$enable_davicom" + : +fi -fi; if test "x$enable_davicom" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_DAVICOM=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS davicom.o" @@ -4794,8 +2750,9 @@ # Check whether --enable-depca or --disable-depca was given. if test "${enable_depca+set}" = set; then enableval="$enable_depca" + : +fi -fi; if test "x$enable_depca" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_DEPCA=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS depca.o" @@ -4804,8 +2761,9 @@ # Check whether --enable-eepro or --disable-eepro was given. if test "${enable_eepro+set}" = set; then enableval="$enable_eepro" + : +fi -fi; if test "x$enable_eepro" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EEPRO=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS eepro.o" @@ -4814,8 +2772,9 @@ # Check whether --enable-eepro100 or --disable-eepro100 was given. if test "${enable_eepro100+set}" = set; then enableval="$enable_eepro100" + : +fi -fi; if test "x$enable_eepro100" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EEPRO100=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS eepro100.o" @@ -4824,8 +2783,9 @@ # Check whether --enable-epic100 or --disable-epic100 was given. if test "${enable_epic100+set}" = set; then enableval="$enable_epic100" + : +fi -fi; if test "x$enable_epic100" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EPIC100=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS epic100.o" @@ -4834,8 +2794,9 @@ # Check whether --enable-3c507 or --disable-3c507 was given. if test "${enable_3c507+set}" = set; then enableval="$enable_3c507" + : +fi -fi; if test "x$enable_3c507" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C507=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c507.o" @@ -4844,8 +2805,9 @@ # Check whether --enable-exos205 or --disable-exos205 was given. if test "${enable_exos205+set}" = set; then enableval="$enable_exos205" + : +fi -fi; if test "x$enable_exos205" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EXOS205=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS exos205.o" @@ -4854,8 +2816,9 @@ # Check whether --enable-ni5210 or --disable-ni5210 was given. if test "${enable_ni5210+set}" = set; then enableval="$enable_ni5210" + : +fi -fi; if test "x$enable_ni5210" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5210=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5210.o" @@ -4864,18 +2827,31 @@ # Check whether --enable-lance or --disable-lance was given. if test "${enable_lance+set}" = set; then enableval="$enable_lance" + : +fi -fi; if test "x$enable_lance" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_LANCE=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS lance.o" fi +# Check whether --enable-pcnet32 or --disable-pcnet32 was given. +if test "${enable_pcnet32+set}" = set; then + enableval="$enable_pcnet32" + : +fi + +if test "x$enable_pcnet32" = xyes; then + NET_CFLAGS="$NET_CFLAGS -DINCLUDE_PCNET32=1" + NETBOOT_DRIVERS="$NETBOOT_DRIVERS pcnet32.o" +fi + # Check whether --enable-ne2100 or --disable-ne2100 was given. if test "${enable_ne2100+set}" = set; then enableval="$enable_ne2100" + : +fi -fi; if test "x$enable_ne2100" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE2100=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne2100.o" @@ -4884,8 +2860,9 @@ # Check whether --enable-ni6510 or --disable-ni6510 was given. if test "${enable_ni6510+set}" = set; then enableval="$enable_ni6510" + : +fi -fi; if test "x$enable_ni6510" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI6510=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni6510.o" @@ -4894,8 +2871,9 @@ # Check whether --enable-natsemi or --disable-natsemi was given. if test "${enable_natsemi+set}" = set; then enableval="$enable_natsemi" + : +fi -fi; if test "x$enable_natsemi" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NATSEMI=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS natsemi.o" @@ -4904,8 +2882,9 @@ # Check whether --enable-ni5010 or --disable-ni5010 was given. if test "${enable_ni5010+set}" = set; then enableval="$enable_ni5010" + : +fi -fi; if test "x$enable_ni5010" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5010=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5010.o" @@ -4914,8 +2893,9 @@ # Check whether --enable-3c503 or --disable-3c503 was given. if test "${enable_3c503+set}" = set; then enableval="$enable_3c503" + : +fi -fi; if test "x$enable_3c503" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C503=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c503.o" @@ -4924,8 +2904,9 @@ # Check whether --enable-ne or --disable-ne was given. if test "${enable_ne+set}" = set; then enableval="$enable_ne" + : +fi -fi; if test "x$enable_ne" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne.o" @@ -4934,8 +2915,9 @@ # Check whether --enable-ns8390 or --disable-ns8390 was given. if test "${enable_ns8390+set}" = set; then enableval="$enable_ns8390" + : +fi -fi; if test "x$enable_ns8390" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NS8390=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS ns8390.o" @@ -4944,8 +2926,9 @@ # Check whether --enable-wd or --disable-wd was given. if test "${enable_wd+set}" = set; then enableval="$enable_wd" + : +fi -fi; if test "x$enable_wd" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_WD=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS wd.o" @@ -4954,8 +2937,9 @@ # Check whether --enable-otulip or --disable-otulip was given. if test "${enable_otulip+set}" = set; then enableval="$enable_otulip" + : +fi -fi; if test "x$enable_otulip" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_OTULIP=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS otulip.o" @@ -4964,8 +2948,9 @@ # Check whether --enable-rtl8139 or --disable-rtl8139 was given. if test "${enable_rtl8139+set}" = set; then enableval="$enable_rtl8139" + : +fi -fi; if test "x$enable_rtl8139" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_RTL8139=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS rtl8139.o" @@ -4974,8 +2959,9 @@ # Check whether --enable-sis900 or --disable-sis900 was given. if test "${enable_sis900+set}" = set; then enableval="$enable_sis900" + : +fi -fi; if test "x$enable_sis900" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SIS900=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS sis900.o" @@ -4984,8 +2970,9 @@ # Check whether --enable-sk-g16 or --disable-sk-g16 was given. if test "${enable_sk_g16+set}" = set; then enableval="$enable_sk_g16" + : +fi -fi; if test "x$enable_sk_g16" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SK_G16=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS sk_g16.o" @@ -4994,8 +2981,9 @@ # Check whether --enable-smc9000 or --disable-smc9000 was given. if test "${enable_smc9000+set}" = set; then enableval="$enable_smc9000" + : +fi -fi; if test "x$enable_smc9000" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SMC9000=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS smc9000.o" @@ -5004,8 +2992,9 @@ # Check whether --enable-tiara or --disable-tiara was given. if test "${enable_tiara+set}" = set; then enableval="$enable_tiara" + : +fi -fi; if test "x$enable_tiara" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TIARA=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS tiara.o" @@ -5014,8 +3003,9 @@ # Check whether --enable-tulip or --disable-tulip was given. if test "${enable_tulip+set}" = set; then enableval="$enable_tulip" + : +fi -fi; if test "x$enable_tulip" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TULIP=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS tulip.o" @@ -5024,8 +3014,9 @@ # Check whether --enable-via-rhine or --disable-via-rhine was given. if test "${enable_via_rhine+set}" = set; then enableval="$enable_via_rhine" + : +fi -fi; if test "x$enable_via_rhine" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_VIA_RHINE=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS via_rhine.o" @@ -5034,8 +3025,9 @@ # Check whether --enable-w89c840 or --disable-w89c840 was given. if test "${enable_w89c840+set}" = set; then enableval="$enable_w89c840" + : +fi -fi; if test "x$enable_w89c840" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_W89C840=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS w89c840.o" @@ -5057,8 +3049,9 @@ # Check whether --enable-3c503-shmem or --disable-3c503-shmem was given. if test "${enable_3c503_shmem+set}" = set; then enableval="$enable_3c503_shmem" + : +fi -fi; if test "x$enable_3c503_shmem" = xyes; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_SHMEM=1" fi @@ -5066,8 +3059,9 @@ # Check whether --enable-3c503-aui or --disable-3c503-aui was given. if test "${enable_3c503_aui+set}" = set; then enableval="$enable_3c503_aui" + : +fi -fi; if test "x$enable_3c503_aui" = xyes; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_AUI=1" fi @@ -5075,8 +3069,9 @@ # Check whether --enable-compex-rl2000-fix or --disable-compex-rl2000-fix was given. if test "${enable_compex_rl2000_fix+set}" = set; then enableval="$enable_compex_rl2000_fix" + : +fi -fi; if test "x$enable_compex_rl2000_fix" = xyes; then NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCOMPEX_RL2000_FIX=1" fi @@ -5085,7 +3080,8 @@ if test "${enable_smc9000_scan+set}" = set; then enableval="$enable_smc9000_scan" NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DSMC9000_SCAN=$enable_smc9000_scan" -fi; +fi + # Check whether --enable-ne-scan or --disable-ne-scan was given. if test "${enable_ne_scan+set}" = set; then @@ -5093,7 +3089,8 @@ NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DNE_SCAN=$enable_ne_scan" else NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DNE_SCAN=0x280,0x300,0x320,0x340" -fi; +fi + # Check whether --enable-wd-default-mem or --disable-wd-default-mem was given. if test "${enable_wd_default_mem+set}" = set; then @@ -5101,19 +3098,22 @@ NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=$enable_wd_default_mem" else NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=0xCC000" -fi; +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; +fi + # Check whether --enable-diskless or --disable-diskless was given. if test "${enable_diskless+set}" = set; then enableval="$enable_diskless" + : +fi -fi; if test "x$enable_diskless" = xyes; then @@ -5127,8 +3127,9 @@ # Check whether --enable-hercules or --disable-hercules was given. if test "${enable_hercules+set}" = set; then enableval="$enable_hercules" + : +fi -fi; if test "x$enable_hercules" != xno; then @@ -5142,8 +3143,9 @@ # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then enableval="$enable_serial" + : +fi -fi; if test "x$enable_serial" != xno; then @@ -5157,8 +3159,9 @@ # Check whether --enable-serial-speed-simulation or --disable-serial-speed-simulation was given. if test "${enable_serial_speed_simulation+set}" = set; then enableval="$enable_serial_speed_simulation" + : +fi -fi; if test "x$enable_serial_speed_simulation" = xyes; then @@ -5172,22 +3175,21 @@ # Sanity check. if test "x$enable_diskless" = xyes; then if test "x$NET_CFLAGS" = x; then - { { echo "$as_me:$LINENO: error: You must enable at least one network driver" >&5 -echo "$as_me: error: You must enable at least one network driver" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: You must enable at least one network driver" 1>&2; exit 1; } fi fi # Check whether --enable-preset-menu or --disable-preset-menu was given. if test "${enable_preset_menu+set}" = set; then enableval="$enable_preset_menu" + : +fi -fi; if test "x$enable_preset_menu" = x; then : else if test -r $enable_preset_menu; then - + # Because early versions of GNU sed 3.x are too buggy, use a C program # instead of shell commands. *sigh* cat >conftest.c <<\EOF @@ -5223,37 +3225,29 @@ } EOF -if { ac_try='${CC-cc} ${CFLAGS} conftest.c -o conftest' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && test -s conftest; then +if { ac_try='${CC-cc} ${CFLAGS} conftest.c -o conftest'; { (eval echo configure:3229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest; then grub_tmp_value=`./conftest < "$enable_preset_menu"` else - { { echo "$as_me:$LINENO: error: ${CC-cc} failed to produce an executable file" >&5 -echo "$as_me: error: ${CC-cc} failed to produce an executable file" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: ${CC-cc} failed to produce an executable file" 1>&2; exit 1; } fi -cat >>confdefs.h <<_ACEOF +cat >> confdefs.h <&5 -echo "$as_me: error: Cannot read the preset menu file $enable_preset_menu" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Cannot read the preset menu file $enable_preset_menu" 1>&2; exit 1; } fi fi # Check whether --enable-example-kernel or --disable-example-kernel was given. if test "${enable_example_kernel+set}" = set; then enableval="$enable_example_kernel" + : +fi -fi; if test "x$enable_example_kernel" = xyes; then @@ -5267,14 +3261,15 @@ # Check whether --enable-auto-linux-mem-opt or --disable-auto-linux-mem-opt was given. if test "${enable_auto_linux_mem_opt+set}" = set; then enableval="$enable_auto_linux_mem_opt" + : +fi -fi; if test "x$enable_auto_linux_mem_opt" = xno; then : else - cat >>confdefs.h <<\_ACEOF + cat >> confdefs.h <<\EOF #define AUTO_LINUX_MEM_OPT 1 -_ACEOF +EOF fi @@ -5287,1133 +3282,444 @@ -ac_config_files="$ac_config_files Makefile stage1/Makefile stage2/Makefile docs/Makefile lib/Makefile util/Makefile grub/Makefile netboot/Makefile util/grub-image util/grub-install util/grub-md5-crypt util/grub-terminfo" -cat >confcache <<\_ACEOF +trap '' 1 2 15 +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, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. # -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - +EOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. # So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ - (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if cmp -s $cache_file confcache; then :; else +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `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 if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file + echo "updating cache $cache_file" + cat confcache > $cache_file else echo "not updating unwritable cache $cache_file" fi fi rm -f confcache +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). +# Any assignment to VPATH causes Sun make to only execute +# the first set of double-colon rules, so remove it if not needed. +# If there is a colon in the path, we need to keep it. if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' fi -DEFS=-DHAVE_CONFIG_H +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} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# NLS nuisances. -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } - - -# Name of the executable. -as_me=`(basename "$0") 2>/dev/null || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conftest.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } - -exec 6>&1 - -# Open the log real soon, to keep \$[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by $as_me, which was -generated by GNU Autoconf 2.53. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 -_ACEOF - -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi - -cat >>$CONFIG_STATUS <<\_ACEOF - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to ." -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -config.status -configured by $0, generated by GNU Autoconf 2.53, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift - ;; - -*);; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_need_defaults=false;; - esac - - case $1 in - # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" - ac_need_defaults=false;; - # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - - esac - shift -done - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF +echo creating $CONFIG_STATUS +rm -f $CONFIG_STATUS +cat > $CONFIG_STATUS </dev/null | sed 1q`: # -# INIT-COMMANDS section. +# $0 $ac_configure_args # +# Compiler output produced by configure, useful for debugging +# configure, is in ./config.log if it exists. -AMDEP_TRUE="$AMDEP_TRUE" -ac_aux_dir="$ac_aux_dir" - -_ACEOF - - - -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_config_target in $ac_config_targets +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "stage1/Makefile" ) CONFIG_FILES="$CONFIG_FILES stage1/Makefile" ;; - "stage2/Makefile" ) CONFIG_FILES="$CONFIG_FILES stage2/Makefile" ;; - "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; - "util/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; - "grub/Makefile" ) CONFIG_FILES="$CONFIG_FILES grub/Makefile" ;; - "netboot/Makefile" ) CONFIG_FILES="$CONFIG_FILES netboot/Makefile" ;; - "util/grub-image" ) CONFIG_FILES="$CONFIG_FILES util/grub-image" ;; - "util/grub-install" ) CONFIG_FILES="$CONFIG_FILES util/grub-install" ;; - "util/grub-md5-crypt" ) CONFIG_FILES="$CONFIG_FILES util/grub-md5-crypt" ;; - "util/grub-terminfo" ) CONFIG_FILES="$CONFIG_FILES util/grub-terminfo" ;; - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + case "\$ac_option" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "$CONFIG_STATUS generated by autoconf version 2.13" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; + *) echo "\$ac_cs_usage"; exit 1 ;; esac done -# 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. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} -{ - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=$TMPDIR/cs$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } -} - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF +ac_given_srcdir=$srcdir +ac_given_INSTALL="$INSTALL" + +trap 'rm -fr `echo "Makefile stage1/Makefile stage2/Makefile docs/Makefile \ + lib/Makefile util/Makefile grub/Makefile \ + netboot/Makefile util/grub-image util/grub-install \ + util/grub-md5-crypt util/grub-terminfo config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS < 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%@EXEEXT@%$EXEEXT%g +s%@OBJEXT@%$OBJEXT%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%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g +s%@AWK@%$AWK%g +s%@SET_MAKE@%$SET_MAKE%g +s%@AMDEP_TRUE@%$AMDEP_TRUE%g +s%@AMDEP_FALSE@%$AMDEP_FALSE%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%@am__include@%$am__include%g +s%@am__quote@%$am__quote%g +s%@CCDEPMODE@%$CCDEPMODE%g +s%@AS@%$AS%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%@CPP@%$CPP%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%@HERCULES_SUPPORT_TRUE@%$HERCULES_SUPPORT_TRUE%g +s%@HERCULES_SUPPORT_FALSE@%$HERCULES_SUPPORT_FALSE%g +s%@SERIAL_SUPPORT_TRUE@%$SERIAL_SUPPORT_TRUE%g +s%@SERIAL_SUPPORT_FALSE@%$SERIAL_SUPPORT_FALSE%g +s%@SERIAL_SPEED_SIMULATION_TRUE@%$SERIAL_SPEED_SIMULATION_TRUE%g +s%@SERIAL_SPEED_SIMULATION_FALSE@%$SERIAL_SPEED_SIMULATION_FALSE%g +s%@BUILD_EXAMPLE_KERNEL_TRUE@%$BUILD_EXAMPLE_KERNEL_TRUE%g +s%@BUILD_EXAMPLE_KERNEL_FALSE@%$BUILD_EXAMPLE_KERNEL_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 +s%@ASFLAGS@%$ASFLAGS%g -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;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,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;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,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;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,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;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,@CC@,$CC,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@AS@,$AS,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_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,@ac_ct_OBJCOPY@,$ac_ct_OBJCOPY,;t t -s,@GRUB_LIBS@,$GRUB_LIBS,;t t -s,@CPP@,$CPP,;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,@HERCULES_SUPPORT_TRUE@,$HERCULES_SUPPORT_TRUE,;t t -s,@HERCULES_SUPPORT_FALSE@,$HERCULES_SUPPORT_FALSE,;t t -s,@SERIAL_SUPPORT_TRUE@,$SERIAL_SUPPORT_TRUE,;t t -s,@SERIAL_SUPPORT_FALSE@,$SERIAL_SUPPORT_FALSE,;t t -s,@SERIAL_SPEED_SIMULATION_TRUE@,$SERIAL_SPEED_SIMULATION_TRUE,;t t -s,@SERIAL_SPEED_SIMULATION_FALSE@,$SERIAL_SPEED_SIMULATION_FALSE,;t t -s,@BUILD_EXAMPLE_KERNEL_TRUE@,$BUILD_EXAMPLE_KERNEL_TRUE,;t t -s,@BUILD_EXAMPLE_KERNEL_FALSE@,$BUILD_EXAMPLE_KERNEL_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 -s,@ASFLAGS@,$ASFLAGS,;t t CEOF +EOF -_ACEOF +cat >> $CONFIG_STATUS <<\EOF - cat >>$CONFIG_STATUS <<\_ACEOF - # 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" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false +# 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 + 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 - # 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 $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` fi -fi # test -n "$CONFIG_FILES" - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - 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 - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || - mkdir "$as_incr_dir" || - { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -done; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat fi +EOF -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - +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="${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%/[^/][^/]*$%%'` + 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'` + else + ac_dir_suffix= ac_dots= + fi + + 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" ;; + *) # Relative path. + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# + case "$ac_given_INSTALL" in + [/$]*) 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." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ +# $configure_input" ;; + *) ac_comsub= ;; + esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub +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 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_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' +ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' +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_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' -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue +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 - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - 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 ;; + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; esac - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} + echo creating $ac_file - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF - -# 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 -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# 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 confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed + 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 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 +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 +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 <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF - -# 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" $tmp/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 $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/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.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 +cat >> conftest.vals <<\EOF +s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +EOF + +# Break up conftest.vals because some shells have a limit on +# the size of here documents, and old seds have small limits too. + rm -f conftest.tail -while grep . conftest.undefs >/dev/null +while : do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$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 $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs - -cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h + 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.vals + +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 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 + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + fi + rm -f $ac_file + mv conftest.h $ac_file fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in - if test x"$ac_file" != x-; then - if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || - mkdir "$as_incr_dir" || - { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -done; } +fi; done - rm -f $ac_file - mv $tmp/config.h $ac_file +EOF +cat >> $CONFIG_STATUS <"./stamp-h1" - ;; + echo timestamp > "\$am_dir"stamp-h\$am_indx + ;; esac + am_indx=\`expr \$am_indx + 1\` done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` +AMDEP_TRUE="$AMDEP_TRUE" +ac_aux_dir="$ac_aux_dir" +EOF +cat >> $CONFIG_STATUS <<\EOF +test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - default-1 ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do case "$mf" in @@ -6451,34 +3757,11 @@ echo '# dummy' > "$dirpart/$file" done done - ;; - esac -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -{ (exit 0); exit 0; } -_ACEOF +exit 0 +EOF chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 diff -urN grub-0.93/configure.in grub-0.93-os/configure.in --- grub-0.93/configure.in Fri Nov 29 21:12:08 2002 +++ grub-0.93-os/configure.in Sun Jan 5 15:58:56 2003 @@ -13,7 +13,7 @@ dnl USE OF THIS SOFTWARE. AC_INIT(stage2/stage2.c) -AM_INIT_AUTOMAKE(grub, 0.93) +AM_INIT_AUTOMAKE(grub, 0.93-os) AM_CONFIG_HEADER(config.h) AC_PREREQ(2.13) @@ -387,6 +387,13 @@ if test "x$enable_lance" = xyes; then NET_CFLAGS="$NET_CFLAGS -DINCLUDE_LANCE=1" NETBOOT_DRIVERS="$NETBOOT_DRIVERS lance.o" +fi + +AC_ARG_ENABLE(pcnet32, + [ --enable-pcnet32 enable Uwe Dannowskis PCI PCNet/32 driver]) +if test "x$enable_pcnet32" = xyes; then + NET_CFLAGS="$NET_CFLAGS -DINCLUDE_PCNET32=1" + NETBOOT_DRIVERS="$NETBOOT_DRIVERS pcnet32.o" fi AC_ARG_ENABLE(ne2100, diff -urN grub-0.93/docs/grub-install.8 grub-0.93-os/docs/grub-install.8 --- grub-0.93/docs/grub-install.8 Sun Dec 8 04:17:59 2002 +++ grub-0.93-os/docs/grub-install.8 Sun Jan 5 15:02:25 2003 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH GRUB-INSTALL "8" "December 2002" "grub-install (GNU GRUB 0.93)" FSF +.TH GRUB-INSTALL "8" "January 2003" "grub-install (GNU GRUB 0.93-os)" FSF .SH NAME grub-install \- install GRUB on your drive .SH SYNOPSIS diff -urN grub-0.93/docs/grub-md5-crypt.8 grub-0.93-os/docs/grub-md5-crypt.8 --- grub-0.93/docs/grub-md5-crypt.8 Sun Dec 8 04:17:59 2002 +++ grub-0.93-os/docs/grub-md5-crypt.8 Sun Jan 5 15:02:26 2003 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH GRUB-MD5-CRYPT "8" "December 2002" "grub-md5-crypt (GNU GRUB )" FSF +.TH GRUB-MD5-CRYPT "8" "January 2003" "grub-md5-crypt (GNU GRUB )" FSF .SH NAME grub-md5-crypt \- Encrypt a password in MD5 format .SH SYNOPSIS diff -urN grub-0.93/docs/grub-terminfo.8 grub-0.93-os/docs/grub-terminfo.8 --- grub-0.93/docs/grub-terminfo.8 Sun Dec 8 04:18:00 2002 +++ grub-0.93-os/docs/grub-terminfo.8 Sun Jan 5 15:02:26 2003 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH GRUB-TERMINFO "8" "December 2002" "grub-terminfo (GNU GRUB 0.93)" FSF +.TH GRUB-TERMINFO "8" "January 2003" "grub-terminfo (GNU GRUB 0.93-os)" FSF .SH NAME grub-terminfo \- Generate a terminfo command from a terminfo name .SH SYNOPSIS diff -urN grub-0.93/docs/grub.8 grub-0.93-os/docs/grub.8 --- grub-0.93/docs/grub.8 Sun Dec 8 04:17:59 2002 +++ grub-0.93-os/docs/grub.8 Sun Jan 5 15:04:22 2003 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH GRUB "8" "December 2002" "grub (GNU GRUB 0.93)" FSF +.TH GRUB "8" "January 2003" "grub (GNU GRUB 0.93-os)" FSF .SH NAME grub \- the grub shell .SH SYNOPSIS diff -urN grub-0.93/docs/grub.info grub-0.93-os/docs/grub.info --- grub-0.93/docs/grub.info Mon Dec 2 23:37:16 2002 +++ grub-0.93-os/docs/grub.info Sun Jan 5 14:20:30 2003 @@ -30,161 +30,161 @@  Indirect: grub.info-1: 1323 -grub.info-2: 50835 -grub.info-3: 100586 +grub.info-2: 50838 +grub.info-3: 100589  Tag Table: (Indirect) Node: Top1323 -Node: Introduction3041 -Node: Overview3414 -Node: Overview-Footnotes5371 -Ref: Overview-Footnote-15432 -Node: History5593 -Node: Features6709 -Node: Features-Footnotes12478 -Ref: Features-Footnote-112539 -Node: Role of a boot loader12684 -Node: Role of a boot loader-Footnotes14017 -Ref: Role of a boot loader-Footnote-114104 -Node: Naming convention14183 -Node: Installation17099 -Node: Creating a GRUB boot floppy18395 -Node: Installing GRUB natively19210 -Node: Installing GRUB natively-Footnotes21361 -Ref: Installing GRUB natively-Footnote-121454 -Node: Installing GRUB using grub-install21639 -Node: Booting24428 -Node: General boot methods24833 -Node: Loading an operating system directly25564 -Node: Chain-loading26862 -Node: Chain-loading-Footnotes28158 -Ref: Chain-loading-Footnote-128229 -Node: OS-specific notes28301 -Node: GNU/Hurd28638 -Node: GNU/Linux29248 -Node: FreeBSD30492 -Node: NetBSD30996 -Node: OpenBSD31644 -Node: DOS/Windows31835 -Node: SCO UnixWare33652 -Node: QNX34061 -Node: Configuration34302 -Node: Network38730 -Node: General usage of network support39223 -Node: General usage of network support-Footnotes41085 -Ref: General usage of network support-Footnote-141194 -Node: Diskless41261 -Node: Serial terminal43441 -Node: Preset Menu45673 -Node: Security48035 -Node: Images50835 -Node: Filesystem53064 -Node: Device syntax53744 -Node: File name syntax55120 -Node: Block list syntax55856 -Node: Interface56582 -Node: Command-line interface57456 -Node: Command-line interface-Footnotes59310 -Ref: Command-line interface-Footnote-159399 -Node: Menu interface59494 -Node: Menu entry editor60497 -Node: Hidden menu interface61569 -Node: Commands62141 -Node: Menu-specific commands62693 -Node: default63856 -Node: fallback64319 -Node: hiddenmenu64797 -Node: timeout65270 -Node: title65533 -Node: General commands65789 -Node: bootp67091 -Node: color67555 -Node: device69024 -Node: dhcp69581 -Node: hide70152 -Node: ifconfig70514 -Node: pager71075 -Node: partnew71394 -Node: parttype71834 -Node: password72186 -Node: rarp72989 -Node: serial73273 -Node: setkey74521 -Node: terminal76666 -Node: terminfo78186 -Node: tftpserver78856 -Node: unhide79385 -Node: Command-line and menu entry commands79743 -Node: blocklist82266 -Node: boot82493 -Node: cat82796 -Node: chainloader83085 -Node: cmp83686 -Node: configfile84222 -Node: debug84421 -Node: displayapm84790 -Node: displaymem84986 -Node: embed85673 -Node: embed-Footnotes86190 -Ref: embed-Footnote-186245 -Node: find86302 -Node: fstest86653 -Node: geometry87321 -Node: halt87923 -Node: help88233 -Node: impsprobe88837 -Node: initrd89187 -Node: install89509 -Node: install-Footnotes92326 -Ref: install-Footnote-192385 -Node: ioprobe92482 -Node: kernel92790 -Node: lock93833 -Node: makeactive94391 -Node: map94686 -Node: md5crypt95236 -Node: module95566 -Node: modulenounzip96127 -Node: pause96403 -Node: quit96800 -Node: reboot97059 -Node: read97223 -Node: root97448 -Node: rootnoverify98308 -Node: savedefault98846 -Node: setup99537 -Node: testload100586 -Node: testvbe101180 -Node: uppermem101534 -Node: vbeprobe102099 -Node: Troubleshooting102465 -Node: Stage1 errors103000 -Node: Stage1.5 errors104370 -Node: Stage2 errors104801 -Node: Invoking the grub shell112344 -Node: Basic usage113094 -Node: Installation under UNIX115343 -Node: Device map117021 -Node: Invoking grub-install118178 -Node: Invoking grub-md5-crypt119751 -Node: Invoking grub-terminfo120396 -Node: Invoking mbchk121150 -Node: Obtaining and Building GRUB121658 -Node: Reporting bugs123321 -Node: Future126077 -Node: Internals126518 -Node: Memory map127722 -Node: Embedded data129195 -Node: Filesystem interface131207 -Node: Command interface134635 -Node: Bootstrap tricks135945 -Node: I/O ports detection138089 -Node: Memory detection138356 -Node: Low-level disk I/O138643 -Node: MBR138907 -Node: Partition table139099 -Node: Submitting patches139365 -Node: Index140846 +Node: Introduction3044 +Node: Overview3417 +Node: Overview-Footnotes5374 +Ref: Overview-Footnote-15435 +Node: History5596 +Node: Features6712 +Node: Features-Footnotes12481 +Ref: Features-Footnote-112542 +Node: Role of a boot loader12687 +Node: Role of a boot loader-Footnotes14020 +Ref: Role of a boot loader-Footnote-114107 +Node: Naming convention14186 +Node: Installation17102 +Node: Creating a GRUB boot floppy18398 +Node: Installing GRUB natively19213 +Node: Installing GRUB natively-Footnotes21364 +Ref: Installing GRUB natively-Footnote-121457 +Node: Installing GRUB using grub-install21642 +Node: Booting24431 +Node: General boot methods24836 +Node: Loading an operating system directly25567 +Node: Chain-loading26865 +Node: Chain-loading-Footnotes28161 +Ref: Chain-loading-Footnote-128232 +Node: OS-specific notes28304 +Node: GNU/Hurd28641 +Node: GNU/Linux29251 +Node: FreeBSD30495 +Node: NetBSD30999 +Node: OpenBSD31647 +Node: DOS/Windows31838 +Node: SCO UnixWare33655 +Node: QNX34064 +Node: Configuration34305 +Node: Network38733 +Node: General usage of network support39226 +Node: General usage of network support-Footnotes41088 +Ref: General usage of network support-Footnote-141197 +Node: Diskless41264 +Node: Serial terminal43444 +Node: Preset Menu45676 +Node: Security48038 +Node: Images50838 +Node: Filesystem53067 +Node: Device syntax53747 +Node: File name syntax55123 +Node: Block list syntax55859 +Node: Interface56585 +Node: Command-line interface57459 +Node: Command-line interface-Footnotes59313 +Ref: Command-line interface-Footnote-159402 +Node: Menu interface59497 +Node: Menu entry editor60500 +Node: Hidden menu interface61572 +Node: Commands62144 +Node: Menu-specific commands62696 +Node: default63859 +Node: fallback64322 +Node: hiddenmenu64800 +Node: timeout65273 +Node: title65536 +Node: General commands65792 +Node: bootp67094 +Node: color67558 +Node: device69027 +Node: dhcp69584 +Node: hide70155 +Node: ifconfig70517 +Node: pager71078 +Node: partnew71397 +Node: parttype71837 +Node: password72189 +Node: rarp72992 +Node: serial73276 +Node: setkey74524 +Node: terminal76669 +Node: terminfo78189 +Node: tftpserver78859 +Node: unhide79388 +Node: Command-line and menu entry commands79746 +Node: blocklist82269 +Node: boot82496 +Node: cat82799 +Node: chainloader83088 +Node: cmp83689 +Node: configfile84225 +Node: debug84424 +Node: displayapm84793 +Node: displaymem84989 +Node: embed85676 +Node: embed-Footnotes86193 +Ref: embed-Footnote-186248 +Node: find86305 +Node: fstest86656 +Node: geometry87324 +Node: halt87926 +Node: help88236 +Node: impsprobe88840 +Node: initrd89190 +Node: install89512 +Node: install-Footnotes92329 +Ref: install-Footnote-192388 +Node: ioprobe92485 +Node: kernel92793 +Node: lock93836 +Node: makeactive94394 +Node: map94689 +Node: md5crypt95239 +Node: module95569 +Node: modulenounzip96130 +Node: pause96406 +Node: quit96803 +Node: reboot97062 +Node: read97226 +Node: root97451 +Node: rootnoverify98311 +Node: savedefault98849 +Node: setup99540 +Node: testload100589 +Node: testvbe101183 +Node: uppermem101537 +Node: vbeprobe102102 +Node: Troubleshooting102468 +Node: Stage1 errors103003 +Node: Stage1.5 errors104373 +Node: Stage2 errors104804 +Node: Invoking the grub shell112347 +Node: Basic usage113097 +Node: Installation under UNIX115346 +Node: Device map117024 +Node: Invoking grub-install118181 +Node: Invoking grub-md5-crypt119754 +Node: Invoking grub-terminfo120399 +Node: Invoking mbchk121153 +Node: Obtaining and Building GRUB121661 +Node: Reporting bugs123339 +Node: Future126095 +Node: Internals126536 +Node: Memory map127740 +Node: Embedded data129213 +Node: Filesystem interface131225 +Node: Command interface134653 +Node: Bootstrap tricks135963 +Node: I/O ports detection138107 +Node: Memory detection138374 +Node: Low-level disk I/O138661 +Node: MBR138925 +Node: Partition table139117 +Node: Submitting patches139383 +Node: Index140864  End Tag Table diff -urN grub-0.93/docs/grub.info-1 grub-0.93-os/docs/grub.info-1 --- grub-0.93/docs/grub.info-1 Mon Dec 2 23:37:16 2002 +++ grub-0.93-os/docs/grub.info-1 Sun Jan 5 14:20:30 2003 @@ -36,7 +36,7 @@ This is the documentation of GNU GRUB, the GRand Unified Bootloader, a flexible and powerful boot loader program for PCs. - This edition documents version 0.93. + This edition documents version 0.93-os. * Menu: diff -urN grub-0.93/docs/grub.info-3 grub-0.93-os/docs/grub.info-3 --- grub-0.93/docs/grub.info-3 Mon Dec 2 23:37:16 2002 +++ grub-0.93-os/docs/grub.info-3 Sun Jan 5 14:20:30 2003 @@ -608,20 +608,20 @@ GRUB is available from the GNU alpha archive site `ftp://alpha.gnu.org/gnu/grub' or any of its mirrors. The file will be -named grub-version.tar.gz. The current version is 0.93, so the file you -should grab is: +named grub-version.tar.gz. The current version is 0.93-os, so the file +you should grab is: - `ftp://alpha.gnu.org/gnu/grub/grub-0.93.tar.gz' + `ftp://alpha.gnu.org/gnu/grub/grub-0.93-os.tar.gz' To unbundle GRUB use the instruction: - zcat grub-0.93.tar.gz | tar xvf - + zcat grub-0.93-os.tar.gz | tar xvf - - which will create a directory called `grub-0.93' with all the + which will create a directory called `grub-0.93-os' with all the sources. You can look at the file `INSTALL' for detailed instructions on how to build and install GRUB, but you should be able to just do: - cd grub-0.93 + cd grub-0.93-os ./configure make install diff -urN grub-0.93/docs/mbchk.1 grub-0.93-os/docs/mbchk.1 --- grub-0.93/docs/mbchk.1 Sun Dec 8 04:17:59 2002 +++ grub-0.93-os/docs/mbchk.1 Sun Jan 5 15:04:22 2003 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH MBCHK "1" "December 2002" "mbchk (GNU GRUB 0.93)" FSF +.TH MBCHK "1" "January 2003" "mbchk (GNU GRUB 0.93-os)" FSF .SH NAME mbchk \- check the format of a Multiboot kernel .SH SYNOPSIS diff -urN grub-0.93/docs/stamp-vti grub-0.93-os/docs/stamp-vti --- grub-0.93/docs/stamp-vti Mon Dec 2 23:37:16 2002 +++ grub-0.93-os/docs/stamp-vti Sun Jan 5 14:20:30 2003 @@ -1,4 +1,4 @@ -@set UPDATED 3 December 2002 +@set UPDATED 2 December 2002 @set UPDATED-MONTH December 2002 -@set EDITION 0.93 -@set VERSION 0.93 +@set EDITION 0.93-os +@set VERSION 0.93-os diff -urN grub-0.93/docs/version.texi grub-0.93-os/docs/version.texi --- grub-0.93/docs/version.texi Mon Dec 2 23:37:16 2002 +++ grub-0.93-os/docs/version.texi Sun Jan 5 14:20:30 2003 @@ -1,4 +1,4 @@ -@set UPDATED 3 December 2002 +@set UPDATED 2 December 2002 @set UPDATED-MONTH December 2002 -@set EDITION 0.93 -@set VERSION 0.93 +@set EDITION 0.93-os +@set VERSION 0.93-os diff -urN grub-0.93/grub/asmstub.c grub-0.93-os/grub/asmstub.c --- grub-0.93/grub/asmstub.c Tue Dec 3 00:20:45 2002 +++ grub-0.93-os/grub/asmstub.c Mon Dec 30 10:53:53 2002 @@ -628,9 +628,9 @@ case KEY_END: return 5; case KEY_PPAGE: - return 7; - case KEY_NPAGE: return 3; + case KEY_NPAGE: + return 7; default: break; } Binary files grub-0.93/netboot/.3c90x.c.swp and grub-0.93-os/netboot/.3c90x.c.swp differ diff -urN grub-0.93/netboot/3c90x.c grub-0.93-os/netboot/3c90x.c --- grub-0.93/netboot/3c90x.c Wed Jan 2 22:56:40 2002 +++ grub-0.93-os/netboot/3c90x.c Mon Jan 6 11:40:09 2003 @@ -316,6 +316,7 @@ *** nvram in the card that stores, among other things, the MAC *** address). ***/ +#if 0 static int a3c90x_internal_WriteEepromWord(int ioaddr, int address, unsigned short value) { @@ -384,6 +385,7 @@ return 0; } +#endif @@ -394,10 +396,8 @@ *** image. ***/ static void -a3c90x_reset(struct nic *nic) +a3c90x_reset(struct nic *card) { - int cfg; - #ifdef CFG_3C90X_PRESERVE_XCVR /** Read the current InternalConfig value. **/ a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3); @@ -473,7 +473,7 @@ *** p - the pointer to the packet data itself. ***/ static void -a3c90x_transmit(struct nic *nic, const char *d, unsigned int t, +a3c90x_transmit(struct nic *card, const char *d, unsigned int t, unsigned int s, const char *p) { @@ -597,11 +597,11 @@ /*** a3c90x_poll: exported routine that waits for a certain length of time *** for a packet, and if it sees none, returns 0. This routine should - *** copy the packet to nic->packet if it gets a packet and set the size - *** in nic->packetlen. Return 1 if a packet was found. + *** copy the packet to card->packet if it gets a packet and set the size + *** in card->packetlen. Return 1 if a packet was found. ***/ static int -a3c90x_poll(struct nic *nic) +a3c90x_poll(struct nic *card) { int i, errcode; @@ -617,7 +617,7 @@ /** Build the up-load descriptor **/ INF_3C90X.ReceiveUPD.UpNextPtr = 0; INF_3C90X.ReceiveUPD.UpPktStatus = 0; - INF_3C90X.ReceiveUPD.DataAddr = virt_to_bus(nic->packet); + INF_3C90X.ReceiveUPD.DataAddr = virt_to_bus(card->packet); INF_3C90X.ReceiveUPD.DataLength = 1536 + (1<<31); /** Submit the upload descriptor to the NIC **/ @@ -648,8 +648,8 @@ return 0; } - /** Ok, got packet. Set length in nic->packetlen. **/ - nic->packetlen = (INF_3C90X.ReceiveUPD.UpPktStatus & 0x1FFF); + /** Ok, got packet. Set length in card->packetlen. **/ + card->packetlen = (INF_3C90X.ReceiveUPD.UpPktStatus & 0x1FFF); return 1; } @@ -663,7 +663,7 @@ *** [Ken] ***/ static void -a3c90x_disable(struct nic *nic) +a3c90x_disable(struct nic *card) { /* Disable the receiver and transmitter. */ outw(cmdRxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w); @@ -677,7 +677,7 @@ *** card. We just have to init it here. ***/ struct nic* -a3c90x_probe(struct nic *nic, unsigned short *probeaddrs, struct pci_device *pci) +a3c90x_probe(struct nic *card, unsigned short *probeaddrs, struct pci_device *pci) { int i, c; unsigned short eeprom[0x21]; @@ -779,7 +779,7 @@ /** Fill in our entry in the etherboot arp table **/ for(i=0;inode_addr[i] = (eeprom[i/2] >> (8*((i&1)^1))) & 0xff; + card->node_addr[i] = (eeprom[i/2] >> (8*((i&1)^1))) & 0xff; /** Read the media options register, print a message and set default ** xcvr. @@ -918,12 +918,12 @@ cmdAcknowledgeInterrupt, 0x661); /** Set our exported functions **/ - nic->reset = a3c90x_reset; - nic->poll = a3c90x_poll; - nic->transmit = a3c90x_transmit; - nic->disable = a3c90x_disable; + card->reset = a3c90x_reset; + card->poll = a3c90x_poll; + card->transmit = a3c90x_transmit; + card->disable = a3c90x_disable; - return nic; + return card; } diff -urN grub-0.93/netboot/Makefile.am grub-0.93-os/netboot/Makefile.am --- grub-0.93/netboot/Makefile.am Wed Jan 2 22:56:40 2002 +++ grub-0.93-os/netboot/Makefile.am Sun Jan 5 15:01:07 2003 @@ -18,7 +18,7 @@ epic100.c epic100.h fa311.c i82586.c lance.c natsemi.c \ ni5010.c ns8390.c ns8390.h otulip.c otulip.h rtl8139.c \ sis900.c sis900.h sk_g16.c sk_g16.h smc9000.c smc9000.h \ - tiara.c tlan.c tulip.c via-rhine.c w89c840.c + tiara.c tlan.c tulip.c via-rhine.c w89c840.c pcnet32.c libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ -DFSYS_TFTP=1 $(NET_CFLAGS) $(NET_EXTRAFLAGS) # Filled by configure. @@ -42,6 +42,7 @@ epic100_drivers = epic100.o #fa311_drivers = fa311.o i82586_drivers = 3c507.o exos205.o ni5210.o +pcnet32_drivers = pcnet32.o lance_drivers = lance.o ne2100.o ni6510.o natsemi_drivers = natsemi.o ni5010_drivers = ni5010.o @@ -118,6 +119,11 @@ $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $< +$(pcnet32_drivers): pcnet32.c +$(pcnet32_drivers): %.o: pcnet32.c + $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ + $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $< + $(natsemi_drivers): natsemi.c $(natsemi_drivers): %.o: natsemi.c $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ @@ -199,6 +205,7 @@ exos205_o_CFLAGS = -DINCLUDE_EXOS205=1 ni5210_o_CFLAGS = -DINCLUDE_NI5210=1 lance_o_CFLAGS = -DINCLUDE_LANCE=1 +pcnet32_o_CFLAGS = -DINCLUDE_PCNET32=1 ne2100_o_CFLAGS = -DINCLUDE_NE2100=1 ni6510_o_CFLAGS = -DINCLUDE_NI6510=1 natsemi_o_CFLAGS = -DINCLUDE_NATSEMI=1 diff -urN grub-0.93/netboot/Makefile.in grub-0.93-os/netboot/Makefile.in --- grub-0.93/netboot/Makefile.in Fri Nov 29 21:28:41 2002 +++ grub-0.93-os/netboot/Makefile.in Sun Jan 5 15:59:08 2003 @@ -105,7 +105,7 @@ epic100.c epic100.h fa311.c i82586.c lance.c natsemi.c \ ni5010.c ns8390.c ns8390.h otulip.c otulip.h rtl8139.c \ sis900.c sis900.h sk_g16.c sk_g16.h smc9000.c smc9000.h \ - tiara.c tlan.c tulip.c via-rhine.c w89c840.c + tiara.c tlan.c tulip.c via-rhine.c w89c840.c pcnet32.c libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ -DFSYS_TFTP=1 $(NET_CFLAGS) $(NET_EXTRAFLAGS) @@ -131,6 +131,7 @@ epic100_drivers = epic100.o #fa311_drivers = fa311.o i82586_drivers = 3c507.o exos205.o ni5210.o +pcnet32_drivers = pcnet32.o lance_drivers = lance.o ne2100.o ni6510.o natsemi_drivers = natsemi.o ni5010_drivers = ni5010.o @@ -162,6 +163,7 @@ exos205_o_CFLAGS = -DINCLUDE_EXOS205=1 ni5210_o_CFLAGS = -DINCLUDE_NI5210=1 lance_o_CFLAGS = -DINCLUDE_LANCE=1 +pcnet32_o_CFLAGS = -DINCLUDE_PCNET32=1 ne2100_o_CFLAGS = -DINCLUDE_NE2100=1 ni6510_o_CFLAGS = -DINCLUDE_NI6510=1 natsemi_o_CFLAGS = -DINCLUDE_NATSEMI=1 @@ -220,6 +222,7 @@ @AMDEP_TRUE@ $(DEPDIR)/libdrivers_a-ns8390.Po \ @AMDEP_TRUE@ $(DEPDIR)/libdrivers_a-otulip.Po \ @AMDEP_TRUE@ $(DEPDIR)/libdrivers_a-pci.Po \ +@AMDEP_TRUE@ $(DEPDIR)/libdrivers_a-pcnet32.Po \ @AMDEP_TRUE@ $(DEPDIR)/libdrivers_a-rtl8139.Po \ @AMDEP_TRUE@ $(DEPDIR)/libdrivers_a-sis900.Po \ @AMDEP_TRUE@ $(DEPDIR)/libdrivers_a-sk_g16.Po \ @@ -286,6 +289,7 @@ libdrivers_a-tulip.$(OBJEXT): tulip.c libdrivers_a-via-rhine.$(OBJEXT): via-rhine.c libdrivers_a-w89c840.$(OBJEXT): w89c840.c +libdrivers_a-pcnet32.$(OBJEXT): pcnet32.c libdrivers.a: $(libdrivers_a_OBJECTS) $(libdrivers_a_DEPENDENCIES) -rm -f libdrivers.a $(libdrivers_a_AR) libdrivers.a $(libdrivers_a_OBJECTS) $(libdrivers_a_LIBADD) @@ -318,6 +322,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-ns8390.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-otulip.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-pci.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-pcnet32.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-rtl8139.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-sis900.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-sk_g16.Po@am__quote@ @@ -715,6 +720,18 @@ @AMDEP_TRUE@ depfile='$(DEPDIR)/libdrivers_a-w89c840.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-w89c840.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-w89c840.obj `cygpath -w w89c840.c` + +libdrivers_a-pcnet32.o: pcnet32.c +@AMDEP_TRUE@ source='pcnet32.c' object='libdrivers_a-pcnet32.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libdrivers_a-pcnet32.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pcnet32.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pcnet32.o `test -f pcnet32.c || echo '$(srcdir)/'`pcnet32.c + +libdrivers_a-pcnet32.obj: pcnet32.c +@AMDEP_TRUE@ source='pcnet32.c' object='libdrivers_a-pcnet32.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libdrivers_a-pcnet32.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pcnet32.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pcnet32.obj `cygpath -w pcnet32.c` CCDEPMODE = @CCDEPMODE@ uninstall-info-am: @@ -907,6 +924,11 @@ $(lance_drivers): lance.c $(lance_drivers): %.o: lance.c + $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ + $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $< + +$(pcnet32_drivers): pcnet32.c +$(pcnet32_drivers): %.o: pcnet32.c $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $< diff -urN grub-0.93/netboot/cards.h grub-0.93-os/netboot/cards.h --- grub-0.93/netboot/cards.h Wed Jan 2 22:56:40 2002 +++ grub-0.93-os/netboot/cards.h Sun Jan 5 14:24:23 2003 @@ -105,6 +105,11 @@ PCI_ARG(struct pci_device *)); #endif +#ifdef INCLUDE_PCNET32 +extern struct nic *pcnet32_probe(struct nic *, unsigned short * + PCI_ARG(struct pci_device *)); +#endif + #ifdef INCLUDE_NE2100 extern struct nic *ne2100_probe(struct nic *, unsigned short * PCI_ARG(struct pci_device *)); diff -urN grub-0.93/netboot/config.c grub-0.93-os/netboot/config.c --- grub-0.93/netboot/config.c Sat Apr 20 02:43:10 2002 +++ grub-0.93-os/netboot/config.c Sun Jan 5 14:32:23 2003 @@ -31,7 +31,7 @@ #include #undef INCLUDE_PCI -#if defined(INCLUDE_NS8390) || defined(INCLUDE_EEPRO100) || defined(INCLUDE_LANCE) || defined(INCLUDE_EPIC100) || defined(INCLUDE_TULIP) || defined(INCLUDE_OTULIP) || defined(INCLUDE_3C90X) || defined(INCLUDE_3C595) || defined(INCLUDE_RTL8139) || defined(INCLUDE_VIA_RHINE) || defined(INCLUDE_W89C840) || defined(INCLUDE_DAVICOM) || defined(INCLUDE_SIS900) || defined(INCLUDE_NATSEMI) || defined(INCLUDE_TLAN) +#if defined(INCLUDE_NS8390) || defined(INCLUDE_EEPRO100) || defined(INCLUDE_LANCE) || defined(INCLUDE_PCNET32) || defined(INCLUDE_EPIC100) || defined(INCLUDE_TULIP) || defined(INCLUDE_OTULIP) || defined(INCLUDE_3C90X) || defined(INCLUDE_3C595) || defined(INCLUDE_RTL8139) || defined(INCLUDE_VIA_RHINE) || defined(INCLUDE_W89C840) || defined(INCLUDE_DAVICOM) || defined(INCLUDE_SIS900) || defined(INCLUDE_NATSEMI) || defined(INCLUDE_TLAN) /* || others later */ # define INCLUDE_PCI # include @@ -122,6 +122,10 @@ "Intel EtherExpressPro100 ID1029", 0, 0, 0, 0}, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1030, "Intel Corporation 82559 InBusiness 10/100", 0, 0, 0, 0}, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1031, + "Intel EtherExpressPro100 ID1031", 0, 0, 0, 0}, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ID1039, + "Intel EtherExpressPro100 ID1039", 0, 0, 0, 0}, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82562, "Intel EtherExpressPro100 82562EM", 0, 0, 0, 0}, #endif @@ -135,6 +139,12 @@ { PCI_VENDOR_ID_AMD_HOMEPNA, PCI_DEVICE_ID_AMD_HOMEPNA, "AMD Lance/HomePNA", 0, 0, 0, 0}, #endif +#ifdef INCLUDE_PCNET32 + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE, + "AMD Lance/PCI", 0, 0, 0, 0}, + { PCI_VENDOR_ID_AMD_HOMEPNA, PCI_DEVICE_ID_AMD_HOMEPNA, + "AMD Lance/HomePNA", 0, 0, 0, 0}, +#endif #ifdef INCLUDE_RTL8139 { PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139, "Realtek 8139", 0, 0, 0, 0}, @@ -290,6 +300,10 @@ { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE, lancepci_probe }, { PCI_VENDOR_ID_AMD_HOMEPNA, PCI_DEVICE_ID_AMD_HOMEPNA, lancepci_probe }, # endif /* INCLUDE_LANCE */ +# ifdef INCLUDE_PCNET32 + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE, pcnet32_probe }, + { PCI_VENDOR_ID_AMD_HOMEPNA, PCI_DEVICE_ID_AMD_HOMEPNA, pcnet32_probe }, +# endif /* INCLUDE_PCNET32 */ # ifdef INCLUDE_RTL8139 { PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139, rtl8139_probe }, { PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DFE530TXP, rtl8139_probe }, diff -urN grub-0.93/netboot/eepro100.c grub-0.93-os/netboot/eepro100.c --- grub-0.93/netboot/eepro100.c Mon Mar 25 23:01:17 2002 +++ grub-0.93-os/netboot/eepro100.c Sun Jan 5 02:29:46 2003 @@ -356,7 +356,7 @@ * returns: void. */ -static void eepro100_reset(struct nic *nic) +static void eepro100_reset(struct nic *card) { outl(0, ioaddr + SCBPort); } @@ -371,7 +371,7 @@ * returns: void. */ -static void eepro100_transmit(struct nic *nic, const char *d, unsigned int t, unsigned int s, const char *p) +static void eepro100_transmit(struct nic *card, const char *d, unsigned int t, unsigned int s, const char *p) { struct eth_hdr { unsigned char dst_addr[ETH_ALEN]; @@ -379,7 +379,6 @@ unsigned short type; } hdr; unsigned short status; - int to; int s1, s2; status = inw(ioaddr + SCBStatus); @@ -392,7 +391,7 @@ #endif memcpy (&hdr.dst_addr, d, ETH_ALEN); - memcpy (&hdr.src_addr, nic->node_addr, ETH_ALEN); + memcpy (&hdr.src_addr, card->node_addr, ETH_ALEN); hdr.type = htons (t); @@ -436,11 +435,11 @@ * returns: 1 if a packet was recieved. * 0 if no pacet was recieved. * side effects: - * returns the packet in the array nic->packet. - * returns the length of the packet in nic->packetlen. + * returns the packet in the array card->packet. + * returns the length of the packet in card->packetlen. */ -static int eepro100_poll(struct nic *nic) +static int eepro100_poll(struct nic *card) { if (!ACCESS(rxfd)status) return 0; @@ -455,15 +454,15 @@ #ifdef DEBUG printf ("Got a packet: Len = %d.\n", ACCESS(rxfd)count & 0x3fff); #endif - nic->packetlen = ACCESS(rxfd)count & 0x3fff; - memcpy (nic->packet, ACCESS(rxfd)packet, nic->packetlen); + card->packetlen = ACCESS(rxfd)count & 0x3fff; + memcpy (card->packet, ACCESS(rxfd)packet, card->packetlen); #ifdef DEBUG - hd (nic->packet, 0x30); + hd (card->packet, 0x30); #endif return 1; } -static void eepro100_disable(struct nic *nic) +static void eepro100_disable(struct nic *card) { /* See if this PartialReset solves the problem with interfering with kernel operation after Etherboot hands over. - Ken 20001102 */ @@ -478,7 +477,7 @@ * leaves the 82557 initialized, and ready to recieve packets. */ -struct nic *eepro100_probe(struct nic *nic, unsigned short *probeaddrs, struct pci_device *p) +struct nic *eepro100_probe(struct nic *card, unsigned short *probeaddrs, struct pci_device *p) { unsigned short sum = 0; int i; @@ -507,16 +506,16 @@ } for (i = 0, sum = 0; i < ee_size; i++) { - unsigned short value = do_eeprom_cmd(read_cmd | (i << 16), 27); + value = do_eeprom_cmd(read_cmd | (i << 16), 27); if (i < (int)(sizeof(eeprom)/sizeof(eeprom[0]))) eeprom[i] = value; sum += value; } for (i=0;inode_addr[i] = (eeprom[i/2] >> (8*(i&1))) & 0xff; + card->node_addr[i] = (eeprom[i/2] >> (8*(i&1))) & 0xff; } - printf ("Ethernet addr: %!\n", nic->node_addr); + printf ("Ethernet addr: %!\n", card->node_addr); if (sum != 0xBABA) printf("eepro100: Invalid EEPROM checksum %#hX, " @@ -543,7 +542,7 @@ ACCESS(rxfd)status = 0x0001; ACCESS(rxfd)command = 0x0000; ACCESS(rxfd)link = virt_to_bus(&(ACCESS(rxfd)status)); - ACCESS(rxfd)rx_buf_addr = (int) &nic->packet; + ACCESS(rxfd)rx_buf_addr = (int) &card->packet; ACCESS(rxfd)count = 0; ACCESS(rxfd)size = 1528; @@ -576,7 +575,7 @@ char *t = (char *)&txfd.tx_desc_addr; for (i=0;inode_addr[i]; + t[i] = card->node_addr[i]; } #ifdef DEBUG @@ -625,11 +624,11 @@ while (!txfd.status && timer2_running()) /* Wait */; - nic->reset = eepro100_reset; - nic->poll = eepro100_poll; - nic->transmit = eepro100_transmit; - nic->disable = eepro100_disable; - return nic; + card->reset = eepro100_reset; + card->poll = eepro100_poll; + card->transmit = eepro100_transmit; + card->disable = eepro100_disable; + return card; } /*********************************************************************/ diff -urN grub-0.93/netboot/fsys_tftp.c grub-0.93-os/netboot/fsys_tftp.c --- grub-0.93/netboot/fsys_tftp.c Wed May 8 09:08:49 2002 +++ grub-0.93-os/netboot/fsys_tftp.c Mon Dec 30 10:42:51 2002 @@ -303,9 +303,20 @@ int tftp_mount (void) { + static int bootped = 0; + /* Check if the current drive is the network drive. */ if (current_drive != NETWORK_DRIVE) return 0; + + /* do automatic bootp only once */ + if (!bootped) + { + if (!bootp()) + return 0; + else + bootped = 1; + } /* If the drive is not initialized yet, abort. */ if (! network_ready) diff -urN grub-0.93/netboot/misc.c grub-0.93-os/netboot/misc.c --- grub-0.93/netboot/misc.c Tue Feb 5 00:01:38 2002 +++ grub-0.93-os/netboot/misc.c Sun Jan 5 14:23:31 2003 @@ -39,7 +39,7 @@ static const char tiddles[]="-\\|/"; unsigned long ticks; - if (debug) + /* if (debug) */ { if ((ticks = currticks ()) == lastticks) return; diff -urN grub-0.93/netboot/pci.h grub-0.93-os/netboot/pci.h --- grub-0.93/netboot/pci.h Wed Jan 2 22:56:40 2002 +++ grub-0.93-os/netboot/pci.h Sun Jan 5 14:30:51 2003 @@ -129,6 +129,8 @@ #define PCI_DEVICE_ID_INTEL_82559ER 0x1209 #define PCI_DEVICE_ID_INTEL_ID1029 0x1029 #define PCI_DEVICE_ID_INTEL_ID1030 0x1030 +#define PCI_DEVICE_ID_INTEL_ID1031 0x1031 +#define PCI_DEVICE_ID_INTEL_ID1039 0x1039 #define PCI_DEVICE_ID_INTEL_82562 0x2449 #define PCI_VENDOR_ID_AMD 0x1022 #define PCI_DEVICE_ID_AMD_LANCE 0x2000 diff -urN grub-0.93/netboot/pcnet32.c grub-0.93-os/netboot/pcnet32.c --- grub-0.93/netboot/pcnet32.c Thu Jan 1 01:00:00 1970 +++ grub-0.93-os/netboot/pcnet32.c Sun Jan 5 14:49:22 2003 @@ -0,0 +1,295 @@ +#include "etherboot.h" +#include "nic.h" +#include "pci.h" + +typedef unsigned char byte; +typedef unsigned short word; +typedef unsigned long dword; +typedef unsigned long address; + +static unsigned long iobase = 0; + +#define PCNET32_LOG_TX_BUFFERS 4 +#define PCNET32_LOG_RX_BUFFERS 4 +#define TX_RING_SIZE (1 << (PCNET32_LOG_TX_BUFFERS)) +#define TX_RING_MOD_MASK (TX_RING_SIZE - 1) +#define TX_RING_LEN_BITS ((PCNET32_LOG_TX_BUFFERS) << 12) +#define RX_RING_SIZE (1 << (PCNET32_LOG_RX_BUFFERS)) +#define RX_RING_MOD_MASK (RX_RING_SIZE - 1) +#define RX_RING_LEN_BITS ((PCNET32_LOG_RX_BUFFERS) << 4) +#define PKT_BUF_SZ 1544 + +#define PCNET32_RDP 0x10 +#define PCNET32_RAP 0x12 +#define PCNET32_RST 0x14 +#define PCNET32_BDP 0x16 + + +/* The PCNET32 Rx and Tx ring descriptors. */ +struct pcnet32_rx_head { + dword base; + short buf_length; + short status; + dword msg_length; + dword reserved; +} rx_ring[RX_RING_SIZE]; +static int cur_rx = 0; + + +struct pcnet32_tx_head { + dword base; + short length; + short status; + dword misc; + dword reserved; +} tx_ring[TX_RING_SIZE]; +static int cur_tx = 0; + + +/* The PCNET32 32-Bit initialization block, described in databook. */ +struct pcnet32_init_block { + word mode; + word tlen_rlen; + byte phys_addr[6]; + word reserved; + dword filter[2]; + /* Receive and transmit ring base, along with extra bits. */ + dword rx_ring; + dword tx_ring; +} init_block __attribute__ ((aligned(16))); + + + +#define _outw(v,p) __outw((v),(p)) +#define _inw(p) __inw((p)) + +#define READ_CSR(x) ({__asm__ __volatile__ ("nop");_outw((x),iobase+PCNET32_RAP); _inw(iobase+PCNET32_RDP);}) +#define READ_BCR(x) ({__asm__ __volatile__ ("nop");_outw((x),iobase+PCNET32_RAP); _inw(iobase+PCNET32_BDP);}) +#define WRITE_CSR(x,v) ({__asm__ __volatile__ ("nop");_outw((x),iobase+PCNET32_RAP);_outw((v),iobase+PCNET32_RDP);}) +#define WRITE_BCR(x,v) ({__asm__ __volatile__ ("nop");_outw((x),iobase+PCNET32_RAP);_outw((v),iobase+PCNET32_BDP);}) + + +static unsigned char rx_buffers[RX_RING_SIZE][PKT_BUF_SZ]; +static unsigned char tx_buff[2048]; + +static void +pcnet32_getaddress(unsigned char* adr) +{ + int i; + for (i = 0; i < 6; i++) + adr[i] = inb(iobase + i); +}; + + +static void +pcnet32_reset(struct nic *card) +{ +}; + + +static void +pcnet32_disable(struct nic *card) +{ + /* reset */ + _inw(iobase+PCNET32_RST); + WRITE_CSR(0, 4); +}; + + +static int +pcnet32_init(struct nic *card) +{ + int i; + word val; + + /* reset */ + _inw(iobase+PCNET32_RST); + + READ_CSR(0); + if ((READ_CSR(88) | (READ_CSR(89) << 16)) != 0x2621003) + return 0; + + /* enable 32-bit mode */ + WRITE_BCR(0x0014, 0x0002); + + { + /* set/reset autoselect bit */ + _outw(0x2, iobase+PCNET32_RAP); + val = _inw(iobase+PCNET32_BDP) & ~2; + val |= 2; + _outw(val, iobase+PCNET32_BDP); + + /* handle full duplex setting */ + _outw(0x0009, iobase+PCNET32_RAP); + val = _inw(iobase+PCNET32_BDP) & ~3; + _outw(val, iobase+PCNET32_BDP); + + /* set/reset GPSI bit in test register */ + _outw(0x007c, iobase+PCNET32_RAP); + val = _inw(iobase+PCNET32_RDP) & ~0x10; + _outw(val, iobase+PCNET32_RDP); + + } + + for (i = 0; i < RX_RING_SIZE; i++) + { + rx_ring[i].base = (dword) (rx_buffers[i]); + rx_ring[i].status = 0x8000; + rx_ring[i].buf_length = -PKT_BUF_SZ; + }; + for (i = 0; i < TX_RING_SIZE; i++) + tx_ring[i].base = tx_ring[i].status = 0; + + /* set init block */ + init_block.mode = 0x0000; + init_block.tlen_rlen = TX_RING_LEN_BITS | RX_RING_LEN_BITS; + init_block.filter[0] = 0x00000000; + init_block.filter[1] = 0x00000000; + for (i = 0; i < 6; i++) + init_block.phys_addr[i] = inb(iobase + i); + init_block.rx_ring = (dword) &rx_ring; + init_block.tx_ring = (dword) &tx_ring; + WRITE_CSR(0x0001, (((dword)(&init_block)) & 0xFFFF)); + WRITE_CSR(0x0002, ((((dword)(&init_block)) >> 16) & 0xFFFF)); + + WRITE_CSR(0x0004, 0x0915); + WRITE_CSR(0x0000, 0x0001); + + i = 0; + while (i++ < 100) + { + if (_inw(iobase+PCNET32_RDP) & 0x0100) + break; + }; + _outw(0x0042, iobase+PCNET32_RDP); + + READ_CSR(0); + WRITE_CSR(0, 0x7940); + + { + word old; + old = _inw(iobase+PCNET32_RAP); + _outw(0x0070, iobase+PCNET32_RAP); + _inw(iobase+PCNET32_RDP); + _outw(old, iobase+PCNET32_RAP); + } + WRITE_CSR(0, 4); + WRITE_CSR(0, 1); + + while (!(_inw(iobase+PCNET32_RDP) & 0x0100)) + /* wait */; + + _outw(0x0042, iobase+PCNET32_RDP); + READ_CSR(0); + WRITE_CSR(0, 0x7940); + + printf("AMD-PCNet32 base 0x%x, addr ", iobase); + + pcnet32_getaddress(card->node_addr); + for (i=0; inode_addr[i])); + if (i < ETH_ALEN-1) printf (":"); + }; + printf("\n"); + + return 1; +}; + + +static void +pcnet32_transmit(struct nic *card, const char *d, + unsigned int t, unsigned int s, const char *p) +{ + int i; + /* copy destination and source address to buffer */ + for (i = 0; i < ETH_ALEN; i++) + { + tx_buff[i] = d[i]; + tx_buff[ETH_ALEN + i] = card->node_addr[i]; + }; + /* copy packet type to buffer */ + tx_buff[2*ETH_ALEN] = (t >> 8) & 0xFF; + tx_buff[2*ETH_ALEN+ 1] = t & 0xFF; + /* copy the whole packet, too */ + for (i = 0; i < s; i++) + tx_buff[2*ETH_ALEN + 2 + i] = p[i]; + + s += 2*ETH_ALEN + 2; + + tx_ring[cur_tx].length = -s; + tx_ring[cur_tx].misc = 0x0; + tx_ring[cur_tx].base = (dword) tx_buff; + tx_ring[cur_tx].status = 0x8300; + + /* transmit poll */ + WRITE_CSR(0, 0x48); + + /* acknowledge IRQ */ + _outw(READ_CSR(0) & ~0x004f, iobase+PCNET32_RDP); + _inw(iobase+PCNET32_RDP); + WRITE_CSR(0, 0x7940); + + /* increment head pointer */ + cur_tx = (cur_tx + 1) % TX_RING_SIZE; + +}; + + +static int +pcnet32_poll(struct nic *card) +{ + int i, s; + unsigned char *p; + + if (rx_ring[cur_rx].status < 0) + return 0; + + /* acknowledge IRQs */ + _outw(READ_CSR(0) & ~0x004f, iobase+PCNET32_RDP); + _inw(iobase+PCNET32_RDP); WRITE_CSR(0, 0x7940); + + s = rx_ring[cur_rx].msg_length - 4; + p = (unsigned char*) rx_ring[cur_rx].base; + /* marke entry free */ + rx_ring[cur_rx].status = 0x8000; + /* increment tail pointer */ + cur_rx = (cur_rx + 1) % RX_RING_SIZE; + + for (i = 0; i < s; i++) + card->packet[i] = p[i]; + card->packetlen = s; /* available to caller */ + return 1; +}; + + +struct nic* +pcnet32_probe(struct nic *card, unsigned short *probe_addrs, struct pci_device *pci); + +struct nic* +pcnet32_probe(struct nic *card, unsigned short *probe_addrs, struct pci_device *pci) +{ + unsigned short *p; + + for (p = probe_addrs; (iobase = *p) != 0; ++p) + { + short pci_cmd; + pcibios_read_config_word(pci->bus, pci->devfn, PCI_COMMAND, &pci_cmd); + if (!(pci_cmd & PCI_COMMAND_MASTER)) + { + pci_cmd |= PCI_COMMAND_MASTER; + pcibios_write_config_word(pci->bus, pci->devfn, PCI_COMMAND, pci_cmd); + } + if (pcnet32_init(card) > 0) + { + /* point to NIC specific routines */ + card->reset = pcnet32_reset; + card->poll = pcnet32_poll; + card->transmit = pcnet32_transmit; + card->disable = pcnet32_disable; + return card; + } + } + /* if board found */ + return 0; +} diff -urN grub-0.93/netboot/timer.h grub-0.93-os/netboot/timer.h --- grub-0.93/netboot/timer.h Wed Jan 2 22:56:40 2002 +++ grub-0.93-os/netboot/timer.h Sun Jan 5 02:30:21 2003 @@ -49,11 +49,13 @@ /* Ticks must be between 0 and 65535 (0 == 65536) because it is a 16 bit counter */ extern void load_timer2(unsigned int ticks); +extern inline int timer2_running(void); extern inline int timer2_running(void) { return ((inb(PPC_PORTB) & PPCB_T2OUT) == 0); } +extern inline void waiton_timer2(unsigned int ticks); extern inline void waiton_timer2(unsigned int ticks) { load_timer2(ticks); diff -urN grub-0.93/stage2/Makefile.am grub-0.93-os/stage2/Makefile.am --- grub-0.93/stage2/Makefile.am Fri Nov 29 19:00:53 2002 +++ grub-0.93-os/stage2/Makefile.am Sun Jan 5 02:34:41 2003 @@ -75,6 +75,8 @@ HERCULES_FLAGS = endif +STAGE2_CFLAGS = $(INCLUDES) + STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) diff -urN grub-0.93/stage2/Makefile.in grub-0.93-os/stage2/Makefile.in --- grub-0.93/stage2/Makefile.in Fri Nov 29 21:28:45 2002 +++ grub-0.93-os/stage2/Makefile.in Sun Jan 5 15:59:11 2003 @@ -79,7 +79,6 @@ PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ -STAGE2_CFLAGS = @STAGE2_CFLAGS@ VERSION = @VERSION@ am__include = @am__include@ am__quote = @am__quote@ @@ -89,6 +88,8 @@ # Stage 2 and Stage 1.5's. pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) + +STAGE2_CFLAGS = $(INCLUDES) TESTS = size_test noinst_SCRIPTS = $(TESTS) diff -urN grub-0.93/stage2/asm.S grub-0.93-os/stage2/asm.S --- grub-0.93/stage2/asm.S Tue Dec 3 00:18:56 2002 +++ grub-0.93-os/stage2/asm.S Mon Dec 30 16:50:50 2002 @@ -97,7 +97,8 @@ .string VERSION VARIABLE(config_file) #ifndef STAGE1_5 - .string "/boot/grub/menu.lst" + /* .string "/boot/grub/menu.lst" */ + .string "(nd)/tftpboot/adam/m" #else /* STAGE1_5 */ .long 0xffffffff .string "/boot/grub/stage2" @@ -1544,6 +1545,7 @@ pushl %ebp movl %esp, %ebp + pushl %esi pushl %edi pushl %ebx @@ -1569,6 +1571,7 @@ popl %ebx popl %edi + popl %esi popl %ebp ret @@ -1583,6 +1586,7 @@ pushl %ebp movl %esp, %ebp + pushl %esi pushl %edi pushl %ebx @@ -1611,6 +1615,7 @@ popl %ebx popl %edi + popl %esi popl %ebp ret @@ -1626,6 +1631,8 @@ movl %esp, %ebp pushl %ebx + pushl %esi + pushl %edi /* Save the mode number in %bx */ movl 0x8(%ebp), %ebx @@ -1644,6 +1651,69 @@ movzwl %bx, %eax + popl %edi + popl %esi + popl %ebx + popl %ebp + ret + + +ENTRY(reset_vbe_mode) + pushl %ebp + movl %esp, %ebp + pushl %ebx + + call EXT_C(prot_to_real) + .code16 + + movw $0x0003, %ax + int $0x10 + + DATA32 call EXT_C(real_to_prot) + .code32 + + popl %ebx + popl %ebp + ret + + +ENTRY(get_vbe_pmif) + pushl %ebp + movl %esp, %ebp + pushl %ebx + pushl %esi + pushl %edi + + pushl %ebp + + call EXT_C(prot_to_real) + .code16 + + movw $0x4F0A, %ax + xorw %bx,%bx + xorw %di,%di + int $0x10 + xorl %ebx,%ebx + cmpw $0x004F,%ax + jnz nopm + + movw %es,%bx + shll $16,%ebx + movw %di,%bx + +nopm: DATA32 call EXT_C(real_to_prot) + .code32 + + popl %ebp + + movl 0x8(%ebp),%eax + movl %ebx,(%eax) + movl 0xc(%ebp),%eax + andl $0xFFFF,%ecx + movl %ecx,(%eax) + + popl %edi + popl %esi popl %ebx popl %ebp ret @@ -1920,8 +1990,8 @@ .word KEY_END, 5 .word KEY_DC, 4 .word KEY_BACKSPACE, 8 - .word KEY_PPAGE, 7 - .word KEY_NPAGE, 3 + .word KEY_PPAGE, 3 + .word KEY_NPAGE, 7 .word 0 /* diff -urN grub-0.93/stage2/boot.c grub-0.93-os/stage2/boot.c --- grub-0.93/stage2/boot.c Sat Nov 30 18:29:16 2002 +++ grub-0.93-os/stage2/boot.c Mon Dec 30 09:33:44 2002 @@ -755,6 +755,15 @@ if (!grub_open (module)) return 0; + if ((cur_addr + filemax) >= (1024*(1024+mbi.mem_upper))) + { + printf("Want to load module to 0x%x len 0x%x but only have 0x%x RAM\n", + cur_addr, filemax, 1024*(1024+mbi.mem_upper)); + errnum = ERR_BADMODADDR; + grub_close (); + return 0; + } + len = grub_read ((char *) cur_addr, -1); if (! len) { @@ -781,6 +790,35 @@ return 1; } +void +create_vbe_module(void *ctrl_info, int ctrl_info_len, + void *mode_info, int mode_info_len, + int mode, int pmif, int pmif_len, + unsigned int version) +{ + /* if we are supposed to load on 4K boundaries */ + cur_addr = (cur_addr + 0xFFF) & 0xFFFFF000; + + printf (" [VESA %d.%d info @ 0x%x, 0x%x bytes]\n", + version >> 8, version & 0xFF, + cur_addr, ctrl_info_len + mode_info_len); + + grub_memmove((char*)cur_addr, ctrl_info, ctrl_info_len); + mbi.vbe_control_info = (int)cur_addr; + cur_addr += ctrl_info_len; + + grub_memmove((char*)cur_addr, mode_info, mode_info_len); + mbi.vbe_mode_info = (int)cur_addr; + cur_addr += mode_info_len; + + mbi.flags |= MB_INFO_VIDEO_INFO; + + mbi.vbe_mode = mode; + mbi.vbe_interface_seg = (pmif >> 16) & 0xFFFF; + mbi.vbe_interface_off = pmif & 0xFFFF; + mbi.vbe_interface_len = pmif_len; +} + int load_initrd (char *initrd) { @@ -836,6 +874,12 @@ return ! errnum; } +void +set_load_addr (int addr) +{ + printf ("Setting module load address to 0x%x\n", addr); + cur_addr = addr; +} #ifdef GRUB_UTIL /* Dummy function to fake the *BSD boot. */ diff -urN grub-0.93/stage2/builtins.c grub-0.93-os/stage2/builtins.c --- grub-0.93/stage2/builtins.c Wed Dec 4 05:41:57 2002 +++ grub-0.93-os/stage2/builtins.c Sun Jan 5 16:06:25 2003 @@ -2537,6 +2537,41 @@ #endif /* USE_MD5_PASSWORDS */ +/* modaddr */ +static int +modaddr_func (char *arg, int flags) +{ + int addr; + + switch (kernel_type) + { + case KERNEL_TYPE_MULTIBOOT: + if (safe_parse_maxint(&arg, &addr)) + { + set_load_addr(addr); + break; + } + + /* else fallthrough */ + + default: + errnum = ERR_NEED_MB_KERNEL; + return 1; + } + + return 0; +} + +static struct builtin builtin_modaddr = +{ + "modaddr", + modaddr_func, + BUILTIN_CMDLINE | BUILTIN_HELP_LIST, + "modaddr ADDRESS", + "Set the load address for the next Multiboot module to ADDRESS" +}; + + /* module */ static int module_func (char *arg, int flags) @@ -4551,6 +4586,7 @@ struct vbe_controller controller; unsigned short *mode_list; int mode_number = -1; + int count = 1; auto unsigned long vbe_far_ptr_to_linear (unsigned long); @@ -4632,6 +4668,16 @@ if (mode_number != -1) break; + + count++; + + /* XXX: arbitrary. */ + if (count == 22) + { + grub_printf ("\nHit any key to continue.\n"); + count = 0; + getkey (); + } } } @@ -4650,7 +4696,91 @@ "Probe VBE information. If the mode number MODE is specified, show only" " the information about only the mode." }; - + + +/* vbeset MODE */ +static int +vbeset_func (char *arg, int flags) +{ +#ifndef GRUB_UTIL + int mode_number; + int pmif_segoff, pmif_len; + struct vbe_controller controller; + struct vbe_mode mode; + + if (kernel_type != KERNEL_TYPE_MULTIBOOT) + { + grub_printf("Multiboot kernel must be loaded before vbeset command\n"); + errnum = MAX_ERR_NUM; + return 1; + } + + if (! *arg) + { + reset_vbe_mode (); + return 0; + } + + if (! safe_parse_maxint (&arg, &mode_number)) + return 1; + + /* Preset `VBE2'. */ + grub_memmove (controller.signature, "VBE2", 4); + + /* Detect VBE BIOS. */ + if (get_vbe_controller_info (&controller) != 0x004F) + { + grub_printf (" VBE BIOS is not present.\n"); + return 1; + } + + if (controller.version < 0x0200) + { + grub_printf (" VBE version %d.%d is not supported.\n", + (int) (controller.version >> 8), + (int) (controller.version & 0xFF)); + errnum = MAX_ERR_NUM; + return 1; + } + + if (get_vbe_mode_info (mode_number, &mode) != 0x004F + || (mode.mode_attributes & 0x0091) != 0x0091) + { + grub_printf (" Mode 0x%x is not supported.\n", mode_number); + errnum = MAX_ERR_NUM; + return 1; + } + + /* Now trip to the graphics mode. */ + if (set_vbe_mode (mode_number | (1 << 14)) != 0x004F) + { + grub_printf (" Switching to Mode 0x%x failed.\n", mode_number); + errnum = MAX_ERR_NUM; + return 1; + } + + get_vbe_pmif(&pmif_segoff, &pmif_len); + create_vbe_module(&controller, sizeof(struct vbe_controller), + &mode, sizeof(struct vbe_mode), + mode_number, pmif_segoff, pmif_len, controller.version); + + /* mode setting was successful */ + return 0; +#else + errnum = ERR_BAD_ARGUMENT; + return 1; +#endif +} + +static struct builtin builtin_vbeset = +{ + "vbeset", + vbeset_func, + BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST, + "vbeset [MODE]", + "Set the VBE mode MODE. If no MODE is given, switch back to text mode." +}; + /* The table of builtin commands. Sorted in dictionary order. */ struct builtin *builtin_table[] = @@ -4701,6 +4831,7 @@ #ifdef USE_MD5_PASSWORDS &builtin_md5crypt, #endif /* USE_MD5_PASSWORDS */ + &builtin_modaddr, &builtin_module, &builtin_modulenounzip, &builtin_pager, @@ -4740,5 +4871,6 @@ &builtin_unhide, &builtin_uppermem, &builtin_vbeprobe, + &builtin_vbeset, 0 }; diff -urN grub-0.93/stage2/common.c grub-0.93-os/stage2/common.c --- grub-0.93/stage2/common.c Tue Jun 4 15:04:55 2002 +++ grub-0.93-os/stage2/common.c Mon Dec 30 09:34:32 2002 @@ -87,6 +87,7 @@ [ERR_UNRECOGNIZED] = "Unrecognized command", [ERR_WONT_FIT] = "Selected item cannot fit into memory", [ERR_WRITE] = "Disk write error", + [ERR_BADMODADDR] = "Bad modaddr", }; diff -urN grub-0.93/stage2/shared.h grub-0.93-os/stage2/shared.h --- grub-0.93/stage2/shared.h Tue Dec 3 00:15:12 2002 +++ grub-0.93-os/stage2/shared.h Mon Dec 30 09:35:19 2002 @@ -533,6 +533,7 @@ ERR_DEV_NEED_INIT, ERR_NO_DISK_SPACE, ERR_NUMBER_OVERFLOW, + ERR_BADMODADDR, MAX_ERR_NUM } grub_error_t; @@ -754,6 +755,12 @@ /* Set VBE mode. */ int set_vbe_mode (int mode_number); +/* Switch to text mode */ +void reset_vbe_mode (void); + +/* Get VBE pm interface entry */ +void get_vbe_pmif (unsigned int *segoff, unsigned int *len); + /* Return the data area immediately following our code. */ int get_code_end (void); @@ -968,6 +975,11 @@ int load_module (char *module, char *arg); int load_initrd (char *initrd); +void set_load_addr (int addr); +void create_vbe_module(void *ctrl_info, int ctrl_info_len, + void *mode_info, int mode_info_len, + int mode, int pmif, int pmif_len, + unsigned int version); int check_password(char *entered, char* expected, password_t type); #endif diff -urN grub-0.93/stage2/stage2.c grub-0.93-os/stage2/stage2.c --- grub-0.93/stage2/stage2.c Wed Dec 4 01:54:23 2002 +++ grub-0.93-os/stage2/stage2.c Mon Dec 30 15:50:10 2002 @@ -76,6 +76,21 @@ #endif /* ! PRESET_MENU_STRING && ! SUPPORT_DISKLESS */ +/* config_file is 128 Bytes long (see grub/asmstub.c) */ +#define CONFIG_FILE_LEN 128 +#define CONFIG_FILE_HISTORY_ENTRIES 10 +struct config_file_history_struct { + char filename[CONFIG_FILE_LEN]; + int entryno; + int first_entry; +}; +static struct config_file_history_struct + config_file_history[CONFIG_FILE_HISTORY_ENTRIES]; +static int config_file_history_pos, config_file_history_start, + config_file_history_prev_pos; +static int config_file_history_menu_pos = -1; + + static char * get_entry (char *list, int num, int nested) { @@ -233,12 +248,25 @@ { int c, time1, time2 = -1, first_entry = 0; char *cur_entry = 0; + char shortcut_buf[5]; + int sc_matches; + + *shortcut_buf = 0; /* * Main loop for menu UI. */ restart: + + if (config_file_history_menu_pos != -1) + { + /* we're in a history back movement, set menu values to previous ones */ + entryno = config_file_history[config_file_history_menu_pos].entryno; + first_entry = config_file_history[config_file_history_menu_pos].first_entry; + config_file_history_menu_pos = -1; + } + /* Dumb terminal always use all entries for display invariant for TERM_DUMB: first_entry == 0 */ if (! (current_term->flags & TERM_DUMB)) @@ -318,8 +346,10 @@ { if (config_entries) printf ("\ - Press enter to boot the selected OS, \'e\' to edit the\n\ - commands before booting, or \'c\' for a command-line."); + Press enter or %c to boot the selected OS, \'e\' to edit the\n\ + commands before booting, \'r\' to reload, \'c\' for a command-line,\n\ + or %c to go back if possible.", + DISP_RIGHT, DISP_LEFT); else printf ("\ Press \'b\' to boot, \'e\' to edit the selected command in the\n\ @@ -367,6 +397,34 @@ grub_timeout--; } + /* Print the number of the current entry in the right upper corner of + * the menu, up to 999 entries are supported, modify the coordinates + * and putchar command to add more + * Additionally, print the shortcut buffer upper left if there's + * something in there */ + if (! (current_term->flags & TERM_DUMB)) + { + int x; + + /* current entry */ + gotoxy(69, 3); + grub_printf("[%d]", first_entry + entryno); + grub_putchar(DISP_HORIZ); + grub_putchar(DISP_HORIZ); + + + /* print shortcut buffer */ + gotoxy(5, 3); + if (shortcut_buf[0]) + grub_printf("<%s..>", shortcut_buf); + else + for (x = 0; x < 7; x++) + grub_putchar(DISP_HORIZ); + + gotoxy(74, 4 + entryno); + } + + /* Check for a keypress, however if TIMEOUT has been expired (GRUB_TIMEOUT == -1) relax in GETKEY even if no key has been pressed. @@ -397,7 +455,7 @@ /* We told them above (at least in SUPPORT_SERIAL) to use '^' or 'v' so accept these keys. */ - if (c == 16 || c == '^') + if (c == 16 || c == '^' || c == 'k') { if (current_term->flags & TERM_DUMB) { @@ -426,7 +484,7 @@ } } } - else if ((c == 14 || c == 'v') + else if ((c == 14 || c == 'v' || c == 'j') && first_entry + entryno + 1 < num_entries) { if (current_term->flags & TERM_DUMB) @@ -455,6 +513,35 @@ else if (c == 7) { /* Page Up */ + + if (first_entry > 11) + { + first_entry -= 12; + print_entries (3, 12, first_entry, entryno, menu_entries); + } + else if (first_entry) + { + if (entryno + first_entry - 12 < 0) + entryno = 0; + else + entryno = first_entry + entryno - 12; + first_entry = 0; + print_entries (3, 12, first_entry, entryno, menu_entries); + } + else if (entryno) + { + print_entry (4 + entryno, 0, + get_entry (menu_entries, + first_entry + entryno, + 0)); + entryno = 0; + print_entry (4, 1, + get_entry (menu_entries, + first_entry, + 0)); + } + +#if 0 first_entry -= 12; if (first_entry < 0) { @@ -464,10 +551,39 @@ entryno = 0; } print_entries (3, 12, first_entry, entryno, menu_entries); +#endif } else if (c == 3) { /* Page Down */ + if (first_entry + 12 < num_entries) + { + if (first_entry + 23 < num_entries) + first_entry += 12; + else + { + if (entryno + first_entry + 12 >= num_entries) + entryno = 11; + else + entryno += 24 + first_entry - num_entries; + first_entry = num_entries - 12; + } + print_entries (3, 12, first_entry, entryno, menu_entries); + } + else if (first_entry + entryno + 1 != num_entries) + { + print_entry (4 + entryno, 0, + get_entry (menu_entries, + first_entry + entryno, + 0)); + entryno = num_entries - first_entry - 1; + print_entry (4 + entryno, 1, + get_entry (menu_entries, + first_entry + entryno, + 0)); + } + +#if 0 first_entry += 12; if (first_entry + entryno + 1 >= num_entries) { @@ -477,12 +593,99 @@ entryno = num_entries - first_entry - 1; } print_entries (3, 12, first_entry, entryno, menu_entries); +#endif } + if (c >= '0' && c <= '9') + { + int inplen = grub_strlen(shortcut_buf); + int i; + + sc_matches = 0; + + shortcut_buf[inplen] = c; + shortcut_buf[++inplen] = 0; + + for (i = 0; i < num_entries; i++) + { + char buf[4]; + int a = 0; + + /* no strncmp in grub? do it ourselves */ + /* If shortcut_buf is entirely in the beginning + * of buf, mark it as the first valid entry, + * if the first entry is already set, we have at least + * two entries matching, bail out then */ + grub_sprintf(buf, "%d", i); + while (shortcut_buf[a] && buf[a] && + shortcut_buf[a] == buf[a]) + a++; + + if (a == inplen) + { + sc_matches++; + + if (sc_matches == 1) + { + first_entry = i - 5; + entryno = 5; + + if (first_entry < 0 || num_entries < 13) + { + entryno = i; + first_entry = 0; + } + else if (num_entries - i < 7) + { + first_entry = num_entries - 12; + entryno = i - first_entry; + } + + print_entries (3, 12, first_entry, + entryno, menu_entries); + } + else + break; + } + } + if (sc_matches <= 1) + shortcut_buf[0] = 0; + if (sc_matches == 1 && config_entries) + c = '\n'; /* Will hit the next check */ + } + else + shortcut_buf[0] = sc_matches = 0; + if (config_entries) { + if (c == 'r') + return; + if ((c == '\n') || (c == '\r') || (c == 6)) - break; + { + config_file_history[config_file_history_prev_pos].entryno = + entryno; + config_file_history[config_file_history_prev_pos].first_entry = + first_entry; + + break; + } + + if (c == 2) /* KEY_LEFT */ + { + /* go back in history if possible */ + int p = config_file_history_prev_pos; + if (p != config_file_history_start) + { + p = (p == 0) ? CONFIG_FILE_HISTORY_ENTRIES - 1 : p - 1; + memmove(config_file, config_file_history[p].filename, + CONFIG_FILE_LEN); + config_file_history_pos = p; + config_file_history_menu_pos = p; + + return; + } + } } else { @@ -985,6 +1188,17 @@ close_preset_menu (); else grub_close (); + + /* Save history for config_file */ + memmove(config_file_history[config_file_history_pos].filename, + config_file, + CONFIG_FILE_LEN); + config_file_history_prev_pos = config_file_history_pos; + if (++config_file_history_pos == CONFIG_FILE_HISTORY_ENTRIES) + config_file_history_pos = 0; + if (config_file_history_start == config_file_history_pos && + ++config_file_history_start == CONFIG_FILE_HISTORY_ENTRIES) + config_file_history_start = 0; } while (is_preset); } diff -urN grub-0.93/stamp-h.in grub-0.93-os/stamp-h.in --- grub-0.93/stamp-h.in Fri Nov 29 21:28:39 2002 +++ grub-0.93-os/stamp-h.in Sun Jan 5 15:59:07 2003 @@ -1 +0,0 @@ -timestamp