parser/grub2: Better menuentry parsing
[petitboot] / configure.ac.in
index 80f601e078315f750936cf7715d021ea42a6cc16..bfc25720782e41763ca91fabe3ffde5dd086a2e0 100644 (file)
@@ -33,7 +33,7 @@ AC_CHECK_HEADERS([varargs.h])
 
 AC_CHECK_LIB([udev], [udev_new],
        [],
 
 AC_CHECK_LIB([udev], [udev_new],
        [],
-       [AC_MSG_FAILURE([The libudev development library is required by petitboot.  Try installing the libudev-dev package.])]
+       [AC_MSG_FAILURE([The libudev development library is required by petitboot.  Try installing the package libudev-dev or libudev-devel.])]
 )
 
 dnl Checking for va_copy availability
 )
 
 dnl Checking for va_copy availability
@@ -67,6 +67,14 @@ AC_ARG_WITH(
 )
 AM_CONDITIONAL([WITH_NCURSES], [test "x$with_ncurses" = "xyes"])
 
 )
 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],
 AC_ARG_WITH(
        [twin-x11],
        [AS_HELP_STRING([--with-twin-x11],
@@ -102,7 +110,7 @@ AS_IF(
                                [twin],
                                [twin_feature_init],
                                [],
                                [twin],
                                [twin_feature_init],
                                [],
-                               [AC_MSG_FAILURE([--with-twin was given, but test for twin failed])]
+                               [AC_MSG_FAILURE([--with-twin was given but the test for libtwin failed.])]
                        )
                        LIBS="$SAVE_LIBS"
                ],
                        )
                        LIBS="$SAVE_LIBS"
                ],
@@ -185,13 +193,12 @@ DEFINE_HOST_PROG(MOUNT, mount, [/bin/mount])
 DEFINE_HOST_PROG(SHUTDOWN, shutdown, [/sbin/shutdown])
 DEFINE_HOST_PROG(SFTP, sftp, [/usr/bin/sftp])
 DEFINE_HOST_PROG(TFTP, tftp, [/usr/bin/tftp])
 DEFINE_HOST_PROG(SHUTDOWN, shutdown, [/sbin/shutdown])
 DEFINE_HOST_PROG(SFTP, sftp, [/usr/bin/sftp])
 DEFINE_HOST_PROG(TFTP, tftp, [/usr/bin/tftp])
-DEFINE_HOST_PROG(UDEVADM, udevadm, [/sbin/udevadm])
 DEFINE_HOST_PROG(UMOUNT, umount, [/bin/umount])
 DEFINE_HOST_PROG(WGET, wget, [/usr/bin/wget])
 
 default_cflags="--std=gnu99 -g \
        -Wall -W -Wunused -Wstrict-prototypes -Wmissing-prototypes \
 DEFINE_HOST_PROG(UMOUNT, umount, [/bin/umount])
 DEFINE_HOST_PROG(WGET, wget, [/usr/bin/wget])
 
 default_cflags="--std=gnu99 -g \
        -Wall -W -Wunused -Wstrict-prototypes -Wmissing-prototypes \
-       -Wmissing-declarations -Wredundant-decls -Winline"
+       -Wmissing-declarations -Wredundant-decls"
 
 AC_ARG_ENABLE(
        [werror],
 
 AC_ARG_ENABLE(
        [werror],