mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-20 22:48:22 +00:00
fix many bugs. see ChangeLog.
This commit is contained in:
okuji committed
1 parent
fa8457769b
commit
eb321e77f7
20 files changed
+594
-407
No files matched your search
@@ -897,7 +897,7 @@ fi
|
||||
|
||||
PACKAGE=grub
|
||||
|
||||
VERSION=0.5.94
|
||||
VERSION=0.5.95
|
||||
|
||||
if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
|
||||
test -f $srcdir/config.status; then
|
||||
@@ -930,31 +930,8 @@ if test -z "$install_sh"; then
|
||||
install_sh="`echo $install_sh | sed -e 's/\${SHELL}//'`"
|
||||
fi
|
||||
|
||||
ac_aux_dir=
|
||||
for ac_dir in . $srcdir/.; do
|
||||
if test -f $ac_dir/install-sh; then
|
||||
ac_aux_dir=$ac_dir
|
||||
ac_install_sh="$ac_aux_dir/install-sh -c"
|
||||
break
|
||||
elif test -f $ac_dir/install.sh; then
|
||||
ac_aux_dir=$ac_dir
|
||||
ac_install_sh="$ac_aux_dir/install.sh -c"
|
||||
break
|
||||
elif test -f $ac_dir/shtool; then
|
||||
ac_aux_dir=$ac_dir
|
||||
ac_install_sh="$ac_aux_dir/shtool install -c"
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$ac_aux_dir"; then
|
||||
{ echo "configure: error: cannot find install-sh or install.sh in . $srcdir/." 1>&2; exit 1; }
|
||||
fi
|
||||
ac_config_guess="$SHELL $ac_aux_dir/config.guess"
|
||||
ac_config_sub="$SHELL $ac_aux_dir/config.sub"
|
||||
ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
||||
|
||||
echo $ECHO_N "checking host system type... $ECHO_C" 1>&6
|
||||
echo "configure:958: checking host system type" 1>&5
|
||||
echo "configure:935: 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.
|
||||
@@ -999,7 +976,7 @@ esac
|
||||
#
|
||||
|
||||
echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" 1>&6
|
||||
echo "configure:1003: checking whether to enable maintainer-specific portions of Makefiles" 1>&5
|
||||
echo "configure:980: 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"
|
||||
@@ -1022,7 +999,7 @@ if test "x$enable_maintainer_mode" = xyes; then
|
||||
# Extract the first word of "perl", so it can be a program name with args.
|
||||
set dummy perl; ac_word=$2
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
|
||||
echo "configure:1026: checking for $ac_word" 1>&5
|
||||
echo "configure:1003: checking for $ac_word" 1>&5
|
||||
if test "${ac_cv_path_PERL+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1066,7 +1043,7 @@ fi
|
||||
#
|
||||
|
||||
echo $ECHO_N "checking build system type... $ECHO_C" 1>&6
|
||||
echo "configure:1070: checking build system type" 1>&5
|
||||
echo "configure:1047: 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.
|
||||
@@ -1109,7 +1086,7 @@ fi
|
||||
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
|
||||
echo "configure:1113: checking for $ac_word" 1>&5
|
||||
echo "configure:1090: checking for $ac_word" 1>&5
|
||||
if test "${ac_cv_prog_CC+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1147,7 +1124,7 @@ esac
|
||||
# Extract the first word of "gcc", so it can be a program name with args.
|
||||
set dummy gcc; ac_word=$2
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
|
||||
echo "configure:1151: checking for $ac_word" 1>&5
|
||||
echo "configure:1128: checking for $ac_word" 1>&5
|
||||
if test "${ac_cv_prog_CC+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1180,7 +1157,7 @@ fi
|
||||
# Extract the first word of "cc", so it can be a program name with args.
|
||||
set dummy cc; ac_word=$2
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
|
||||
echo "configure:1184: checking for $ac_word" 1>&5
|
||||
echo "configure:1161: checking for $ac_word" 1>&5
|
||||
if test "${ac_cv_prog_CC+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1234,7 +1211,7 @@ do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
|
||||
echo "configure:1238: checking for $ac_word" 1>&5
|
||||
echo "configure:1215: checking for $ac_word" 1>&5
|
||||
if test "${ac_cv_prog_CC+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1272,7 +1249,7 @@ done
|
||||
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
|
||||
|
||||
echo $ECHO_N "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works... $ECHO_C" 1>&6
|
||||
echo "configure:1276: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" 1>&5
|
||||
echo "configure:1253: 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.
|
||||
@@ -1283,12 +1260,12 @@ cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
|
||||
#line 1287 "configure"
|
||||
#line 1264 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1269: \"$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
|
||||
@@ -1314,12 +1291,12 @@ if test $ac_cv_prog_cc_works = no; then
|
||||
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 77; }
|
||||
fi
|
||||
echo $ECHO_N "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler... $ECHO_C" 1>&6
|
||||
echo "configure:1318: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" 1>&5
|
||||
echo "configure:1295: 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 $ECHO_N "checking whether we are using GNU C... $ECHO_C" 1>&6
|
||||
echo "configure:1323: checking whether we are using GNU C" 1>&5
|
||||
echo "configure:1300: checking whether we are using GNU C" 1>&5
|
||||
if test "${ac_cv_prog_gcc+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1328,7 +1305,7 @@ else
|
||||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1309: \"$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
|
||||
@@ -1346,7 +1323,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" 1>&6
|
||||
echo "configure:1350: checking whether ${CC-cc} accepts -g" 1>&5
|
||||
echo "configure:1327: checking whether ${CC-cc} accepts -g" 1>&5
|
||||
if test "${ac_cv_prog_cc_g+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1377,7 +1354,7 @@ else
|
||||
fi
|
||||
|
||||
echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" 1>&6
|
||||
echo "configure:1381: checking how to run the C preprocessor" 1>&5
|
||||
echo "configure:1358: 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=
|
||||
@@ -1393,13 +1370,13 @@ else
|
||||
# not just through cpp.
|
||||
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 1397 "configure"
|
||||
#line 1374 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1380: \"$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
|
||||
:
|
||||
@@ -1411,13 +1388,13 @@ else
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 1415 "configure"
|
||||
#line 1392 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1398: \"$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
|
||||
:
|
||||
@@ -1429,13 +1406,13 @@ else
|
||||
CPP="${CC-cc} -nologo -E"
|
||||
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 1433 "configure"
|
||||
#line 1410 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1416: \"$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
|
||||
:
|
||||
@@ -1462,7 +1439,7 @@ echo "$ECHO_T""$CPP" 1>&6
|
||||
depcc="$CC"
|
||||
depcpp="$CPP"
|
||||
echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" 1>&6
|
||||
echo "configure:1466: checking dependency style of $depcc" 1>&5
|
||||
echo "configure:1443: checking dependency style of $depcc" 1>&5
|
||||
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1516,7 +1493,7 @@ 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 $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
|
||||
echo "configure:1520: checking for $ac_word" 1>&5
|
||||
echo "configure:1497: checking for $ac_word" 1>&5
|
||||
if test "${ac_cv_path_RANLIB+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1551,7 +1528,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
|
||||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
|
||||
echo "configure:1555: checking for $ac_word" 1>&5
|
||||
echo "configure:1532: checking for $ac_word" 1>&5
|
||||
if test "${ac_cv_path_RANLIB+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1590,7 +1567,7 @@ else
|
||||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
|
||||
echo "configure:1594: checking for $ac_word" 1>&5
|
||||
echo "configure:1571: checking for $ac_word" 1>&5
|
||||
if test "${ac_cv_prog_RANLIB+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1633,7 +1610,7 @@ if test "x$ac_cv_prog_gcc" = xyes; then
|
||||
STAGE1_CFLAGS="-O2"
|
||||
GRUB_CFLAGS="-O2"
|
||||
echo $ECHO_N "checking whether optimization for size works... $ECHO_C" 1>&6
|
||||
echo "configure:1637: checking whether optimization for size works" 1>&5
|
||||
echo "configure:1614: checking whether optimization for size works" 1>&5
|
||||
if test "${size_flag+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1641,7 +1618,7 @@ else
|
||||
saved_CFLAGS=$CFLAGS
|
||||
CFLAGS="-Os -g"
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 1645 "configure"
|
||||
#line 1622 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int
|
||||
@@ -1652,7 +1629,7 @@ main ()
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:1656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
size_flag=yes
|
||||
else
|
||||
@@ -1682,7 +1659,7 @@ 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 $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
|
||||
echo "configure:1686: checking for $ac_word" 1>&5
|
||||
echo "configure:1663: checking for $ac_word" 1>&5
|
||||
if test "${ac_cv_path_OBJCOPY+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1717,7 +1694,7 @@ else
|
||||
# Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}objcopy; ac_word=$2
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
|
||||
echo "configure:1721: checking for $ac_word" 1>&5
|
||||
echo "configure:1698: checking for $ac_word" 1>&5
|
||||
if test "${ac_cv_prog_OBJCOPY+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1752,7 +1729,7 @@ fi
|
||||
# Defined in acinclude.m4.
|
||||
|
||||
echo $ECHO_N "checking if C symbols get an underscore after compilation... $ECHO_C" 1>&6
|
||||
echo "configure:1756: checking if C symbols get an underscore after compilation" 1>&5
|
||||
echo "configure:1733: checking if C symbols get an underscore after compilation" 1>&5
|
||||
if test "${grub_cv_asm_uscore+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1765,7 +1742,7 @@ func (int *list)
|
||||
}
|
||||
EOF
|
||||
|
||||
if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1769: \"$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:1746: \"$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; }
|
||||
@@ -1790,7 +1767,7 @@ fi
|
||||
echo "$ECHO_T""$grub_cv_asm_uscore" 1>&6
|
||||
|
||||
echo $ECHO_N "checking whether ${OBJCOPY} works for absolute addresses... $ECHO_C" 1>&6
|
||||
echo "configure:1794: checking whether ${OBJCOPY} works for absolute addresses" 1>&5
|
||||
echo "configure:1771: checking whether ${OBJCOPY} works for absolute addresses" 1>&5
|
||||
if test "${grub_cv_prog_objcopy_absolute+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1802,21 +1779,21 @@ cmain (void)
|
||||
}
|
||||
EOF
|
||||
|
||||
if { (eval echo configure:1806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then :
|
||||
if { (eval echo configure:1783: \"$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:1812: \"$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:1789: \"$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:1816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
|
||||
if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1793: \"$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:1820: \"$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:1797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
|
||||
mv -f conftest conftest.old
|
||||
else
|
||||
grub_cv_prog_objcopy_absolute=no
|
||||
@@ -1832,7 +1809,7 @@ if test "x$grub_cv_prog_objcopy_absolute" != xyes; then
|
||||
fi
|
||||
|
||||
echo $ECHO_N "checking whether addr32 must be in the same line as the instruction... $ECHO_C" 1>&6
|
||||
echo "configure:1836: checking whether addr32 must be in the same line as the instruction" 1>&5
|
||||
echo "configure:1813: checking whether addr32 must be in the same line as the instruction" 1>&5
|
||||
if test "${grub_cv_asm_prefix_requirement+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1841,7 +1818,7 @@ else
|
||||
l1: addr32 movb %al, l1
|
||||
EOF
|
||||
|
||||
if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1845: \"$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:1822: \"$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
|
||||
@@ -1869,7 +1846,7 @@ EOF
|
||||
echo "$ECHO_T""$grub_cv_asm_prefix_requirement" 1>&6
|
||||
|
||||
echo $ECHO_N "checking for .code16 addr32 assembler support... $ECHO_C" 1>&6
|
||||
echo "configure:1873: checking for .code16 addr32 assembler support" 1>&5
|
||||
echo "configure:1850: checking for .code16 addr32 assembler support" 1>&5
|
||||
if test "${grub_cv_asm_addr32+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
@@ -1884,7 +1861,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:1888: \"$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:1865: \"$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
|
||||
@@ -1899,12 +1876,12 @@ if test "x$grub_cv_asm_addr32" != xyes; then
|
||||
fi
|
||||
|
||||
echo $ECHO_N "checking if start is defined by the compiler... $ECHO_C" 1>&6
|
||||
echo "configure:1903: checking if start is defined by the compiler" 1>&5
|
||||
echo "configure:1880: checking if start is defined by the compiler" 1>&5
|
||||
if test "${grub_cv_check_start_symbol+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 1908 "configure"
|
||||
#line 1885 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int
|
||||
@@ -1915,7 +1892,7 @@ asm ("incl start")
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:1919: \"$ac_link\") 1>&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_start_symbol=yes
|
||||
else
|
||||
@@ -1938,12 +1915,12 @@ fi
|
||||
echo "$ECHO_T""$grub_cv_check_start_symbol" 1>&6
|
||||
|
||||
echo $ECHO_N "checking if _start is defined by the compiler... $ECHO_C" 1>&6
|
||||
echo "configure:1942: checking if _start is defined by the compiler" 1>&5
|
||||
echo "configure:1919: checking if _start is defined by the compiler" 1>&5
|
||||
if test "${grub_cv_check_uscore_start_symbol+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 1947 "configure"
|
||||
#line 1924 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int
|
||||
@@ -1954,7 +1931,7 @@ asm ("incl _start")
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:1958: \"$ac_link\") 1>&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_start_symbol=yes
|
||||
else
|
||||
@@ -1982,12 +1959,12 @@ if test "x$grub_cv_check_start_symbol" != "xyes" \
|
||||
fi
|
||||
|
||||
echo $ECHO_N "checking if __bss_start is defined by the compiler... $ECHO_C" 1>&6
|
||||
echo "configure:1986: checking if __bss_start is defined by the compiler" 1>&5
|
||||
echo "configure:1963: checking if __bss_start is defined by the compiler" 1>&5
|
||||
if test "${grub_cv_check_uscore_uscore_bss_start_symbol+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 1991 "configure"
|
||||
#line 1968 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int
|
||||
@@ -1998,7 +1975,7 @@ asm ("incl __bss_start")
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1979: \"$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
|
||||
@@ -2021,12 +1998,12 @@ fi
|
||||
echo "$ECHO_T""$grub_cv_check_uscore_uscore_bss_start_symbol" 1>&6
|
||||
|
||||
echo $ECHO_N "checking if _edata is defined by the compiler... $ECHO_C" 1>&6
|
||||
echo "configure:2025: checking if _edata is defined by the compiler" 1>&5
|
||||
echo "configure:2002: checking if _edata is defined by the compiler" 1>&5
|
||||
if test "${grub_cv_check_uscore_edata_symbol+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 2030 "configure"
|
||||
#line 2007 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int
|
||||
@@ -2037,7 +2014,7 @@ asm ("incl _edata")
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2018: \"$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
|
||||
@@ -2060,12 +2037,12 @@ fi
|
||||
echo "$ECHO_T""$grub_cv_check_uscore_edata_symbol" 1>&6
|
||||
|
||||
echo $ECHO_N "checking if edata is defined by the compiler... $ECHO_C" 1>&6
|
||||
echo "configure:2064: checking if edata is defined by the compiler" 1>&5
|
||||
echo "configure:2041: checking if edata is defined by the compiler" 1>&5
|
||||
if test "${grub_cv_check_edata_symbol+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 2069 "configure"
|
||||
#line 2046 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int
|
||||
@@ -2076,7 +2053,7 @@ asm ("incl edata")
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2057: \"$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
|
||||
@@ -2105,12 +2082,12 @@ if test "x$grub_cv_check_uscore_uscore_bss_start_symbol" != "xyes" \
|
||||
fi
|
||||
|
||||
echo $ECHO_N "checking if end is defined by the compiler... $ECHO_C" 1>&6
|
||||
echo "configure:2109: checking if end is defined by the compiler" 1>&5
|
||||
echo "configure:2086: checking if end is defined by the compiler" 1>&5
|
||||
if test "${grub_cv_check_end_symbol+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 2114 "configure"
|
||||
#line 2091 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int
|
||||
@@ -2121,7 +2098,7 @@ asm ("incl end")
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2102: \"$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
|
||||
@@ -2144,12 +2121,12 @@ fi
|
||||
echo "$ECHO_T""$grub_cv_check_end_symbol" 1>&6
|
||||
|
||||
echo $ECHO_N "checking if _end is defined by the compiler... $ECHO_C" 1>&6
|
||||
echo "configure:2148: checking if _end is defined by the compiler" 1>&5
|
||||
echo "configure:2125: checking if _end is defined by the compiler" 1>&5
|
||||
if test "${grub_cv_check_uscore_end_symbol+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 2153 "configure"
|
||||
#line 2130 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int
|
||||
@@ -2160,7 +2137,7 @@ asm ("incl _end")
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2141: \"$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
|
||||
@@ -2197,14 +2174,14 @@ fi
|
||||
# Get the filename or the whole disk and open it.
|
||||
# Known to work on NetBSD.
|
||||
echo $ECHO_N "checking for opendisk in -lutil... $ECHO_C" 1>&6
|
||||
echo "configure:2201: checking for opendisk in -lutil" 1>&5
|
||||
echo "configure:2178: checking for opendisk in -lutil" 1>&5
|
||||
if test "${ac_cv_lib_util_opendisk+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lutil $LIBS"
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 2208 "configure"
|
||||
#line 2185 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@@ -2219,7 +2196,7 @@ opendisk()
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2200: \"$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
|
||||
@@ -2244,14 +2221,14 @@ fi
|
||||
# Unless the user specify --without-curses, check for curses.
|
||||
if test "x$with_curses" != "xno"; then
|
||||
echo $ECHO_N "checking for wgetch in -lncurses... $ECHO_C" 1>&6
|
||||
echo "configure:2248: checking for wgetch in -lncurses" 1>&5
|
||||
echo "configure:2225: checking for wgetch in -lncurses" 1>&5
|
||||
if test "${ac_cv_lib_ncurses_wgetch+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lncurses $LIBS"
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 2255 "configure"
|
||||
#line 2232 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@@ -2266,7 +2243,7 @@ wgetch()
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2247: \"$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
|
||||
@@ -2288,14 +2265,14 @@ EOF
|
||||
|
||||
else
|
||||
echo $ECHO_N "checking for wgetch in -lcurses... $ECHO_C" 1>&6
|
||||
echo "configure:2292: checking for wgetch in -lcurses" 1>&5
|
||||
echo "configure:2269: checking for wgetch in -lcurses" 1>&5
|
||||
if test "${ac_cv_lib_curses_wgetch+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lcurses $LIBS"
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 2299 "configure"
|
||||
#line 2276 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@@ -2310,7 +2287,7 @@ wgetch()
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2291: \"$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
|
||||
@@ -2341,19 +2318,19 @@ 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 $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
|
||||
echo "configure:2345: checking for $ac_header" 1>&5
|
||||
echo "configure:2322: checking for $ac_header" 1>&5
|
||||
if eval "test \"\${$ac_ac_Header+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" 1>&6
|
||||
else
|
||||
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 2351 "configure"
|
||||
#line 2328 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_header>
|
||||
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2334: \"$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*
|
||||
|
||||
Reference in new issue
Block a user