vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-07-19 Pavel Roskin <proski@gnu.org>

Browse source 
* Makefile.in: Remove LIBLZO and enable_lzo.
	* conf/i386-pc.rmk: Remove lzo support.
	* configure.ac: Remove checks for lzo, don't define ENABLE_LZMA.
	* include/grub/i386/pc/kernel.h: Define ENABLE_LZMA.  Remove lzo
	support.
	* kern/i386/pc/lzo1x.S: Remove.
	* kern/i386/pc/startup.S: Remove lzo support.
	* util/i386/pc/grub-mkimage.c: Likewise.
This commit is contained in:
proski 2009-07-19 20:23:33 +00:00
parent ac70fa32dd
commit 5680109e00
11 changed files with 21 additions and 431 deletions
Download patch file Download diff file Expand all files Collapse all files

33
configure.ac
View file

@ -171,32 +171,6 @@ if test x$grub_cv_apple_cc = xyes ; then
ASFLAGS="$ASFLAGS -DAPPLE_CC=1"
fi
# Check LZO when compiling for the i386-pc.
if test "$target_cpu"-"$platform" = i386-pc; then
AC_ARG_ENABLE([lzo],
[AS_HELP_STRING([--enable-lzo],
[use lzo to compress kernel (default is lzma)])])
[if [ x"$enable_lzo" = xyes ]; then
# There are three possibilities. LZO version 2 installed with the name
# liblzo2, with the name liblzo, and LZO version 1.]
AC_DEFINE([ENABLE_LZO], [1], [Use lzo compression])
AC_CHECK_LIB([lzo2], [__lzo_init_v2], [LIBLZO="-llzo2"],
[AC_CHECK_LIB([lzo], [__lzo_init_v2], [LIBLZO="-llzo"],
[AC_CHECK_LIB([lzo], [__lzo_init2], [LIBLZO="-llzo"],
[AC_MSG_ERROR([LZO library version 1.02 or later is required])])])])
AC_SUBST([LIBLZO])
[LIBS="$LIBS $LIBLZO"]
AC_CHECK_FUNC([lzo1x_999_compress], ,
[AC_MSG_ERROR([LZO1X-999 must be enabled])])
[# LZO version 2 uses lzo/lzo1x.h, while LZO version 1 uses lzo1x.h.]
AC_CHECK_HEADERS([lzo/lzo1x.h lzo1x.h])
[else]
AC_DEFINE([ENABLE_LZMA], [1], [Use lzma compression])
[fi]
AC_SUBST([enable_lzo])
fi
# Check for functions.
AC_CHECK_FUNCS(posix_memalign memalign asprintf)
@ -607,13 +581,6 @@ AC_OUTPUT
echo "*******************************************************"
echo GRUB2 will be compiled with following components:
echo Platform: "$target_cpu"-"$platform"
if test "$target_cpu"-"$platform" = i386-pc; then
if [ x"$enable_lzo" = xyes ]; then
echo Compression: LZO
else
echo Compression: LZMA
fi
fi
if [ x"$grub_emu_excuse" = x ]; then
echo grub-emu: Yes
else