From c5a04de9fbc05acbd77219c2bbe1e315743a7ef2 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 20 Jul 2015 23:28:23 +0100 Subject: [PATCH] Added libexpect check for functional tests --- Makefile.am | 2 ++ configure.ac | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 88254721..87bc1502 100644 --- a/Makefile.am +++ b/Makefile.am @@ -162,12 +162,14 @@ tests_unittests_unittests_CFLAGS = -w tests_unittests_unittests_LDADD = -lcmocka if HAVE_STABBER +if HAVE_EXPECT TESTS += tests/functionaltests/functionaltests check_PROGRAMS += tests/functionaltests/functionaltests tests_functionaltests_functionaltests_SOURCES = $(functionaltest_sources) tests_functionaltests_functionaltests_CFLAGS = -I/usr/include/tcl8.6 -I/usr/include/tcl8.5 tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect -ltcl endif +endif man_MANS = $(man_sources) diff --git a/configure.ac b/configure.ac index ffb35a2b..f5e8764e 100644 --- a/configure.ac +++ b/configure.ac @@ -243,7 +243,10 @@ PKG_CHECK_MODULES([cmocka], [cmocka], [], AM_CONDITIONAL([HAVE_STABBER], [false]) AC_CHECK_LIB([stabber], [stbbr_start], [AM_CONDITIONAL([HAVE_STABBER], [true])], - [AC_MSG_NOTICE([stabber not found, will not be able to run functional tests])]) + [AC_MSG_NOTICE([libstabber not found, will not be able to run functional tests])]) +AM_CONDITIONAL([HAVE_EXPECT], [false]) +AC_CHECK_LIB([expect], [main], [AM_CONDITIONAL([HAVE_EXPECT], [true])], + [AC_MSG_NOTICE([libexpect not found, will not be able to run functional tests])]) ### Check for ncursesw/ncurses.h first, Arch linux uses ncurses.h for ncursesw AC_CHECK_HEADERS([ncursesw/ncurses.h], [], [])