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

2005-08-08 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* 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:
okuji 2005-08-08 23:15:21 +00:00
parent f4917dfdd6
commit 4ac9bd0438
12 changed files with 352 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
configure.ac
View file

@ -132,10 +132,19 @@ AC_CHECK_SIZEOF(long)
# Check LZO when compiling for the i386.
if test "x$host_cpu" = xi386; then
AC_CHECK_LIB(lzo, __lzo_init2, ,
AC_MSG_ERROR([LZO library version 1.02 or later is required]))
# There are three possibilities. LZO version 2 installed with the name
# liblzo2, with the name liblzo, and LZO version 1.
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)
fi
# Check for curses.