From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:59779)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <v.e.evard@gmail.com>) id 1TpiGe-0005WV-Dp
	for qemu-devel@nongnu.org; Mon, 31 Dec 2012 11:31:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <v.e.evard@gmail.com>) id 1TpiGX-0004Nm-F8
	for qemu-devel@nongnu.org; Mon, 31 Dec 2012 11:31:12 -0500
Message-ID: <50E1BDC3.5040604@gmail.com>
Date: Mon, 31 Dec 2012 20:30:59 +0400
From: Vadim Evard <v.e.evard@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [Qemu-trivial] [PATCH] configure: try pkg-config for
 curses
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: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org

configure: try pkg-config for curses

Static linkikng against ncurses may require explicit -ltinfo.
In case -lcurses and -lncurses both didn't work give pkg-config a
chance.

Signed-off-by: Vadim Evard <v.e.evard@gmail.com>
---
  configure |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index b0c7e54..16280e2 100755
--- a/configure
+++ b/configure
@@ -2030,7 +2030,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
@@ -2043,7 +2043,9 @@ 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"
-- 
1.7.10.4