From patchwork Mon Aug 3 12:46:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30544 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 D40A0B6F2B for ; Tue, 4 Aug 2009 00:20:26 +1000 (EST) Received: from localhost ([127.0.0.1]:60979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXyOg-0001BI-GA for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 10:20:18 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwzP-0003W8-Pn for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:07 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwzL-0003Tp-Va for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:07 -0400 Received: from [199.232.76.173] (port=51693 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwzL-0003Tk-OY for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:03 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40834) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzL-00074X-6z for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:03 -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 n73Co2p0006953; Mon, 3 Aug 2009 08:50:02 -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 n73Co0VN026173; Mon, 3 Aug 2009 08:50:01 -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 n73Cn8Mk009715; Mon, 3 Aug 2009 08:49:59 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:33 +0200 Message-Id: <36f82630ea75ba9a268ce8e301e6b76b26021637.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 42/81] Fold CURSES_LIBS into libsoftmmu_libs 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 | 2 +- configure | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.target b/Makefile.target index 6a61dfd..da8b861 100644 --- a/Makefile.target +++ b/Makefile.target @@ -416,7 +416,7 @@ vl.o: qemu-options.h monitor.o: qemu-monitor.h -LIBS += $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS) +LIBS += $(COCOA_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS) ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) endif # !CONFIG_USER_ONLY diff --git a/configure b/configure index 24c0e5a..e778bbc 100755 --- a/configure +++ b/configure @@ -1074,9 +1074,9 @@ if test "$curses" = "yes" ; then int main(void) { resize_term(0, 0); return curses_version(); } EOF if compile_prog "" "-lncurses" ; then - curses_libs="-lncurses" + libs_softmmu="-lncurses $libs_softmmu" elif compile_prog "" "-lcurses" ; then - curses_libs="-lcurses" + libs_softmmu="-lcurses $libs_softmmu" else curses=no fi @@ -1658,7 +1658,6 @@ if test "$cocoa" = "yes" ; then fi if test "$curses" = "yes" ; then echo "CONFIG_CURSES=y" >> $config_host_mak - echo "CURSES_LIBS=$curses_libs" >> $config_host_mak fi if test "$atfile" = "yes" ; then echo "CONFIG_ATFILE=y" >> $config_host_mak