aboutsummaryrefslogtreecommitdiffstats
path: root/tools/misc
diff options
context:
space:
mode:
authorRoger Pau Monne <roger.pau@entel.upc.edu>2012-03-13 15:23:35 +0000
committerRoger Pau Monne <roger.pau@entel.upc.edu>2012-03-13 15:23:35 +0000
commit65da4913214120ddc95bd846cb3649a29f87146a (patch)
tree0184962f72ff86a39430e6a0958ee15fcbcfb977 /tools/misc
parent77b8dfec88acdc71138e3af7e2603ad8d72eb926 (diff)
downloadxen-65da4913214120ddc95bd846cb3649a29f87146a.tar.gz
xen-65da4913214120ddc95bd846cb3649a29f87146a.tar.bz2
xen-65da4913214120ddc95bd846cb3649a29f87146a.zip
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>
Diffstat (limited to 'tools/misc')
-rw-r--r--tools/misc/Makefile3
-rw-r--r--tools/misc/gtraceview.c11
2 files changed, 8 insertions, 6 deletions
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