From 65da4913214120ddc95bd846cb3649a29f87146a Mon Sep 17 00:00:00 2001 From: Roger Pau Monne 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 Acked-by: Ian Jackson Committed-by: Ian Jackson --- config/NetBSD.mk | 2 -- config/StdGNU.mk | 1 - config/SunOS.mk | 1 - config/Tools.mk.in | 1 + 4 files changed, 1 insertion(+), 4 deletions(-) (limited to 'config') diff --git a/config/NetBSD.mk b/config/NetBSD.mk index 7aed0e7440..274bfb0107 100644 --- a/config/NetBSD.mk +++ b/config/NetBSD.mk @@ -1,8 +1,6 @@ include $(XEN_ROOT)/config/StdGNU.mk # Override settings for this OS -CURSES_LIBS = -lcurses - LIBLEAFDIR_x86_64 = lib LIBEXEC = $(PREFIX)/libexec PRIVATE_BINDIR = $(BINDIR) diff --git a/config/StdGNU.mk b/config/StdGNU.mk index 2af2841ccc..e2c9335db4 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -67,7 +67,6 @@ XEN_CONFIG_DIR = $(CONFIG_DIR)/xen XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts SOCKET_LIBS = -CURSES_LIBS = -lncurses PTHREAD_LIBS = -lpthread UTIL_LIBS = -lutil DLOPEN_LIBS = -ldl diff --git a/config/SunOS.mk b/config/SunOS.mk index 6fa0e817dd..ba809f5f5b 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -47,7 +47,6 @@ SunOS_LIBDIR = /usr/sfw/lib SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64 SOCKET_LIBS = -lsocket -CURSES_LIBS = -lcurses PTHREAD_LIBS = -lpthread UTIL_LIBS = DLOPEN_LIBS = -ldl diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 881bb05f03..68de1e4cf0 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -43,3 +43,4 @@ CONFIG_SYSTEM_LIBAIO:= @system_aio@ CONFIG_LIBICONV := @libiconv@ CONFIG_GCRYPT := @libgcrypt@ CONFIG_EXT2FS := @libext2fs@ +CURSES_LIBS := @CURSES_LIBS@ -- cgit v1.2.3