X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=configure.ac;h=566742c63996b454c0c6da7ddbfc270ca766480b;hp=2c2f23b92662c92ad75f92d5d86f8040c110d468;hb=fbe876dd19e4c289ba940b2e7f0ae0b23b790025;hpb=f4d947604d0aeecb1ee42ae4d3c9895b65342176;ds=sidebyside diff --git a/configure.ac b/configure.ac index 2c2f23b..566742c 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AC_INIT([petitboot], [m4_esyscmd_s([./version.sh])], - [Geoff Levand ]) + [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,7 +65,7 @@ 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], @@ -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"]) @@ -336,6 +342,7 @@ 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],