From patchwork Mon Aug 3 12:46:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id B1880B6F31 for ; Tue, 4 Aug 2009 00:22:26 +1000 (EST) Received: from localhost ([127.0.0.1]:33671 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXyQe-0003d4-UX for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 10:22:21 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwzS-0003YH-N6 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwzN-0003Uj-Vm for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:10 -0400 Received: from [199.232.76.173] (port=51694 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwzN-0003Uc-KJ for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:05 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40837) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzN-00074x-42 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:05 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73Co4fj006968; Mon, 3 Aug 2009 08:50:04 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73Co2OS026364; Mon, 3 Aug 2009 08:50:03 -0400 Received: from localhost.localdomain (vpn-12-117.rdu.redhat.com [10.11.12.117]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cn8Ml009715; Mon, 3 Aug 2009 08:50:01 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:34 +0200 Message-Id: <7e580f26e81c78a54717c82515f18de0b9171bad.1249301360.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 43/81] Fold VNC_TLS_LIBS into libs_softmmu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- Makefile.target | 3 --- configure | 3 +-- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/Makefile.target b/Makefile.target index da8b861..b5500e4 100644 --- a/Makefile.target +++ b/Makefile.target @@ -238,10 +238,7 @@ sound-obj-$(CONFIG_CS4231A) += cs4231a.o adlib.o fmopl.o: QEMU_CFLAGS := ${QEMU_CFLAGS} -DBUILD_Y8950=0 -ifdef CONFIG_VNC_TLS QEMU_CFLAGS += $(VNC_TLS_CFLAGS) -LIBS += $(VNC_TLS_LIBS) -endif ifdef CONFIG_VNC_SASL QEMU_CFLAGS += $(VNC_SASL_CFLAGS) diff --git a/configure b/configure index e778bbc..2226695 100755 --- a/configure +++ b/configure @@ -904,7 +904,7 @@ EOF vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null` vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null` if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then - : + libs_softmmu="$vnc_tls_libs $libs_softmmu" else vnc_tls="no" fi @@ -1628,7 +1628,6 @@ fi if test "$vnc_tls" = "yes" ; then echo "CONFIG_VNC_TLS=y" >> $config_host_mak echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak - echo "VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak fi if test "$vnc_sasl" = "yes" ; then echo "CONFIG_VNC_SASL=y" >> $config_host_mak