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

* configure.ac: Check for lzma.h for enabling liblzma and allow

Browse source 
manual disabling.
This commit is contained in:
Vladimir Serbinenko 2013-11-11 22:47:48 +01:00
parent 631187be8c
commit 0d2d30bb39
3 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/mkimage.c
View file

@ -48,7 +48,7 @@
#define ALIGN_ADDR(x) (ALIGN_UP((x), image_target->voidp_sizeof))
#ifdef HAVE_LIBLZMA
#ifdef USE_LIBLZMA
#include <lzma.h>
#endif
@ -709,7 +709,7 @@ compress_kernel_lzma (char *kernel_img, size_t kernel_size,
grub_util_error ("%s", _("cannot compress the kernel image"));
}
#ifdef HAVE_LIBLZMA
#ifdef USE_LIBLZMA
static void
compress_kernel_xz (char *kernel_img, size_t kernel_size,
char **core_img, size_t *core_size)
@ -772,7 +772,7 @@ compress_kernel (const struct grub_install_image_target_desc *image_target, char
return;
}
#ifdef HAVE_LIBLZMA
#ifdef USE_LIBLZMA
if (image_target->flags & PLATFORM_FLAGS_DECOMPRESSORS
&& (comp == GRUB_COMPRESSION_XZ))
{