From patchwork Tue Jan 15 17:13:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 212257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EC43C2C0096 for ; Wed, 16 Jan 2013 04:14:32 +1100 (EST) Received: from localhost ([::1]:50319 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvA5m-0002VA-QR for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 12:14:30 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvA5Q-0002GJ-IX for qemu-devel@nongnu.org; Tue, 15 Jan 2013 12:14:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvA5M-0004cD-9Q for qemu-devel@nongnu.org; Tue, 15 Jan 2013 12:14:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvA5M-0004bJ-32 for qemu-devel@nongnu.org; Tue, 15 Jan 2013 12:14:04 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0FHE2G9008120 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Jan 2013 12:14:02 -0500 Received: from localhost (ovpn-112-16.ams2.redhat.com [10.36.112.16]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0FHE1DO031040; Tue, 15 Jan 2013 12:14:01 -0500 From: Stefan Hajnoczi To: Date: Tue, 15 Jan 2013 18:13:53 +0100 Message-Id: <1358270033-18064-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1358270033-18064-1-git-send-email-stefanha@redhat.com> References: <1358270033-18064-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Vadim Evard , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 3/3] configure: try pkg-config for curses X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Vadim Evard Static linkikng against ncurses may require explicit -ltinfo. In case -lcurses and -lncurses both didn't work give pkg-config a chance. Fixes #1094786 for me. Signed-off-by: Vadim Evard Signed-off-by: Stefan Hajnoczi --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index c908f66..40473a9 100755 --- a/configure +++ b/configure @@ -2039,7 +2039,7 @@ fi if test "$mingw32" = "yes" ; then curses_list="-lpdcurses" else - curses_list="-lncurses -lcurses" + curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses)" fi if test "$curses" != "no" ; then @@ -2052,13 +2052,16 @@ int main(void) { return s != 0; } EOF + IFS=: for curses_lib in $curses_list; do + unset IFS if compile_prog "" "$curses_lib" ; then curses_found=yes libs_softmmu="$curses_lib $libs_softmmu" break fi done + unset IFS if test "$curses_found" = "yes" ; then curses=yes else