X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=configure.ac.in;h=be372a6337757e2be510961b75039aa4abbbf85c;hp=51cfdb8d8a444b63831b31a8f46f748388dfdb9c;hb=748bd3f1bd8ffff60653f7a54f51cc5f63696c68;hpb=56294d02a1422a3e83d2507c462ce53091135fa1

diff --git a/configure.ac.in b/configure.ac.in
index 51cfdb8..be372a6 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -28,14 +28,29 @@ AC_PROG_INSTALL
 AM_INIT_AUTOMAKE
 LT_INIT
 
-AC_CHECK_HEADERS([stdarg.h])
-AC_CHECK_HEADERS([varargs.h])
+AX_WITH_CURSES
+AX_WITH_CURSES_MENU
+AX_WITH_CURSES_FORM
+
+AM_CONDITIONAL([WITH_NCURSES], [test "x$ax_cv_curses" = "xyes"])
+
+if test "x$ax_cv_curses" = xyes; then
+	if test "x$ax_cv_menu" != xyes; then
+		AC_MSG_ERROR([--with-ncurses requires the ncurses menu library])
+	fi
+	if test "x$ax_cv_form" != xyes; then
+		AC_MSG_ERROR([--with-ncurses requires the ncurses form library])
+	fi
+fi
 
 AC_CHECK_LIB([udev], [udev_new],
 	[],
 	[AC_MSG_FAILURE([The libudev development library is required by petitboot.  Try installing the package libudev-dev or libudev-devel.])]
 )
 
+AC_CHECK_HEADERS([stdarg.h])
+AC_CHECK_HEADERS([varargs.h])
+
 dnl Checking for va_copy availability
 AC_MSG_CHECKING([for va_copy])
 AC_TRY_LINK([#include <stdarg.h>
@@ -57,24 +72,6 @@ else
     fi
 fi
 
-AC_ARG_WITH(
-	[ncurses],
-	[AS_HELP_STRING([--with-ncurses],
-		[build text console UI programs using ncurses [default=yes]]
-	)],
-	[],
-	[with_ncurses=yes]
-)
-AM_CONDITIONAL([WITH_NCURSES], [test "x$with_ncurses" = "xyes"])
-
-AS_IF(
-	[test "x$with_ncurses" = "xyes"],
-	AC_CHECK_LIB([ncurses], [initscr],
-		[],
-		[AC_MSG_FAILURE([--with-ncurses was given but the test for libncurses failed.  Try installing the package ncurses-dev or ncurses-devel.])]
-	)
-)
-
 AC_ARG_WITH(
 	[twin-x11],
 	[AS_HELP_STRING([--with-twin-x11],
@@ -176,6 +173,14 @@ AC_ARG_ENABLE(
 )
 #AM_CONDITIONAL([ENABLE_DEBUG], [test "x$enable_debug" = "xyes"])
 
+AC_ARG_ENABLE(
+	[test-valgrind],
+	[AS_HELP_STRING([--enable-test-valgrind],
+		[run all tests with valgrind]
+	)],
+)
+AM_CONDITIONAL([ENABLE_TEST_VALGRIND], [test "x$enable_test_valgrind" = "xyes"])
+
 # host program paths
 AC_DEFUN([DEFINE_HOST_PROG],
 	[