X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=configure.ac.in;h=8372b98860ed705c21b34c3786eddc41ff26c738;hp=1f4a4199193d24b0b9dd3a1d0facc61716547991;hb=e5f5a2e91e89af08925b6dae3680fc9ef62190ff;hpb=c0a0d427bdc0cf18940874e9aa34006da98d10a1

diff --git a/configure.ac.in b/configure.ac.in
index 1f4a419..8372b98 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -28,6 +28,26 @@ AC_PROG_INSTALL
 AM_INIT_AUTOMAKE
 LT_INIT
 
+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])
 
@@ -52,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],
@@ -97,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"
 		],
@@ -163,9 +173,31 @@ 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])
+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],
@@ -184,6 +216,7 @@ AS_IF(
 
 AC_SUBST([LIBTOOL_DEPS])
 AC_SUBST([DESTDIR])
+AC_SUBST([pkgsysconfdir], ["${sysconfdir}/${package}"])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
@@ -192,7 +225,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