lib/security: Fix broken if statements in gpg_validate_boot_files()
[petitboot] / configure.ac
index 1496054679191cd8d90c166cb69dd85ece5ce43e..566742c63996b454c0c6da7ddbfc270ca766480b 100644 (file)
@@ -16,7 +16,7 @@
 
 AC_INIT([petitboot],
     [m4_esyscmd_s([./version.sh])],
-    [Geoff Levand <geoff@infradead.org>])
+    [https://lists.ozlabs.org/listinfo/petitboot])
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -26,7 +26,13 @@ AS_IF([test "x$CFLAGS" = "x"], [AC_SUBST([CFLAGS], [""])])
 
 AC_PROG_CC
 AC_PROG_LEX
+if test -z "$($LEX --version)"; then
+       AC_MSG_ERROR([[Please install flex/lex]])
+fi
 AC_PROG_YACC
+if test -z "$($YACC --version)"; then
+       AC_MSG_ERROR([[Please install bison/yacc]])
+fi
 AC_PROG_INSTALL
 
 AM_INIT_AUTOMAKE
@@ -59,12 +65,12 @@ AC_CHECK_LIB([udev], [udev_new],
 
 PKG_CHECK_EXISTS(libudev >= 218, [old_udev=no], [old_udev=yes])
 if test "$old_udev" = "yes" ; then
-      AC_DEFINE(UDEV_LOGGING, 1, [Support old udev logging interface])],
+      AC_DEFINE(UDEV_LOGGING, 1, [Support old udev logging interface])
 fi
 
 AC_CHECK_LIB([devmapper], [dm_task_create],
        [DEVMAPPER_LIBS=-ldevmapper],
-       [AC_MSG_FAILURE([The libdevmapper development library is required by petitboot.  Try installing the package libdevmapper-dev or libdevmapper-devel.])]
+       [AC_MSG_FAILURE([The libdevmapper development library is required by petitboot.  Try installing the package libdevmapper-dev or device-mapper-devel.])]
 )
 
 AC_ARG_WITH([fdt],
@@ -107,7 +113,7 @@ AC_ARG_WITH(
                [build x11 GUI programs using the twin window system [default=yes]]
        )],
        [],
-       [with_twin_x11=yes]
+       [with_twin_x11=no]
 )
 AM_CONDITIONAL([WITH_TWIN_X11], [test "x$with_twin_x11" = "xyes"])
 
@@ -118,7 +124,7 @@ AC_ARG_WITH(
                [build frame buffer GUI programs using the twin window system [default=no]]
        )],
        [],
-       [with_twin_fbdev=yes]
+       [with_twin_fbdev=no]
 )
 AM_CONDITIONAL([WITH_TWIN_FBDEV], [test "x$with_twin_fbdev" = "xyes"])
 
@@ -332,6 +338,11 @@ 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(VGSCAN, vgscan, [/usr/sbin/vgscan])
+DEFINE_HOST_PROG(VGCHANGE, vgchange, [/usr/sbin/vgchange])
+DEFINE_HOST_PROG(PB_PLUGIN, pb-plugin, [/usr/sbin/pb-plugin])
+DEFINE_HOST_PROG(PB_EXEC, pb-exec, [/usr/sbin/pb-exec])
+DEFINE_HOST_PROG(SH, sh, [/bin/sh])
 
 AC_ARG_WITH(
     [tftp],