Re: [Qemu-devel] [PATCH 09/10] block/dmg: support bzip2 block entry types

[Paolo Bonzini]

On 05/01/2015 20:32, John Snow wrote:
>>
>>   fi
>>
>>   ##########################################
>> +# bzip2 check
>> +
>> +if test "$bzip2" != "no" ; then
>> +    cat > $TMPC << EOF
>> +#include <bzlib.h>
>> +int main(void) { BZ2_bzlibVersion(); return 0; }
>> +EOF
>> +    if compile_prog "" "-lbz2" ; then
>> +        libs_softmmu="$libs_softmmu -lbz2"
>> +        bzip2="yes"
>> +    else
>> +        if test "$bzip2" = "yes"; then
>> +            feature_not_found "libbzip2" "Install libbzip2 devel"
>> +        fi
>> +        bzip2="no"
>> +    fi
>> +fi
>> +
>> +##########################################
>>   # libseccomp check
>>
>>   if test "$seccomp" != "no" ; then
>> @@ -4340,6 +4366,7 @@ echo "vhdx              $vhdx"
>>   echo "Quorum            $quorum"
>>   echo "lzo support       $lzo"
>>   echo "snappy support    $snappy"
>> +echo "bzip2 support     $bzip2"
>>   echo "NUMA host support $numa"
>>
>>   if test "$sdl_too_old" = "yes"; then
>> @@ -4695,6 +4722,10 @@ if test "$snappy" = "yes" ; then
>>     echo "CONFIG_SNAPPY=y" >> $config_host_mak
>>   fi
>>
>> +if test "$bzip2" = "yes" ; then
>> +  echo "CONFIG_BZIP2=y" >> $config_host_mak
>> +fi
>> +
>>   if test "$libiscsi" = "yes" ; then
>>     echo "CONFIG_LIBISCSI=m" >> $config_host_mak
>>     echo "LIBISCSI_CFLAGS=$libiscsi_cflags" >> $config_host_mak
>>
> 
> Looks good otherwise. CCing Paolo so he can take a quick peek at the
> configure script. It looks sane to me, though.

It is sane, but instead of libs_softmmu="$libs_softmmu -lbz2" it's
better to follow what we do for libiscsi.  In configure:

CONFIG_BZIP2=y
LIBBZ2_CFLAGS=-lbz2

In Makefile.objs:

dmg.o-libs     := $(LIBBZ2_CFLAGS)

Paolo