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 + tools/config.h.in | 3 + tools/configure | 129 ++++++++++++++++++++++++++++++++++++++++++ tools/configure.ac | 2 + tools/m4/curses.m4 | 20 +++++++ tools/misc/Makefile | 3 + tools/misc/gtraceview.c | 11 ++-- tools/xenstat/xentop/Makefile | 3 + tools/xenstat/xentop/xentop.c | 8 ++- 12 files changed, 173 insertions(+), 11 deletions(-) create mode 100644 tools/m4/curses.m4 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@ diff --git a/tools/config.h.in b/tools/config.h.in index 3d701f47b6..f8f96dc3df 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -14,3 +14,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_YAJL_YAJL_VERSION_H + +/* Define curses header to include. */ +#undef INCLUDE_CURSES_H diff --git a/tools/configure b/tools/configure index cd4a93de9a..57fdf86ea1 100755 --- a/tools/configure +++ b/tools/configure @@ -611,6 +611,7 @@ glib_CFLAGS PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +CURSES_LIBS PYTHONPATH OCAMLBUILD OCAMLDOC @@ -3904,6 +3905,8 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac # PKG_CHECK_MODULES + + # Enable/disable options # Check whether --enable-githttp was given. if test "${enable_githttp+set}" = set; then : @@ -6227,6 +6230,132 @@ fi fi +ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" +if test "x$ac_cv_header_curses_h" = x""yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clear in -lcurses" >&5 +$as_echo_n "checking for clear in -lcurses... " >&6; } +if test "${ac_cv_lib_curses_clear+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcurses $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clear (); +int +main () +{ +return clear (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_curses_clear=yes +else + ac_cv_lib_curses_clear=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_clear" >&5 +$as_echo "$ac_cv_lib_curses_clear" >&6; } +if test "x$ac_cv_lib_curses_clear" = x""yes; then : + curses="y" +else + curses="n" +fi + + +else + curses="n" +fi + + +ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default" +if test "x$ac_cv_header_ncurses_h" = x""yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clear in -lncurses" >&5 +$as_echo_n "checking for clear in -lncurses... " >&6; } +if test "${ac_cv_lib_ncurses_clear+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lncurses $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clear (); +int +main () +{ +return clear (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ncurses_clear=yes +else + ac_cv_lib_ncurses_clear=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_clear" >&5 +$as_echo "$ac_cv_lib_ncurses_clear" >&6; } +if test "x$ac_cv_lib_ncurses_clear" = x""yes; then : + ncurses="y" +else + ncurses="n" +fi + + +else + ncurses="n" +fi + + +if test "$curses" = "n" && test "$ncurses" = "n"; then : + + as_fn_error $? "Unable to find a suitable curses library" "$LINENO" 5 + +fi +# Prefer ncurses over curses if both are present +if test "$ncurses" = "y"; then : + + CURSES_LIBS="-lncurses" + +$as_echo "#define INCLUDE_CURSES_H " >>confdefs.h + + +else + + CURSES_LIBS="-lcurses" + +$as_echo "#define INCLUDE_CURSES_H " >>confdefs.h + + +fi + + + diff --git a/tools/configure.ac b/tools/configure.ac index c4afe1cf77..cf376bf05f 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -33,6 +33,7 @@ m4_include([m4/default_lib.m4]) m4_include([m4/set_cflags_ldflags.m4]) m4_include([m4/uuid.m4]) m4_include([m4/pkg.m4]) +m4_include([m4/curses.m4]) # Enable/disable options AX_ARG_ENABLE_AND_EXPORT([githttp], [Download GIT repositories via HTTP]) @@ -98,6 +99,7 @@ AS_IF([test "x$pythontools" = "xy"], [ ]) AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext]) AX_CHECK_UUID +AX_CHECK_CURSES PKG_CHECK_MODULES(glib, glib-2.0) # Check library path diff --git a/tools/m4/curses.m4 b/tools/m4/curses.m4 new file mode 100644 index 0000000000..c1e483f80d --- /dev/null +++ b/tools/m4/curses.m4 @@ -0,0 +1,20 @@ +AC_DEFUN([AX_CHECK_CURSES], [ +AC_CHECK_HEADER([curses.h], [ + AC_CHECK_LIB([curses], [clear], [curses="y"], [curses="n"]) +], [curses="n"]) +AC_CHECK_HEADER([ncurses.h], [ + AC_CHECK_LIB([ncurses], [clear], [ncurses="y"], [ncurses="n"]) +], [ncurses="n"]) +AS_IF([test "$curses" = "n" && test "$ncurses" = "n"], [ + AC_MSG_ERROR([Unable to find a suitable curses library]) +]) +# Prefer ncurses over curses if both are present +AS_IF([test "$ncurses" = "y"], [ + CURSES_LIBS="-lncurses" + AC_DEFINE([INCLUDE_CURSES_H], [], [Define curses header to use]) +], [ + CURSES_LIBS="-lcurses" + AC_DEFINE([INCLUDE_CURSES_H], [], [Define curses header to use]) +]) +AC_SUBST(CURSES_LIBS) +]) 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 + #include #include #include @@ -30,12 +33,8 @@ #include #include -#ifdef __linux__ -#include -#endif -#ifdef __NetBSD__ -#include -#endif +/* get curses header from configure */ +#include INCLUDE_CURSES_H /********** MACROS **********/ #define MAX_CPU_NR 32 diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index fb025d4106..afed0d190d 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -22,6 +22,9 @@ CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat) LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) CFLAGS += -DHOST_$(XEN_OS) +# Include configure output (config.h) to headers search path +CFLAGS += -I$(XEN_ROOT)/tools + .PHONY: all all: xentop diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c index b890829459..60cf607794 100644 --- a/tools/xenstat/xentop/xentop.c +++ b/tools/xenstat/xentop/xentop.c @@ -18,7 +18,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include + +/* Include output from configure */ +#include + +/* get curses header from configure */ +#include INCLUDE_CURSES_H + #include #include #include -- cgit v1.2.3