X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=configure.ac;h=2cf94efb0f546ef9974052122528b181307a2360;hp=9eb08552910c0e79fdf08634157d12eea8d599a0;hb=e2185d2c52325bd6695f79eff38dfab63cb0d49c;hpb=e54e26065cea435fed19b8b2687c87927f1b63f1

diff --git a/configure.ac b/configure.ac
index 9eb0855..2cf94ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,6 +135,13 @@ AM_CONDITIONAL(
 	[WITH_TWIN],
 	[test "x$with_twin_x11" = "xyes" || test "x$with_twin_fbdev" = "xyes"])
 
+AS_IF(
+	[test "x$with_twin_x11" != "xyes" && \
+		test "x$with_twin_fbdev" != "xyes" && \
+		test "x$ax_cv_curses" != "xyes"],
+	[AC_MSG_WARN([ No user interface programs configured.  Consider using --with-ncurses, --with-twin-x11 or --with-twin-fbdev'])]
+)
+
 AS_IF(
 	[test "x$with_twin_x11" = "xyes" || test "x$with_twin_fbdev" = "xyes"],
 	[PKG_CHECK_MODULES(
@@ -239,6 +246,14 @@ AC_ARG_VAR(
 AS_IF([test "x$VERIFY_DIGEST" = x], [VERIFY_DIGEST="sha256"])
 AC_DEFINE_UNQUOTED(VERIFY_DIGEST, "$VERIFY_DIGEST", [openssl verify dgst])
 
+AC_ARG_ENABLE([hard-lockdown],
+	      [AS_HELP_STRING([--enable-hard-lockdown],
+			      [if signed boot configured, the absence of the
+			       LOCKDOWN_FILE does not disable signed boot at
+			       runtime @<:@default=no@:>@])],
+	      [AC_DEFINE(HARD_LOCKDOWN, 1, [Enable hard lockdown])],
+	      [])
+
 AC_ARG_ENABLE(
 	[busybox],
 	[AS_HELP_STRING(
@@ -307,7 +322,6 @@ AC_ARG_ENABLE(
 	[],
 	[enable_debug=check]
 )
-#AM_CONDITIONAL([ENABLE_DEBUG], [test "x$enable_debug" = "xyes"])
 
 AC_ARG_ENABLE(
 	[test-valgrind],
@@ -338,6 +352,7 @@ DEFINE_HOST_PROG(UMOUNT, umount, [/bin/umount])
 DEFINE_HOST_PROG(WGET, wget, [/usr/bin/wget])
 DEFINE_HOST_PROG(IP, ip, [/sbin/ip])
 DEFINE_HOST_PROG(UDHCPC, udhcpc, [/sbin/udhcpc])
+DEFINE_HOST_PROG(UDHCPC6, udhcpc6, [/usr/bin/udhcpc6])
 DEFINE_HOST_PROG(VGSCAN, vgscan, [/usr/sbin/vgscan])
 DEFINE_HOST_PROG(VGCHANGE, vgchange, [/usr/sbin/vgchange])
 DEFINE_HOST_PROG(PB_PLUGIN, pb-plugin, [/usr/sbin/pb-plugin])