discover: log cleanup

[petitboot] / configure.ac.in

diff --git a/configure.ac.in b/configure.ac.in
index b1791cd2a09b4dc1d9450a0aba7fbd6eb2b153e0..acfab28b787fa64171d37ae50235abc11729b157 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -31,6 +31,11 @@ LT_INIT
 AC_CHECK_HEADERS([stdarg.h])
 AC_CHECK_HEADERS([varargs.h])
 
+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.])]
+)
+
 dnl Checking for va_copy availability
 AC_MSG_CHECKING([for va_copy])
 AC_TRY_LINK([#include <stdarg.h>
@@ -163,9 +168,37 @@ AC_ARG_ENABLE(
 )
 #AM_CONDITIONAL([ENABLE_DEBUG], [test "x$enable_debug" = "xyes"])
 
+# host program paths
+AC_DEFUN([DEFINE_HOST_PROG],
+       [
+               AC_ARG_VAR([HOST_PROG_$1], [Path to "$2" on the host [default $3]])
+               if test "x$HOST_PROG_$1" = "x"; then
+                       HOST_PROG_$1="$3"
+               fi
+               AC_DEFINE_UNQUOTED(HOST_PROG_$1, ["$HOST_PROG_$1"],
+                               [Path to "$2" on the host])
+       ])
+
+DEFINE_HOST_PROG(CP, cp, [/bin/cp])
+DEFINE_HOST_PROG(KEXEC, kexec, [/sbin/kexec])
+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(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],
+       [AS_HELP_STRING([--enable-werror],
+               [build programs with -Werror]
+       )],
+       [default_cflags="$default_cflags -Werror"]
+)
 
 AS_IF(
        [test "x$enable_debug" = "xyes"],
@@ -184,7 +217,9 @@ AC_CONFIG_FILES([
        lib/Makefile
        man/Makefile
        test/Makefile
+       test/lib/Makefile
        test/parser/Makefile
+       test/urls/Makefile
        ui/Makefile
        ui/common/Makefile
        ui/ncurses/Makefile