From f025d429b959018a4dab0917354e8cdc1777f019 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Dec 13 2009 22:32:00 +0000 Subject: 2009-12-13 Vladimir Serbinenko * configure.ac: Remove non-multiboot stuff. --- diff --git a/ChangeLog b/ChangeLog index 58c029e..6a01f9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-12-13 Vladimir Serbinenko + * configure.ac: Remove non-multiboot stuff. + +2009-12-13 Vladimir Serbinenko + * NEWS: Emptied. It contained no multiboot information. * README: Likewise. diff --git a/configure.ac b/configure.ac index 94dc377..ee72134 100644 --- a/configure.ac +++ b/configure.ac @@ -34,274 +34,6 @@ dnl Because recent automake complains about AS, set it here. CCAS="$CC" AC_SUBST(CCAS) -AC_ARG_WITH(binutils, - [ --with-binutils=DIR search the directory DIR to find binutils]) - -if test "x$with_binutils" != x; then -dnl AC_PATH_TOOL is not seen in autoconf 2.13, so use AC_PATH_PROG -dnl instead for now. It is preferable when you cross-compile GRUB. -dnl AC_PATH_TOOL(RANLIB, ranlib, :, "$with_binutils:$PATH") - AC_PATH_PROG(RANLIB, ranlib, :, "$with_binutils:$PATH") -else - AC_PROG_RANLIB -fi - -# optimization flags -if test "x$ac_cv_prog_gcc" = xyes; then - if test "x$default_CFLAGS" = xyes; then - # Autoconf may set CFLAGS to -O2 and/or -g. So eliminate them. - CFLAGS="`echo $CFLAGS | sed -e 's/-g//g' -e 's/-O[[0-9]]//g'` -g" - # If the user specify the directory for binutils, add the option `-B'. - if test "x$with_binutils" != x; then - CFLAGS="-B$with_binutils/ $CFLAGS" - fi - STAGE1_CFLAGS="-O2" - GRUB_CFLAGS="-O2" - AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [ - saved_CFLAGS=$CFLAGS - CFLAGS="-Os -g" - AC_TRY_COMPILE(, , grub_cv_cc_Os=yes, grub_cv_cc_Os=no) - CFLAGS=$saved_CFLAGS - ]) - if test "x$grub_cv_cc_Os" = xyes; then - STAGE2_CFLAGS="-Os" - else - STAGE2_CFLAGS="-O2 -fno-strength-reduce -fno-unroll-loops" - fi - # OpenBSD has a GCC extension for protecting applications from - # stack smashing attacks, but GRUB doesn't want this feature. - AC_CACHE_CHECK([whether gcc has -fno-stack-protector], - grub_cv_cc_no_stack_protector, [ - saved_CFLAGS=$CFLAGS - CFLAGS="-fno-stack-protector" - AC_TRY_COMPILE(, - , - grub_cv_cc_no_stack_protector=yes, - grub_cv_cc_no_stack_protector=no) - CFLAGS=$saved_CFLAGS - ]) - if test "x$grub_cv_cc_no_stack_protector" = xyes; then - STAGE2_CFLAGS="$STAGE2_CFLAGS -fno-stack-protector" - fi - fi -fi - -AC_SUBST(STAGE1_CFLAGS) -AC_SUBST(STAGE2_CFLAGS) -AC_SUBST(GRUB_CFLAGS) - -# Enforce coding standards. -CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused -Wshadow" -CPPFLAGS="$CPPFLAGS -Wpointer-arith" - -AC_CACHE_CHECK([whether -Wundef works], grub_cv_cc_Wundef, [ - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-Wundef" - AC_TRY_COMPILE(, , grub_cv_cc_Wundef=yes, grub_cv_cc_Wundef=no) - CPPFLAGS="$saved_CPPFLAGS" -]) - -# The options `-falign-*' are supported by gcc 3.0 or later. -# Probably it is sufficient to only check for -falign-loops. -AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [ - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-falign-loops=1" - AC_TRY_COMPILE(, , [grub_cv_cc_falign_loop=yes], [grub_cv_cc_falign_loop=no]) - CPPFLAGS="$saved_CPPFLAGS" -]) - -# Force no alignment to save space. -if test "x$grub_cv_cc_falign_loop" = xyes; then - CPPFLAGS="$CPPFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1" -else - CPPFLAGS="$CPPFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1" -fi - -if test "x$grub_cv_cc_Wundef" = xyes; then - CPPFLAGS="$CPPFLAGS -Wundef" -fi - -# Check if build ID can be disabled in the linker -AC_MSG_CHECKING([whether linker accepts `--build-id=none']) -save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS -Wl,--build-id=none" -AC_TRY_LINK(, , build_id_flag=yes, build_id_flag=no) -AC_MSG_RESULT([$build_id_flag]) -LDFLAGS="$save_LDFLAGS" -if test "x$build_id_flag" = xyes; then - LDFLAGS="$LDFLAGS -Wl,--build-id=none" -fi - -if test "x$with_binutils" != x; then -dnl AC_PATH_TOOL(OBJCOPY, objcopy, , "$with_binutils:$PATH") - AC_PATH_PROG(OBJCOPY, objcopy, , "$with_binutils:$PATH") -else - AC_CHECK_TOOL(OBJCOPY, objcopy) -fi - -# Defined in acinclude.m4. -grub_ASM_USCORE -grub_PROG_OBJCOPY_ABSOLUTE -if test "x$grub_cv_prog_objcopy_absolute" != xyes; then - AC_MSG_ERROR([GRUB requires a working absolute objcopy; upgrade your binutils]) -fi - -grub_ASM_PREFIX_REQUIREMENT - -grub_ASM_ADDR32 -if test "x$grub_cv_asm_addr32" != xyes; then - AC_MSG_ERROR([GRUB requires GAS .code16 addr32 support; upgrade your binutils]) -fi - -grub_ASM_ABSOLUTE_WITHOUT_ASTERISK - -grub_CHECK_START_SYMBOL -grub_CHECK_USCORE_START_SYMBOL -if test "x$grub_cv_check_start_symbol" != "xyes" \ - -a "x$grub_cv_check_uscore_start_symbol" != "xyes"; then - AC_MSG_ERROR([Neither start nor _start is defined]) -fi - -grub_CHECK_USCORE_USCORE_BSS_START_SYMBOL -grub_CHECK_USCORE_EDATA_SYMBOL -grub_CHECK_EDATA_SYMBOL -if test "x$grub_cv_check_uscore_uscore_bss_start_symbol" != "xyes" \ - -a "x$grub_cv_check_uscore_edata_symbol" != "xyes" \ - -a "x$grub_cv_check_edata_symbol" != "xyes"; then - AC_MSG_ERROR([None of __bss_start, _edata, edata defined]) -fi - -grub_CHECK_END_SYMBOL -grub_CHECK_USCORE_END_SYMBOL -if test "x$grub_cv_check_end_symbol" != "xyes" \ - -a "x$grub_cv_check_uscore_end_symbol" != "xyes"; then - AC_MSG_ERROR([Neither end nor _end is defined]) -fi - -# Check for curses libraries. -AC_ARG_WITH(curses, - [ --without-curses do not use curses]) - -# Get the filename or the whole disk and open it. -# Known to work on NetBSD. -AC_CHECK_LIB(util, opendisk, [GRUB_LIBS="$GRUB_LIBS -lutil" - AC_DEFINE(HAVE_OPENDISK, 1, [Define if opendisk() in -lutil can be used])]) - -# Unless the user specify --without-curses, check for curses. -if test "x$with_curses" != "xno"; then - AC_CHECK_LIB(ncurses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lncurses" - AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])], - [AC_CHECK_LIB(curses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lcurses" - AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])])]) -fi - -AC_SUBST(GRUB_LIBS) - -# Check for headers. -AC_CHECK_HEADERS(string.h strings.h ncurses/curses.h ncurses.h curses.h) - -# Check for user options. - -# filesystems support. -AC_ARG_ENABLE(ext2fs, - [ --disable-ext2fs disable ext2fs support in Stage 2]) - -if test x"$enable_ext2fs" != xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_EXT2FS=1" -fi - -AC_ARG_ENABLE(fat, - [ --disable-fat disable FAT support in Stage 2]) - -if test x"$enable_fat" != xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_FAT=1" -fi - -AC_ARG_ENABLE(ffs, - [ --disable-ffs disable FFS support in Stage 2]) - -if test x"$enable_ffs" != xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_FFS=1" -fi - -AC_ARG_ENABLE(ufs2, - [ --disable-ufs2 disable UFS2 support in Stage 2]) - -if test x"$enable_ufs2" != xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_UFS2=1" -fi - -AC_ARG_ENABLE(minix, - [ --disable-minix disable Minix fs support in Stage 2]) - -if test x"$enable_minix" != xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_MINIX=1" -fi - -AC_ARG_ENABLE(reiserfs, - [ --disable-reiserfs disable ReiserFS support in Stage 2]) - -if test x"$enable_reiserfs" != xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_REISERFS=1" -fi - -AC_ARG_ENABLE(vstafs, - [ --disable-vstafs disable VSTa FS support in Stage 2]) - -if test x"$enable_vstafs" != xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_VSTAFS=1" -fi - -AC_ARG_ENABLE(jfs, - [ --disable-jfs disable IBM JFS support in Stage 2]) - -if test x"$enable_jfs" != xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_JFS=1" -fi - -AC_ARG_ENABLE(xfs, - [ --disable-xfs disable SGI XFS support in Stage 2]) - -if test x"$enable_xfs" != xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_XFS=1" -fi - -AC_ARG_ENABLE(iso9660, - [ --disable-iso9660 disable ISO9660 support in Stage 2]) - -if test x"$enable_iso9660" != xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_ISO9660=1" -fi - -dnl AC_ARG_ENABLE(tftp, -dnl [ --enable-tftp enable TFTP support in Stage 2]) -dnl -dnl #if test x"$enable_tftp" = xyes; then -dnl FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_TFTP=1" -dnl fi - -AC_ARG_ENABLE(gunzip, - [ --disable-gunzip disable decompression in Stage 2]) - -if test x"$enable_gunzip" = xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DNO_DECOMPRESSION=1" -fi - -AC_ARG_ENABLE(md5-password, - [ --disable-md5-password disable MD5 password support in Stage 2]) -if test "x$enable_md5_password" != xno; then - FSYS_CFLAGS="$FSYS_CFLAGS -DUSE_MD5_PASSWORDS=1" -fi - -dnl The netboot support. -dnl General options. -AC_ARG_ENABLE(packet-retransmission, - [ --disable-packet-retransmission - turn off packet retransmission]) -if test "x$enable_packet_retransmission" != xno; then - NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1" -fi - dnl Build the example Multiboot kernel. AC_ARG_ENABLE(example-kernel, [ --enable-example-kernel