From 65da4913214120ddc95bd846cb3649a29f87146a Mon Sep 17 00:00:00 2001
From: Roger Pau Monne <roger.pau@entel.upc.edu>
Date: Tue, 13 Mar 2012 15:23:35 +0000
Subject: autoconf: add check for curses library

Check for a curses compatible library (curses or ncurses basically).
One of those is needed to compile Xen tools (gtraceview and xentop).

Modify Makefiles/sources to use configure output (fetch CURSES_LIBS
from tools/Tools.mk and header to include from tools/config.h)

Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/misc/Makefile     |  3 +++
 tools/misc/gtraceview.c | 11 +++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'tools/misc')

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index af380b0a65..834ffe7f80 100644
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -27,6 +27,9 @@ INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash
 INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool
 INSTALL_SBIN := $(INSTALL_SBIN-y)
 
+# Include configure output (config.h) to headers search path
+CFLAGS += -I$(XEN_ROOT)/tools
+
 .PHONY: all
 all: build
 
diff --git a/tools/misc/gtraceview.c b/tools/misc/gtraceview.c
index 3bfedad654..d8b458996f 100644
--- a/tools/misc/gtraceview.c
+++ b/tools/misc/gtraceview.c
@@ -16,6 +16,9 @@
  * Place - Suite 330, Boston, MA 02111-1307 USA.
  */
 
+/* Include output from configure */
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,12 +33,8 @@
 #include <xenctrl.h>
 #include <xen/trace.h>
 
-#ifdef __linux__
-#include <ncurses.h>
-#endif
-#ifdef __NetBSD__
-#include <curses.h>
-#endif
+/* get curses header from configure */
+#include INCLUDE_CURSES_H
 
 /********** MACROS **********/
 #define MAX_CPU_NR  32
-- 
cgit v1.2.3