discover/grub2: Implement reduce rules

[petitboot] / configure.ac.in

diff --git a/configure.ac.in b/configure.ac.in
index 9a057115e0823d1b3e47f55430837692a488ac47..be372a6337757e2be510961b75039aa4abbbf85c 100644 (file)
--- 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,16 +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"])
-
 AC_ARG_WITH(
        [twin-x11],
        [AS_HELP_STRING([--with-twin-x11],
@@ -102,7 +107,7 @@ AS_IF(
                                [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"
                ],
@@ -168,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],
        [
@@ -187,10 +200,12 @@ DEFINE_HOST_PROG(SFTP, sftp, [/usr/bin/sftp])
 DEFINE_HOST_PROG(TFTP, tftp, [/usr/bin/tftp])
 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])
 
 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],
@@ -209,6 +224,7 @@ AS_IF(
 
 AC_SUBST([LIBTOOL_DEPS])
 AC_SUBST([DESTDIR])
+AC_SUBST([pkgsysconfdir], ["${sysconfdir}/${package}"])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([