2005-08-08 Yoshinori K. Okuji <okuji@enbug.org>
* Makefile.in (LIBLZO): New variable. * configure.ac: Check for LZO version 2. * util/i386/pc/grub-mkimage.c [HAVE_LZO_LZO1X_H]: Include lzo/lzo1x.h instead of lzo1x.h. * conf/i386-pc.rmk (grub_mkimage_LDFLAGS): Use $(LIBLZO) instead of -llzo. * util/i386/pc/grub-setup.c (main): Do not free PREFIX twice. Reported by Vladimir Serbinenko <phcoder@gmail.com>. * partmap/pc.c (pc_partition_map_probe): Restore P->DATA after copying the data from PARTITION to P.
This commit is contained in:
parent
f4917dfdd6
commit
4ac9bd0438
12 changed files with 352 additions and 18 deletions
|
@ -35,7 +35,11 @@
|
|||
#define _GNU_SOURCE 1
|
||||
#include <getopt.h>
|
||||
|
||||
#include <lzo1x.h>
|
||||
#if defined(HAVE_LZO_LZO1X_H)
|
||||
# include <lzo/lzo1x.h>
|
||||
#elif defined(HAVE_LZO1X_H)
|
||||
# include <lzo1x.h>
|
||||
#endif
|
||||
|
||||
static void
|
||||
compress_kernel (char *kernel_img, size_t kernel_size,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue