diff --git a/ChangeLog b/ChangeLog index 313b79a2b..d1908469c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2000-03-15 OKUJI Yoshinori + + * netboot/Makefile.am (EXTRA_libdrivers_a_SOURCES): 3c89x0.h -> + cs89x0.h. Just a typo. + +2000-03-10 Gordon Matzigkeit + + * debian/rules: Strip mbchk. + + * debian/postinst: Fix up /usr/doc symlink creation. + +2000-03-01 OKUJI Yoshinori + + * netboot/fsys_tftp.c (tftp_dir): Add BUF_READ into FILEMAX + after BUF_EOF becomes non-zero. Reported by Per Lundberg. + +2000-03-01 OKUJI Yoshinori + + * stage2/builtins.c (color_func): Return 1 if safe_parse_maxint + returns zero instead of non-zero. Reported by Magnus Holmberg + . + +2000-02-29 OKUJI Yoshinori + + * grub/asmstub.c [__linux__]: Include for the + macro MAJOR. From Kalle Olavi Niemitalo . + 2000-02-27 OKUJI Yoshinori * docs/tutorial.texi (Network): New chapter. diff --git a/INSTALL b/INSTALL index b42a17ac4..06ab28699 100644 --- a/INSTALL +++ b/INSTALL @@ -1,35 +1,96 @@ -Basic Installation -================== +-*- Text -*- - These are generic installation instructions. +This is the GRUB. Welcome. - The `configure' shell script attempts to guess correct values for +This file contains instructions for compiling and installing the GRUB. + +The Requirements +================ + +GRUB depends on some software packages installed into your system. If +you don't have any of them, please obtain and install them before +configuring the GRUB. + +* GCC + + Probably every recent GCC should work, but we recommend GCC 2.95 and + later, since you can create smaller binary images. See the webpage + . + +* GNU Make + + For now, the Makefiles produced by Automake depends on GNU Make. See + the webpage . + +* GNU binutils 2.9.1.0.23 or later + + Binutils has changed the behavior of 16bit assembler between 2.9.1 + and 2.9.1.0.x, and we support only 2.9.1.0.x and higher. It is + available from + . You don't have + to install it into a system directory. See the section "Operation + Controls". + +* Texinfo 4.0 or later + + We use some new macros in the documents, so you need a recent + Texinfo release. See the webpage + . + +If you obtain this source package from the CVS, these below are also +required. + +* GNU Autoconf 20000116 or later + + Some new macros are required, so you need to get an unrelease + version from the CVS. See the webpage + . + +* GNU Automake 19990620 or later + + The new feature "per-executable flags" is required, so you need to + get an unreleased version from the CVS. See the webpage + . + + Caution: The recent versions are quite unstable, so check out a + rather old version from the CVS (1999-10-01 works fine, though it + has some non-critical bugs). + + +Configuring the GRUB +==================== + +The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up +you can run in the future to recreate the current configuration, a +file `config.cache' that saves the results of its tests to speed up reconfiguring, and a file `config.log' containing compiler output (useful mainly for debugging `configure'). - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail +If you need to do unusual things to compile the package, please try to +figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can be considered for the next release. If at some point `config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.in' is used to create `configure' by a program +The file `configure.in' is used to create `configure' by a program called `autoconf'. You only need `configure.in' if you want to change it or regenerate `configure' using a newer version of `autoconf'. + +Building the GRUB +================= + The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + 1. `cd' to the directory containing the package's source code and + type `./configure' to configure the package for your system. If + you're using `csh' on an old version of System V, you might need + to type `sh ./configure' instead to prevent `csh' from trying to + execute `configure' itself. Running `configure' takes awhile. While running, it prints some messages telling which features it is checking for. @@ -51,98 +112,51 @@ The simplest way to compile this package is: all sorts of other programs in order to regenerate files that came with the distribution. -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure - -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +own directory. `cd' to the directory where you want the object files +and executables to go and run the `configure' script. `configure' +automatically checks for the source code in the directory that +`configure' is in and in `..'. - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. Installation Names ================== - By default, `make install' will install the package's files in +By default, `make install' will install the package's files in `/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +installation prefix by giving `configure' the option `--prefix=PATH'. - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. +You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If +you give `configure' the option `--exec-prefix=PATH', the package will +use PATH as the prefix for installing programs and libraries. Documentation and other data files will still use the regular prefix. - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' to specify different values for +particular kinds of files. Run `configure --help' for a list of the +directories you can set and what kinds of files go in them. - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' +the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= +Please note, however, that the GRUB knows where it is located in the +filesystem. If you have installed it in an unusual location, the +system might not work properly, or at all. The chief utility of these +options for the GRUB is to allow you to "install" in some alternate +location, and then copy these to the actual root filesystem later. - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: - CPU-COMPANY-SYSTEM - -See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the host type. - - If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, +If you want to set default values for `configure' scripts to share, you can create a site shell script called `config.site' that gives default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then @@ -150,6 +164,7 @@ default values for variables like `CC', `cache_file', and `prefix'. `CONFIG_SITE' environment variable to the location of the site script. A warning: not all `configure' scripts look for a site script. + Operation Controls ================== @@ -167,9 +182,7 @@ operates. `--quiet' `--silent' `-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). + Do not print messages saying which checks are being made. `--srcdir=DIR' Look for the package's source code in directory DIR. Usually @@ -179,4 +192,37 @@ operates. Print the version of Autoconf used to generate the `configure' script, and exit. -`configure' also accepts some other, not widely useful, options. +`--disable-lba-support-bitmap-check' + Disable the check for LBA support bitmap. Specify this option + if you are sure that your BIOS has the INT 13 extension support, + but GRUB doesn't access your drives in LBA mode. This is + necessary because an incorrect LBA support bitmap is returned in + several buggy BIOSes. You can check if GRUB recognizes the INT 13 + extension support by the command `geometry'. + +`--disable-ext2fs' + Omit the ext2fs support in Stage 2. + +`--disable-fat' + Omit the FAT support in Stage 2. + +`--disable-ffs' + Omit the FFS support in Stage 2. + +`--disable-minix' + Omit the Minix fs support in Stage 2. + +`--disable-gunzip' + Omit the decompression support in Stage 2. + +`--with-binutils=PATH' + Search the path PATH to find binutils. If you have installed your + binutils executables into an unusual location where GCC doesn't + search by default, use this option. + +`--without-curses' + Don't use the curses library. + + +`configure' also accepts several options for the network support. See +the file `netboot/README.netboot', for more information. diff --git a/NEWS b/NEWS index 6dd3bf8ac..24015241a 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ NEWS - list of user-visible changes between releases of GRUB -New in 0.5.94: +New in 0.5.94 - 2000-03-06: * Stage 1 supports both the LBA mode and the CHS mode. * The NetBSD and OpenBSD boot bug is fixed. * The more automatic installation command "setup" is added. diff --git a/README b/README index e0f92e993..c1de99226 100644 --- a/README +++ b/README @@ -11,65 +11,12 @@ personal computer BIOSes: See the file NEWS for a description of recent changes to GRUB. - -You need recent developmental environment to build GRUB. We recommend -you use the following utilities: - -* binutils 2.9.1.0.23 or later (Do not use early 2.9.1.0.x!) - - Binutils has changed the behavior of 16bit assembler between 2.9.1 -and 2.9.1.0.x, and we support only 2.9.1.0.x and higher. It is available -from ftp.varesearch.com:/pub/support/hjl/binutils. - -NOTE: you should check for the version of your binutils by the following -command: - -$ gcc -Wl,-v 2>&1 | grep "GNU ld" - -This will show two versions, like this: - -GNU ld version 2.9.5 (with BFD 2.9.5.0.13) - -The latter is what you should see. If you have installed a recent -version of binutils but this version number is not identical with it, -you need to specify the option ``--with-binutils=DIR'' for configure. - -* texinfo 4.0 or later - - We use some new macros in the manuals, so you need a recent TeXinfo -release. See http://www.gnu.org/software/texinfo/texinfo.html, for more -information. - - -These below are required when you develop GRUB or when you get it from -the CVS: - -* automake 19990620 or later - - The new feature, per-executable flags, is required, so you need to get -an unreleased version from the CVS. See -, for more information. - -Caution: The recent versions are quite unstable, so check out a rather -old version from the CVS (1999-10-01 works fine, though it has some -non-critical bugs). - -* autoconf 20000116 or later - - Some new macros are required, so you need to get an unreleased version -from the CVS. See , for more -information. - -Note: Perhaps a somewhat older CVS version should work well, but I'm not -sure. Using the latest version would be better. - - -If you are interested in netboot, see the file README.netboot under the -directory netboot. +If you are interested in the network support, see the file +README.netboot under the directory netboot. See the file INSTALL for instructions on how to build and install the GRUB data and program files. See the GRUB manual for details about -using GRUB as your bootloader. +using GRUB as your bootloader. Type "info grub" in the shell prompt. GNU GRUB has a page on the web. See: diff --git a/configure b/configure index 6589bc9c1..4091099b6 100644 --- a/configure +++ b/configure @@ -1,136 +1,18 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using Autoconf version 2.14a -# Copyright (C) 1992, 93, 94, 95, 96, 98, 1999 Free Software Foundation, Inc. +# Generated automatically using Autoconf version 2.14a. +# Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000 +# Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. - # Defaults: -ac_arg_with_help= -ac_arg_enable_help= -ac_arg_var_help= ac_default_prefix=/usr/local -# Factorizing default headers for most tests. -ac_includes_default="\ -#include -#include -#if STDC_HEADERS -# include -# include -#else -# if HAVE_STDLIB_H -# include -# endif -#endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include -# endif -# include -#else -# if HAVE_STRINGS_H -# include -# endif -#endif -#if HAVE_UNISTD_H -# include -#endif" # Any additions from configure.in: -ac_arg_enable_help="$ac_arg_enable_help - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer" -ac_arg_var_help="$ac_arg_var_help - CFLAGS Extra flags for the C compiler" -ac_arg_with_help="$ac_arg_with_help - --with-binutils=DIR search the directory DIR to find binutils" -ac_arg_with_help="$ac_arg_with_help - --without-curses do not use curses" -ac_arg_enable_help="$ac_arg_enable_help - --disable-lba-support-bitmap-check - disable a check for LBA support bitmap" -ac_arg_enable_help="$ac_arg_enable_help - --disable-ext2fs disable ext2fs support in Stage 2" -ac_arg_enable_help="$ac_arg_enable_help - --disable-fat disable FAT support in Stage 2" -ac_arg_enable_help="$ac_arg_enable_help - --disable-ffs disable FFS support in Stage 2" -ac_arg_enable_help="$ac_arg_enable_help - --disable-minix disable Minix fs support in Stage 2" -ac_arg_enable_help="$ac_arg_enable_help - --disable-gunzip disable decompression in Stage 2" -ac_arg_enable_help="$ac_arg_enable_help - --disable-packet-retransmission - turn off packet retransmission" -ac_arg_enable_help="$ac_arg_enable_help - --enable-pci-direct access PCI directly instead of using BIOS" -ac_arg_enable_help="$ac_arg_enable_help - --enable-3c509 enable 3Com509 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-3c529 enable 3Com529 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-3c90x enable 3Com90x driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-cs89x0 enable CS89x0 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-eepro100 enable Etherexpress Pro/100 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-epic100 enable SMC 83c170 EPIC/100 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-3c507 enable 3Com507 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-exos205 enable EXOS205 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-ni5210 enable Racal-Interlan NI5210 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-lancepci enable Lance PCI PCNet/32 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-ne2100 enable Novell NE2100 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-ni6510 enable Racal-Interlan NI6510 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-3c503 enable 3Com503 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-ne enable NE1000/2000 ISA driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-nepci enable NE2000 PCI driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-wd enable WD8003/8013, SMC8216/8416 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-ntulip enable Tulip driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-rtl8139 enable Realtek 8139 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-sk-g16 enable Schneider and Koch G16 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-smc9000 enable SMC9000 driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-tiara enable Tiara driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-tulip enable old Tulip driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-via-rhine enable Rhine-I/II driver" -ac_arg_enable_help="$ac_arg_enable_help - --enable-3c503-shmem use 3c503 shared memory mode" -ac_arg_enable_help="$ac_arg_enable_help - --enable-3c503-aui use AUI by default on 3c503 cards" -ac_arg_enable_help="$ac_arg_enable_help - --enable-3c509-hack make a 3c509 do bootp quicker" -ac_arg_enable_help="$ac_arg_enable_help - --enable-compex-rl2000-fix - specify this if you have a Compex RL2000 PCI" -ac_arg_enable_help="$ac_arg_enable_help - --enable-smc9000-scan=LIST - probe for SMC9000 I/O addresses using LIST" -ac_arg_enable_help="$ac_arg_enable_help - --enable-ne-scan=LIST probe for NE base address using LIST" -ac_arg_enable_help="$ac_arg_enable_help - --enable-wd-default-mem=MEM - set the default memory location for WD/SMC" -ac_arg_enable_help="$ac_arg_enable_help - --enable-cs-scan=LIST probe for CS89x0 base address using LIST" # Initialize some variables set by options. +ac_init_help=false +ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. build=NONE @@ -249,78 +131,7 @@ do with_gas=yes ;; -help | --help | --hel | --he | -h) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<\EOF -`configure' configures software source code packages to adapt to many kinds -of systems. - -Usage: configure [OPTION]... [VAR=VALUE]... [HOST] - -To safely assign special values to environment variables (e.g., CC, -CFLAGS...), give to `configure' the definition as VAR=VALUE. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help print this message - --version print the version of autoconf that created configure - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE - -n, --no-create do not create output files - -Directories: - --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 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 - -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] - -X features: - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - test -n "$ac_arg_enable_help" && echo " -Optional features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes]\ -$ac_arg_enable_help" - test -n "$ac_arg_with_help" && echo " -Optional packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)\ -$ac_arg_with_help" - test -n "$ac_arg_var_help" && echo " -Some influent environment variables:$ac_arg_var_help" - exit 0 ;; - + ac_init_help=: ;; -host | --host | --hos | --ho) ac_prev=host ;; -host=* | --host=* | --hos=* | --ho=*) @@ -467,14 +278,13 @@ Some influent environment variables:$ac_arg_var_help" -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.14a" - exit 0 ;; + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; -with-* | --with-*) ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then + if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then { echo "configure: error: invalid package: $ac_package" 1>&2; exit 1; } fi ac_package=`echo $ac_package| sed 's/-/_/g'` @@ -487,7 +297,7 @@ Some influent environment variables:$ac_arg_var_help" -without-* | --without-*) ac_package=`echo "$ac_option"|sed -e 's/-*without-//'` # Reject names that are not valid shell variable names. - if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then + if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then { echo "configure: error: invalid package: $ac_package" 1>&2; exit 1; } fi ac_package=`echo $ac_package| sed 's/-/_/g'` @@ -526,7 +336,7 @@ Try \`configure --help' for more information." 1>&2; exit 1; } export $ac_envvar ;; *) - if echo "$ac_feature" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then + if echo "$ac_option" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then echo "configure: warning: invalid host type: $ac_option" 1>&2 fi if test "x$nonopt" != xNONE; then @@ -541,7 +351,140 @@ done if test -n "$ac_prev"; then { echo "configure: error: missing argument to --\`echo $ac_prev | sed 's/_/-/g'\`" 1>&2; exit 1; } fi +if $ac_init_help; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<\EOF +`configure' configures software source code packages to adapt to many kinds +of systems. +Usage: configure [OPTION]... [VAR=VALUE]... [HOST] + +To safely assign special values to environment variables (e.g., CC, +CFLAGS...), give to `configure' the definition as VAR=VALUE. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help print this message + -V, --version print the version of autoconf that created configure + -q, --quiet, --silent do not print `checking...' messages + --cache-file=FILE cache test results in FILE + -n, --no-create do not create output files + +EOF + + cat </dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says Kaveh Ghazi + # Stardent Vistra SVR4 grep lacks -e, says Kaveh R. Ghazi. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' + ECHO_N= ECHO_C=' +' ECHO_T=' ' else - ac_n=-n ac_c= ac_t= + ECHO_N=-n ECHO_C= ECHO_T= fi else - ac_n= ac_c='\c' ac_t= + ECHO_N= ECHO_C='\c' ECHO_T= fi ac_aux_dir= @@ -701,11 +673,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install... $ac_c" 1>&6 -echo "configure:706: checking for a BSD compatible install" 1>&5 +echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6 +echo "configure:678: checking for a BSD compatible install" 1>&5 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do @@ -748,7 +720,7 @@ fi INSTALL="$ac_install_sh" fi fi -echo "$ac_t""$INSTALL" 1>&6 +echo "$ECHO_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. @@ -758,8 +730,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo $ac_n "checking whether build environment is sane... $ac_c" 1>&6 -echo "configure:763: checking whether build environment is sane" 1>&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" 1>&6 +echo "configure:735: checking whether build environment is sane" 1>&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -795,7 +767,7 @@ else Check your system clock" 1>&2; exit 1; } fi rm -f conftest* -echo "$ac_t""yes" 1>&6 +echo "$ECHO_T""yes" 1>&6 if test "$program_transform_name" = s,x,x,; then program_transform_name= else @@ -819,41 +791,44 @@ for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:824: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:796: checking for $ac_word" 1>&5 if test "${ac_cv_prog_AWK+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - 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 + for ac_path in `IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + echo "$ac_dir/$ac_word" + fi +done +IFS="$ac_save_ifs" +`; do + ac_cv_prog_AWK="$ac_prog" + break done - IFS="$ac_save_ifs" fi fi AWK="$ac_cv_prog_AWK" if test -n "$AWK"; then - echo "$ac_t""$AWK" 1>&6 + echo "$ECHO_T""$AWK" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi test -n "$AWK" && break done -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}... $ac_c" 1>&6 -echo "configure:854: checking whether ${MAKE-make} sets \${MAKE}" 1>&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" 1>&6 +echo "configure:829: checking whether ${MAKE-make} sets \${MAKE}" 1>&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat >conftestmake <<\EOF all: @@ -869,10 +844,10 @@ fi rm -f conftestmake fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 + echo "$ECHO_T""yes" 1>&6 SET_MAKE= else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -892,69 +867,69 @@ cat >>confdefs.h <&6 -echo "configure:897: checking for working aclocal" 1>&5 +echo $ECHO_N "checking for working aclocal... $ECHO_C" 1>&6 +echo "configure:872: checking for working aclocal" 1>&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (aclocal --version) < /dev/null > /dev/null 2>&1; then ACLOCAL=aclocal - echo "$ac_t""found" 1>&6 + echo "$ECHO_T""found" 1>&6 else ACLOCAL="$missing_dir/missing aclocal" - echo "$ac_t""missing" 1>&6 + echo "$ECHO_T""missing" 1>&6 fi -echo $ac_n "checking for working autoconf... $ac_c" 1>&6 -echo "configure:910: checking for working autoconf" 1>&5 +echo $ECHO_N "checking for working autoconf... $ECHO_C" 1>&6 +echo "configure:885: checking for working autoconf" 1>&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (autoconf --version) < /dev/null > /dev/null 2>&1; then AUTOCONF=autoconf - echo "$ac_t""found" 1>&6 + echo "$ECHO_T""found" 1>&6 else AUTOCONF="$missing_dir/missing autoconf" - echo "$ac_t""missing" 1>&6 + echo "$ECHO_T""missing" 1>&6 fi -echo $ac_n "checking for working automake... $ac_c" 1>&6 -echo "configure:923: checking for working automake" 1>&5 +echo $ECHO_N "checking for working automake... $ECHO_C" 1>&6 +echo "configure:898: checking for working automake" 1>&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (automake --version) < /dev/null > /dev/null 2>&1; then AUTOMAKE=automake - echo "$ac_t""found" 1>&6 + echo "$ECHO_T""found" 1>&6 else AUTOMAKE="$missing_dir/missing automake" - echo "$ac_t""missing" 1>&6 + echo "$ECHO_T""missing" 1>&6 fi -echo $ac_n "checking for working autoheader... $ac_c" 1>&6 -echo "configure:936: checking for working autoheader" 1>&5 +echo $ECHO_N "checking for working autoheader... $ECHO_C" 1>&6 +echo "configure:911: checking for working autoheader" 1>&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (autoheader --version) < /dev/null > /dev/null 2>&1; then AUTOHEADER=autoheader - echo "$ac_t""found" 1>&6 + echo "$ECHO_T""found" 1>&6 else AUTOHEADER="$missing_dir/missing autoheader" - echo "$ac_t""missing" 1>&6 + echo "$ECHO_T""missing" 1>&6 fi -echo $ac_n "checking for working makeinfo... $ac_c" 1>&6 -echo "configure:949: checking for working makeinfo" 1>&5 +echo $ECHO_N "checking for working makeinfo... $ECHO_C" 1>&6 +echo "configure:924: checking for working makeinfo" 1>&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (makeinfo --version) < /dev/null > /dev/null 2>&1; then MAKEINFO=makeinfo - echo "$ac_t""found" 1>&6 + echo "$ECHO_T""found" 1>&6 else MAKEINFO="$missing_dir/missing makeinfo" - echo "$ac_t""missing" 1>&6 + echo "$ECHO_T""missing" 1>&6 fi install_sh="$missing_dir/install-sh" @@ -964,31 +939,34 @@ for ac_prog in gnutar gtar tar 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 $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:969: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:944: checking for $ac_word" 1>&5 if test "${ac_cv_prog_AMTAR+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else if test -n "$AMTAR"; then ac_cv_prog_AMTAR="$AMTAR" # Let the user override the test. else - 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_AMTAR="$ac_prog" - break - fi + for ac_path in `IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + echo "$ac_dir/$ac_word" + fi +done +IFS="$ac_save_ifs" +`; do + ac_cv_prog_AMTAR="$ac_prog" + break done - IFS="$ac_save_ifs" fi fi AMTAR="$ac_cv_prog_AMTAR" if test -n "$AMTAR"; then - echo "$ac_t""$AMTAR" 1>&6 + echo "$ECHO_T""$AMTAR" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi test -n "$AMTAR" && break @@ -1001,8 +979,8 @@ if test -n "$AMTAR"; then fi fi -echo $ac_n "checking host system type... $ac_c" 1>&6 -echo "configure:1006: checking host system type" 1>&5 +echo $ECHO_N "checking host system type... $ECHO_C" 1>&6 +echo "configure:984: checking host system type" 1>&5 if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then # Make sure we can run config.sub. @@ -1026,10 +1004,10 @@ if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` else - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 fi -echo "$ac_t""$ac_cv_host" 1>&6 +echo "$ECHO_T""$ac_cv_host" 1>&6 host=$ac_cv_host host_alias=$ac_cv_host_alias @@ -1046,8 +1024,8 @@ esac # Options # -echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles... $ac_c" 1>&6 -echo "configure:1051: checking whether to enable maintainer-specific portions of Makefiles" 1>&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" 1>&6 +echo "configure:1029: checking whether to enable maintainer-specific portions of Makefiles" 1>&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1055,8 +1033,7 @@ if test "${enable_maintainer_mode+set}" = set; then else USE_MAINTAINER_MODE=no fi - - echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + echo "$ECHO_T""$USE_MAINTAINER_MODE" 1>&6 if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= @@ -1070,13 +1047,13 @@ fi if test "x$enable_maintainer_mode" = xyes; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:1075: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:1052: checking for $ac_word" 1>&5 if test "${ac_cv_path_PERL+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else case "$PERL" in - /* | ?:/*) + [/\\]* | ?:[/\\]*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; *) @@ -1095,9 +1072,9 @@ esac fi PERL="$ac_cv_path_PERL" if test -n "$PERL"; then - echo "$ac_t""$PERL" 1>&6 + echo "$ECHO_T""$PERL" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi if test -z "$PERL"; then @@ -1114,8 +1091,8 @@ fi # Programs # -echo $ac_n "checking build system type... $ac_c" 1>&6 -echo "configure:1119: checking build system type" 1>&5 +echo $ECHO_N "checking build system type... $ECHO_C" 1>&6 +echo "configure:1096: checking build system type" 1>&5 if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then # Make sure we can run config.sub. @@ -1138,10 +1115,10 @@ if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` else - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 fi -echo "$ac_t""$ac_cv_build" 1>&6 +echo "$ECHO_T""$ac_cv_build" 1>&6 build=$ac_cv_build build_alias=$ac_cv_build_alias @@ -1157,32 +1134,35 @@ fi # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:1162: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:1139: checking for $ac_word" 1>&5 if test "${ac_cv_prog_CC+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_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_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 + for ac_path in `IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + echo "$ac_dir/$ac_word" + fi +done +IFS="$ac_save_ifs" +`; do + ac_cv_prog_CC="${ac_tool_prefix}gcc" + break done - IFS="$ac_save_ifs" test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc" fi fi CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$ECHO_T""$CC" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi case "${CFLAGS+set} $ac_configure_args" in @@ -1192,59 +1172,65 @@ esac # 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:1197: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:1177: checking for $ac_word" 1>&5 if test "${ac_cv_prog_CC+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_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_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 + for ac_path in `IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + echo "$ac_dir/$ac_word" + fi +done +IFS="$ac_save_ifs" +`; do + ac_cv_prog_CC="gcc" + break done - IFS="$ac_save_ifs" fi fi CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$ECHO_T""$CC" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:1227: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:1210: checking for $ac_word" 1>&5 if test "${ac_cv_prog_CC+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_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 - 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 + for ac_path in `IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + echo "$ac_dir/$ac_word" + fi +done +IFS="$ac_save_ifs" +`; do + if test "$ac_path" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue fi + ac_cv_prog_CC="cc" + break done - IFS="$ac_save_ifs" if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. set dummy $ac_cv_prog_CC @@ -1254,7 +1240,7 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" "$@" + set dummy "$ac_path" "$@" shift ac_cv_prog_CC="$@" fi @@ -1263,9 +1249,9 @@ fi fi CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$ECHO_T""$CC" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi if test -z "$CC"; then @@ -1273,31 +1259,34 @@ fi 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 $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:1278: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:1264: checking for $ac_word" 1>&5 if test "${ac_cv_prog_CC+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_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_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_prog" - break - fi + for ac_path in `IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + echo "$ac_dir/$ac_word" + fi +done +IFS="$ac_save_ifs" +`; do + ac_cv_prog_CC="$ac_prog" + break done - IFS="$ac_save_ifs" fi fi CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$ECHO_T""$CC" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi test -n "$CC" && break @@ -1308,8 +1297,8 @@ done test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works... $ac_c" 1>&6 -echo "configure:1313: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" 1>&5 +echo $ECHO_N "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works... $ECHO_C" 1>&6 +echo "configure:1302: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" 1>&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1320,12 +1309,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat >conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1318: \"$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 @@ -1346,32 +1335,32 @@ 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 +echo "$ECHO_T""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 77; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler... $ac_c" 1>&6 -echo "configure:1355: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" 1>&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +echo $ECHO_N "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler... $ECHO_C" 1>&6 +echo "configure:1344: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" 1>&5 +echo "$ECHO_T""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross -echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6 -echo "configure:1360: checking whether we are using GNU C" 1>&5 +echo $ECHO_N "checking whether we are using GNU C... $ECHO_C" 1>&6 +echo "configure:1349: checking whether we are using GNU C" 1>&5 if test "${ac_cv_prog_gcc+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat >conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no fi fi -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 +echo "$ECHO_T""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes @@ -1382,10 +1371,10 @@ fi 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:1387: checking whether ${CC-cc} accepts -g" 1>&5 +echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" 1>&6 +echo "configure:1376: checking whether ${CC-cc} accepts -g" 1>&5 if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else echo 'void f(){}' >conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1396,7 +1385,7 @@ fi rm -f conftest* fi -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +echo "$ECHO_T""$ac_cv_prog_cc_g" 1>&6 if test "$ac_test_CFLAGS" = set; then CFLAGS="$ac_save_CFLAGS" elif test $ac_cv_prog_cc_g = yes; then @@ -1422,13 +1411,13 @@ fi if test "x$with_binutils" != x; 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 $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:1427: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:1416: checking for $ac_word" 1>&5 if test "${ac_cv_path_RANLIB+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else case "$RANLIB" in - /* | ?:/*) + [/\\]* | ?:[/\\]*) ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path. ;; *) @@ -1448,22 +1437,22 @@ esac fi RANLIB="$ac_cv_path_RANLIB" if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + echo "$ECHO_T""$RANLIB" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi if test -z "$ac_cv_prog_RANLIB"; then if test -n "$ac_tool_prefix"; then # 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:1462: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:1451: checking for $ac_word" 1>&5 if test "${ac_cv_path_RANLIB+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else case "$RANLIB" in - /* | ?:/*) + [/\\]* | ?:[/\\]*) ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path. ;; *) @@ -1483,9 +1472,9 @@ esac fi RANLIB="$ac_cv_path_RANLIB" if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + echo "$ECHO_T""$RANLIB" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi else @@ -1496,32 +1485,35 @@ fi else # 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:1501: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:1490: checking for $ac_word" 1>&5 if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - 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 + for ac_path in `IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + echo "$ac_dir/$ac_word" + fi +done +IFS="$ac_save_ifs" +`; do + ac_cv_prog_RANLIB="ranlib" + break done - IFS="$ac_save_ifs" test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" fi fi RANLIB="$ac_cv_prog_RANLIB" if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + echo "$ECHO_T""$RANLIB" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi fi @@ -1536,16 +1528,16 @@ if test "x$ac_cv_prog_gcc" = xyes; then fi STAGE1_CFLAGS="-O2" GRUB_CFLAGS="-O2" - echo $ac_n "checking whether optimization for size works... $ac_c" 1>&6 -echo "configure:1541: checking whether optimization for size works" 1>&5 + echo $ECHO_N "checking whether optimization for size works... $ECHO_C" 1>&6 +echo "configure:1533: checking whether optimization for size works" 1>&5 if test "${size_flag+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else saved_CFLAGS=$CFLAGS CFLAGS="-Os -g" cat >conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* size_flag=yes else @@ -1569,7 +1561,7 @@ rm -f conftest* CFLAGS=$saved_CFLAGS fi -echo "$ac_t""$size_flag" 1>&6 +echo "$ECHO_T""$size_flag" 1>&6 if test "x$size_flag" = xyes; then STAGE2_CFLAGS="-Os" else @@ -1584,13 +1576,13 @@ CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused" if test "x$with_binutils" != x; 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 $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:1589: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:1581: checking for $ac_word" 1>&5 if test "${ac_cv_path_OBJCOPY+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else case "$OBJCOPY" in - /* | ?:/*) + [/\\]* | ?:[/\\]*) ac_cv_path_OBJCOPY="$OBJCOPY" # Let the user override the test with a path. ;; *) @@ -1610,50 +1602,53 @@ esac fi OBJCOPY="$ac_cv_path_OBJCOPY" if test -n "$OBJCOPY"; then - echo "$ac_t""$OBJCOPY" 1>&6 + echo "$ECHO_T""$OBJCOPY" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi else # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args. set dummy ${ac_tool_prefix}objcopy; ac_word=$2 -echo $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:1623: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:1615: checking for $ac_word" 1>&5 if test "${ac_cv_prog_OBJCOPY+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else if test -n "$OBJCOPY"; then ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test. else - 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 + for ac_path in `IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + echo "$ac_dir/$ac_word" + fi +done +IFS="$ac_save_ifs" +`; do + ac_cv_prog_OBJCOPY="${ac_tool_prefix}objcopy" + break done - IFS="$ac_save_ifs" test -z "$ac_cv_prog_OBJCOPY" && ac_cv_prog_OBJCOPY="objcopy" fi fi OBJCOPY="$ac_cv_prog_OBJCOPY" if test -n "$OBJCOPY"; then - echo "$ac_t""$OBJCOPY" 1>&6 + echo "$ECHO_T""$OBJCOPY" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi fi # Defined in acinclude.m4. -echo $ac_n "checking if C symbols get an underscore after compilation... $ac_c" 1>&6 -echo "configure:1655: checking if C symbols get an underscore after compilation" 1>&5 +echo $ECHO_N "checking if C symbols get an underscore after compilation... $ECHO_C" 1>&6 +echo "configure:1650: checking if C symbols get an underscore after compilation" 1>&5 if test "${grub_cv_asm_uscore+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat > conftest.c <<\EOF int @@ -1664,7 +1659,7 @@ func (int *list) } EOF -if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then +if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then true else { echo "configure: error: ${CC-cc} failed to produce assembly code" 1>&2; exit 1; } @@ -1686,12 +1681,12 @@ EOF fi -echo "$ac_t""$grub_cv_asm_uscore" 1>&6 +echo "$ECHO_T""$grub_cv_asm_uscore" 1>&6 -echo $ac_n "checking whether ${OBJCOPY} works for absolute addresses... $ac_c" 1>&6 -echo "configure:1693: checking whether ${OBJCOPY} works for absolute addresses" 1>&5 +echo $ECHO_N "checking whether ${OBJCOPY} works for absolute addresses... $ECHO_C" 1>&6 +echo "configure:1688: checking whether ${OBJCOPY} works for absolute addresses" 1>&5 if test "${grub_cv_prog_objcopy_absolute+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat > conftest.c <<\EOF void @@ -1701,21 +1696,21 @@ cmain (void) } EOF -if { (eval echo configure:1705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then : +if { (eval echo configure:1700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then : else { echo "configure: error: ${CC-cc} cannot compile C source code" 1>&2; exit 1; } fi grub_cv_prog_objcopy_absolute=yes for link_addr in 2000 8000 7C00; do - if { ac_try='${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec'; { (eval echo configure:1711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : + if { ac_try='${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec'; { (eval echo configure:1706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : else { echo "configure: error: ${CC-cc} cannot link at address $link_addr" 1>&2; exit 1; } fi - if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : + if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : else { echo "configure: error: ${OBJCOPY-objcopy} cannot create binary files" 1>&2; exit 1; } fi - if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then mv -f conftest conftest.old else grub_cv_prog_objcopy_absolute=no @@ -1725,22 +1720,22 @@ done rm -f conftest* fi -echo "$ac_t""$grub_cv_prog_objcopy_absolute" 1>&6 +echo "$ECHO_T""$grub_cv_prog_objcopy_absolute" 1>&6 if test "x$grub_cv_prog_objcopy_absolute" != xyes; then { echo "configure: error: GRUB requires a working absolute objcopy; upgrade your binutils" 1>&2; exit 1; } fi -echo $ac_n "checking whether addr32 must be in the same line as the instruction... $ac_c" 1>&6 -echo "configure:1735: checking whether addr32 must be in the same line as the instruction" 1>&5 +echo $ECHO_N "checking whether addr32 must be in the same line as the instruction... $ECHO_C" 1>&6 +echo "configure:1730: checking whether addr32 must be in the same line as the instruction" 1>&5 if test "${grub_cv_asm_prefix_requirement+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat > conftest.s <<\EOF .code16 l1: addr32 movb %al, l1 EOF -if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then +if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1739: \"$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 @@ -1765,12 +1760,12 @@ cat >>confdefs.h <&6 +echo "$ECHO_T""$grub_cv_asm_prefix_requirement" 1>&6 -echo $ac_n "checking for .code16 addr32 assembler support... $ac_c" 1>&6 -echo "configure:1772: checking for .code16 addr32 assembler support" 1>&5 +echo $ECHO_N "checking for .code16 addr32 assembler support... $ECHO_C" 1>&6 +echo "configure:1767: checking for .code16 addr32 assembler support" 1>&5 if test "${grub_cv_asm_addr32+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat > conftest.s.in <<\EOF .code16 @@ -1783,7 +1778,7 @@ else sed -e s/@ADDR32@/addr32\;/ < conftest.s.in > conftest.s fi -if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then +if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1782: \"$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 @@ -1792,18 +1787,18 @@ fi rm -f conftest* fi -echo "$ac_t""$grub_cv_asm_addr32" 1>&6 +echo "$ECHO_T""$grub_cv_asm_addr32" 1>&6 if test "x$grub_cv_asm_addr32" != xyes; then { echo "configure: error: GRUB requires GAS .code16 addr32 support; upgrade your binutils" 1>&2; exit 1; } fi -echo $ac_n "checking if start is defined by the compiler... $ac_c" 1>&6 -echo "configure:1802: checking if start is defined by the compiler" 1>&5 +echo $ECHO_N "checking if start is defined by the compiler... $ECHO_C" 1>&6 +echo "configure:1797: checking if start is defined by the compiler" 1>&5 if test "${grub_cv_check_start_symbol+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat >conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1813: \"$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 @@ -1834,15 +1829,15 @@ EOF fi -echo "$ac_t""$grub_cv_check_start_symbol" 1>&6 +echo "$ECHO_T""$grub_cv_check_start_symbol" 1>&6 -echo $ac_n "checking if _start is defined by the compiler... $ac_c" 1>&6 -echo "configure:1841: checking if _start is defined by the compiler" 1>&5 +echo $ECHO_N "checking if _start is defined by the compiler... $ECHO_C" 1>&6 +echo "configure:1836: checking if _start is defined by the compiler" 1>&5 if test "${grub_cv_check_uscore_start_symbol+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat >conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1852: \"$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 @@ -1873,20 +1868,20 @@ EOF fi -echo "$ac_t""$grub_cv_check_uscore_start_symbol" 1>&6 +echo "$ECHO_T""$grub_cv_check_uscore_start_symbol" 1>&6 if test "x$grub_cv_check_start_symbol" != "xyes" \ -a "x$grub_cv_check_uscore_start_symbol" != "xyes"; then { echo "configure: error: Neither start nor _start is defined" 1>&2; exit 1; } fi -echo $ac_n "checking if __bss_start is defined by the compiler... $ac_c" 1>&6 -echo "configure:1885: checking if __bss_start is defined by the compiler" 1>&5 +echo $ECHO_N "checking if __bss_start is defined by the compiler... $ECHO_C" 1>&6 +echo "configure:1880: checking if __bss_start is defined by the compiler" 1>&5 if test "${grub_cv_check_uscore_uscore_bss_start_symbol+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat >conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1896: \"$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 @@ -1917,15 +1912,15 @@ EOF fi -echo "$ac_t""$grub_cv_check_uscore_uscore_bss_start_symbol" 1>&6 +echo "$ECHO_T""$grub_cv_check_uscore_uscore_bss_start_symbol" 1>&6 -echo $ac_n "checking if _edata is defined by the compiler... $ac_c" 1>&6 -echo "configure:1924: checking if _edata is defined by the compiler" 1>&5 +echo $ECHO_N "checking if _edata is defined by the compiler... $ECHO_C" 1>&6 +echo "configure:1919: checking if _edata is defined by the compiler" 1>&5 if test "${grub_cv_check_uscore_edata_symbol+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat >conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1935: \"$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 @@ -1956,15 +1951,15 @@ EOF fi -echo "$ac_t""$grub_cv_check_uscore_edata_symbol" 1>&6 +echo "$ECHO_T""$grub_cv_check_uscore_edata_symbol" 1>&6 -echo $ac_n "checking if edata is defined by the compiler... $ac_c" 1>&6 -echo "configure:1963: checking if edata is defined by the compiler" 1>&5 +echo $ECHO_N "checking if edata is defined by the compiler... $ECHO_C" 1>&6 +echo "configure:1958: checking if edata is defined by the compiler" 1>&5 if test "${grub_cv_check_edata_symbol+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat >conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1974: \"$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 @@ -1995,7 +1990,7 @@ EOF fi -echo "$ac_t""$grub_cv_check_edata_symbol" 1>&6 +echo "$ECHO_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" \ @@ -2003,13 +1998,13 @@ if test "x$grub_cv_check_uscore_uscore_bss_start_symbol" != "xyes" \ { echo "configure: error: None of __bss_start, _edata, edata defined" 1>&2; exit 1; } fi -echo $ac_n "checking if end is defined by the compiler... $ac_c" 1>&6 -echo "configure:2008: checking if end is defined by the compiler" 1>&5 +echo $ECHO_N "checking if end is defined by the compiler... $ECHO_C" 1>&6 +echo "configure:2003: checking if end is defined by the compiler" 1>&5 if test "${grub_cv_check_end_symbol+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat >conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2019: \"$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 @@ -2040,15 +2035,15 @@ EOF fi -echo "$ac_t""$grub_cv_check_end_symbol" 1>&6 +echo "$ECHO_T""$grub_cv_check_end_symbol" 1>&6 -echo $ac_n "checking if _end is defined by the compiler... $ac_c" 1>&6 -echo "configure:2047: checking if _end is defined by the compiler" 1>&5 +echo $ECHO_N "checking if _end is defined by the compiler... $ECHO_C" 1>&6 +echo "configure:2042: checking if _end is defined by the compiler" 1>&5 if test "${grub_cv_check_uscore_end_symbol+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat >conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2058: \"$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 @@ -2079,7 +2074,7 @@ EOF fi -echo "$ac_t""$grub_cv_check_uscore_end_symbol" 1>&6 +echo "$ECHO_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 @@ -2095,15 +2090,15 @@ fi # Get the filename or the whole disk and open it. # Known to work on NetBSD. -echo $ac_n "checking for opendisk in -lutil... $ac_c" 1>&6 -echo "configure:2100: checking for opendisk in -lutil" 1>&5 +echo $ECHO_N "checking for opendisk in -lutil... $ECHO_C" 1>&6 +echo "configure:2095: checking for opendisk in -lutil" 1>&5 if test "${ac_cv_lib_util_opendisk+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat >conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_util_opendisk=yes else @@ -2131,7 +2126,7 @@ rm -f conftest* LIBS="$ac_save_LIBS" fi -echo "$ac_t""$ac_cv_lib_util_opendisk" 1>&6 +echo "$ECHO_T""$ac_cv_lib_util_opendisk" 1>&6 if test $ac_cv_lib_util_opendisk = yes; then GRUB_LIBS="$GRUB_LIBS -lutil" cat >>confdefs.h <<\EOF @@ -2142,15 +2137,15 @@ fi # Unless the user specify --without-curses, check for curses. if test "x$with_curses" != "xno"; then - echo $ac_n "checking for wgetch in -lncurses... $ac_c" 1>&6 -echo "configure:2147: checking for wgetch in -lncurses" 1>&5 + echo $ECHO_N "checking for wgetch in -lncurses... $ECHO_C" 1>&6 +echo "configure:2142: checking for wgetch in -lncurses" 1>&5 if test "${ac_cv_lib_ncurses_wgetch+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat >conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_ncurses_wgetch=yes else @@ -2178,7 +2173,7 @@ rm -f conftest* LIBS="$ac_save_LIBS" fi -echo "$ac_t""$ac_cv_lib_ncurses_wgetch" 1>&6 +echo "$ECHO_T""$ac_cv_lib_ncurses_wgetch" 1>&6 if test $ac_cv_lib_ncurses_wgetch = yes; then GRUB_LIBS="$GRUB_LIBS -lncurses" cat >>confdefs.h <<\EOF @@ -2186,15 +2181,15 @@ if test $ac_cv_lib_ncurses_wgetch = yes; then EOF else - echo $ac_n "checking for wgetch in -lcurses... $ac_c" 1>&6 -echo "configure:2191: checking for wgetch in -lcurses" 1>&5 + echo $ECHO_N "checking for wgetch in -lcurses... $ECHO_C" 1>&6 +echo "configure:2186: checking for wgetch in -lcurses" 1>&5 if test "${ac_cv_lib_curses_wgetch+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat >conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_curses_wgetch=yes else @@ -2222,7 +2217,7 @@ rm -f conftest* LIBS="$ac_save_LIBS" fi -echo "$ac_t""$ac_cv_lib_curses_wgetch" 1>&6 +echo "$ECHO_T""$ac_cv_lib_curses_wgetch" 1>&6 if test $ac_cv_lib_curses_wgetch = yes; then GRUB_LIBS="$GRUB_LIBS -lcurses" cat >>confdefs.h <<\EOF @@ -2236,15 +2231,15 @@ fi fi # Check for headers. -echo $ac_n "checking how to run the C preprocessor... $ac_c" 1>&6 -echo "configure:2241: checking how to run the C preprocessor" 1>&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" 1>&6 +echo "configure:2236: checking how to run the C preprocessor" 1>&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 $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else # This must be in double quotes, not single quotes, because CPP may get # substituted into the Makefile and "${CC-cc}" will confuse make. @@ -2252,13 +2247,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat >conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2257: \"$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 : @@ -2269,13 +2264,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat >conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2274: \"$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 : @@ -2286,13 +2281,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat >conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2291: \"$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 : @@ -2314,24 +2309,24 @@ fi else ac_cv_prog_CPP="$CPP" fi -echo "$ac_t""$CPP" 1>&6 +echo "$ECHO_T""$CPP" 1>&6 for ac_header in string.h strings.h ncurses/curses.h ncurses.h curses.h do ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo $ac_n "checking for $ac_header... $ac_c" 1>&6 -echo "configure:2324: checking for $ac_header" 1>&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6 +echo "configure:2319: checking for $ac_header" 1>&5 if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat >conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2330: \"$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* @@ -2345,7 +2340,7 @@ else fi rm -f conftest* fi -echo "$ac_t""`eval echo '${'$ac_ac_Header'}'`" 1>&6 +echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6 if test `eval echo '${'$ac_ac_Header'}'` = yes; then cat >>confdefs.h <\$ac_cs_root.subs <<\\CEOF +s%@ECHO_C@%$ECHO_C%;t t +s%@ECHO_N@%$ECHO_N%;t t +s%@ECHO_T@%$ECHO_T%;t t s%@SHELL@%$SHELL%;t t s%@CFLAGS@%$CFLAGS%;t t s%@CPPFLAGS@%$CPPFLAGS%;t t @@ -3129,15 +3098,17 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then case "$ac_given_srcdir" in .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + else top_srcdir=`echo $ac_dots | sed 's%/$%%'`; fi ;; + [/\\]* | ?:[/\\]* ) + srcdir="$ac_given_srcdir$ac_dir_suffix"; + top_srcdir=$ac_given_srcdir ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; esac case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; + [/\\$]* | ?:[/\\]* ) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac @@ -3338,10 +3309,6 @@ EOF cat >>$CONFIG_STATUS <<\EOF -# -# CONFIG_COMMANDS section. -# - exit 0 EOF chmod +x $CONFIG_STATUS @@ -3349,3 +3316,4 @@ rm -fr confdefs* $ac_clean_files trap 'exit 1' 1 2 15 test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1 + diff --git a/debian/changelog b/debian/changelog index f9e513ff3..39a70b6a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ grub (0.5.94) unstable; urgency=low - -- + * Fix /usr/doc symlink. (closes:bug#50932) + * Better testing for BIOS LBA support. (closes:bug#53507) + * New installation script. (closes:bug#48755) + + -- Gordon Matzigkeit Fri, 10 Mar 2000 14:55:02 -0600 grub (0.5.93.1) unstable; urgency=low diff --git a/debian/postinst b/debian/postinst index 4e37a1955..5e2c9668e 100644 --- a/debian/postinst +++ b/debian/postinst @@ -4,10 +4,10 @@ set -e # Provide a backward-compatibility symlink to the doc directory. package=grub case "$1" in -install | upgrade) +configure) if [ -d /usr/doc ]; then if [ ! -e /usr/doc/$package -a -d /usr/share/doc/$package ]; then - ln -s /usr/share/doc/$package /usr/doc/$package + ln -sf ../share/doc/$package /usr/doc/$package fi fi ;; diff --git a/debian/rules b/debian/rules index 9ede5957a..c4d654714 100644 --- a/debian/rules +++ b/debian/rules @@ -49,7 +49,7 @@ binary-arch: checkroot build dir=`cd debian/tmp && pwd` && make install DESTDIR=$$dir gzip -f9 debian/tmp/usr/share/info/* debian/tmp/usr/share/man/*/* - strip -s debian/tmp/usr/sbin/grub + strip -s debian/tmp/usr/sbin/grub debian/tmp/usr/bin/mbchk $(INSTALL_DATA) TODO BUGS NEWS docs/menu.lst \ debian/tmp/usr/share/doc/grub/ diff --git a/grub/asmstub.c b/grub/asmstub.c index f43453906..1a3383b43 100644 --- a/grub/asmstub.c +++ b/grub/asmstub.c @@ -44,6 +44,7 @@ int grub_stage2 (void); # include /* ioctl */ # include /* HDIO_GETGEO */ # include /* FLOPPY_MAJOR */ +# include /* MAJOR */ # if (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1)) /* Maybe libc doesn't have large file support. */ # include /* _llseek */ diff --git a/netboot/Makefile.am b/netboot/Makefile.am index 9023b4c08..b7b4d4ec8 100644 --- a/netboot/Makefile.am +++ b/netboot/Makefile.am @@ -15,7 +15,7 @@ libdrivers_a_SOURCES = byteorder.h config.c etherboot.h \ main.c misc.c netboot_config.h netdevice.h nic.h osdep.h \ pci.c pci.h EXTRA_libdrivers_a_SOURCES = 3c509.c 3c509.h 3c90x.c cs89x0.c \ - 3c89x0.h eepro100.c epic100.c epic100.h i82586.c lance.c \ + cs89x0.h eepro100.c epic100.c epic100.h i82586.c lance.c \ ns8390.c ns8390.h ntulip.c rtl8139.c sk_g16.c sk_g16.h \ smc9000.c smc9000.h tiara.c tulip.c tulip.h via-rhine.c libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ diff --git a/netboot/Makefile.in b/netboot/Makefile.in index 0cf07fd79..e50fad87a 100644 --- a/netboot/Makefile.in +++ b/netboot/Makefile.in @@ -97,7 +97,7 @@ libdrivers_a_SOURCES = byteorder.h config.c etherboot.h \ pci.c pci.h EXTRA_libdrivers_a_SOURCES = 3c509.c 3c509.h 3c90x.c cs89x0.c \ - 3c89x0.h eepro100.c epic100.c epic100.h i82586.c lance.c \ + cs89x0.h eepro100.c epic100.c epic100.h i82586.c lance.c \ ns8390.c ns8390.h ntulip.c rtl8139.c sk_g16.c sk_g16.h \ smc9000.c smc9000.h tiara.c tulip.c tulip.h via-rhine.c diff --git a/netboot/fsys_tftp.c b/netboot/fsys_tftp.c index 3a7bb57e9..6bc627f4c 100644 --- a/netboot/fsys_tftp.c +++ b/netboot/fsys_tftp.c @@ -430,6 +430,9 @@ tftp_dir (char *dirname) } while (! buf_eof); + /* Maybe a few amounts of data remains. */ + filemax += buf_read; + /* Retry the open instruction. */ goto reopen; } diff --git a/stage2/builtins.c b/stage2/builtins.c index a490266d3..19a3ba37c 100644 --- a/stage2/builtins.c +++ b/stage2/builtins.c @@ -561,7 +561,7 @@ color_func (char *arg, int flags) highlight = skip_to (0, arg); new_normal_color = color_number (normal); - if (new_normal_color < 0 && safe_parse_maxint (&normal, &new_normal_color)) + if (new_normal_color < 0 && ! safe_parse_maxint (&normal, &new_normal_color)) return 1; /* The second argument is optional, so set highlight_color @@ -573,7 +573,7 @@ color_func (char *arg, int flags) { new_highlight_color = color_number (highlight); if (new_highlight_color < 0 - && safe_parse_maxint (&highlight, &new_highlight_color)) + && ! safe_parse_maxint (&highlight, &new_highlight_color)) return 1; }