From patchwork Wed Nov 9 09:52:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 692666 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tDM4H3svlz9vDh for ; Wed, 9 Nov 2016 20:55:27 +1100 (AEDT) Received: from localhost ([::1]:38378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4PbJ-0002yV-2l for incoming@patchwork.ozlabs.org; Wed, 09 Nov 2016 04:55:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4PYk-00018B-VJ for qemu-devel@nongnu.org; Wed, 09 Nov 2016 04:52:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4PYg-00012U-4c for qemu-devel@nongnu.org; Wed, 09 Nov 2016 04:52:47 -0500 Received: from hera.aquilenet.fr ([141.255.128.1]:36616) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4PYf-00011R-UD for qemu-devel@nongnu.org; Wed, 09 Nov 2016 04:52:42 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 937A690F4; Wed, 9 Nov 2016 10:52:40 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0TRlrwPjhP6L; Wed, 9 Nov 2016 10:52:39 +0100 (CET) Received: from var.youpi.perso.aquilenet.fr (no3.u-bordeaux.fr [147.210.245.180]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 9658A7A6; Wed, 9 Nov 2016 10:52:39 +0100 (CET) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.87) (envelope-from ) id 1c4PYc-0001P4-LP; Wed, 09 Nov 2016 10:52:38 +0100 Date: Wed, 9 Nov 2016 10:52:38 +0100 From: Samuel Thibault To: Cornelia Huck Message-ID: <20161109095238.GE2870@var.eduroam.u-bordeaux.fr> References: <20161107220741.GL2367@var.home> <20161108123449.0e031320.cornelia.huck@de.ibm.com> <20161108201019.GM2378@var.home> <20161109095859.0be2b487.cornelia.huck@de.ibm.com> <20161109090402.GF2378@var.home> <20161109101236.0c660095.cornelia.huck@de.ibm.com> <20161109092835.GA2499@var.bordeaux.inria.fr> <20161109104028.099af5f6.cornelia.huck@de.ibm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161109104028.099af5f6.cornelia.huck@de.ibm.com> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 141.255.128.1 Subject: Re: [Qemu-devel] [PATCH] Fix legacy ncurses detection. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Michal Suchanek , QEMU Developers Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Hello, Cornelia Huck, on Wed 09 Nov 2016 10:40:28 +0100, wrote: > Still curses=no... log attached. Oops, sorry, I misplaced my code, and it somehow worked in my case. Could you give a try at the attached patch instead? Thanks, Samuel commit cc8965eb848f53599895a650a6e062319189be1f Author: Samuel Thibault Date: Tue Nov 8 20:57:27 2016 +0100 Fix cursesw detection On systems which do not provide ncursesw.pc and whose /usr/include/curses.h does not include wide support, we should not only try with no -I, i.e. /usr/include, but also with -I/usr/include/ncursesw. To properly detect for wide support with and without -Werror, we need to check for the presence of e.g. the WACS_DEGREE macro. We also want to stop at the first curses_inc_list configuration which works, and make sure to set IFS to : at each new loop. Signed-off-by: Samuel Thibault diff --git a/configure b/configure index fd6f898..7d2a34e 100755 --- a/configure +++ b/configure @@ -2926,7 +2926,7 @@ if test "$curses" != "no" ; then curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):" curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses" else - curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):" + curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:" curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw" fi curses_found=no @@ -2941,11 +2941,13 @@ int main(void) { resize_term(0, 0); addwstr(L"wide chars\n"); addnwstr(&wch, 1); + add_wch(WACS_DEGREE); return s != 0; } EOF IFS=: for curses_inc in $curses_inc_list; do + IFS=: for curses_lib in $curses_lib_list; do unset IFS if compile_prog "$curses_inc" "$curses_lib" ; then @@ -2955,6 +2957,9 @@ EOF break fi done + if test "$curses_found" = yes ; then + break + fi done unset IFS if test "$curses_found" = "yes" ; then