From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:47431)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1QmoCQ-00056n-Mz
	for qemu-devel@nongnu.org; Fri, 29 Jul 2011 10:38:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1QmoCL-0006ZF-Le
	for qemu-devel@nongnu.org; Fri, 29 Jul 2011 10:38:02 -0400
Received: from mail-gw0-f45.google.com ([74.125.83.45]:41177)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1QmoCL-0006Yt-J1
	for qemu-devel@nongnu.org; Fri, 29 Jul 2011 10:37:57 -0400
Received: by gwb19 with SMTP id 19so3287307gwb.4
	for <qemu-devel@nongnu.org>; Fri, 29 Jul 2011 07:37:52 -0700 (PDT)
Message-ID: <4E32C5BC.3090902@codemonkey.ws>
Date: Fri, 29 Jul 2011 09:37:48 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1311672640-18000-1-git-send-email-alevy@redhat.com>
In-Reply-To: <1311672640-18000-1-git-send-email-alevy@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] configure: add --disable-zlib-test
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Alon Levy <alevy@redhat.com>
Cc: qemu-devel@nongnu.org

On 07/26/2011 04:30 AM, Alon Levy wrote:
> This is required for building libcacard which doesn't itself require
> zlib without bringing in this requirement to the build environment.
>
> Signed-off-by: Alon Levy<alevy@redhat.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
> I'd like this to go into 0.15.0 too, it makes building libcacard possible
> without zlib-devel being installed.
> ---
>   configure |   23 ++++++++++++++---------
>   1 files changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/configure b/configure
> index 88159ac..5fc0f82 100755
> --- a/configure
> +++ b/configure
> @@ -178,6 +178,7 @@ rbd=""
>   smartcard=""
>   smartcard_nss=""
>   opengl=""
> +zlib="yes"
>
>   # parse CC options first
>   for opt do
> @@ -743,6 +744,8 @@ for opt do
>     ;;
>     --enable-smartcard-nss) smartcard_nss="yes"
>     ;;
> +  --disable-zlib-test) zlib="no"
> +  ;;
>     *) echo "ERROR: unknown option $opt"; show_help="yes"
>     ;;
>     esac
> @@ -1172,18 +1175,20 @@ fi
>   ##########################################
>   # zlib check
>
> -cat>  $TMPC<<  EOF
> +if test "$zlib" != "no" ; then
> +    cat>  $TMPC<<  EOF
>   #include<zlib.h>
>   int main(void) { zlibVersion(); return 0; }
>   EOF
> -if compile_prog "" "-lz" ; then
> -    :
> -else
> -    echo
> -    echo "Error: zlib check failed"
> -    echo "Make sure to have the zlib libs and headers installed."
> -    echo
> -    exit 1
> +    if compile_prog "" "-lz" ; then
> +        :
> +    else
> +        echo
> +        echo "Error: zlib check failed"
> +        echo "Make sure to have the zlib libs and headers installed."
> +        echo
> +        exit 1
> +    fi
>   fi
>
>   ##########################################