X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=configure.ac.in;h=332c7189d070577421a3eed94a0dd3fd8f418045;hp=8372b98860ed705c21b34c3786eddc41ff26c738;hb=fdb51c2696a43624ba4378fb61de7e492fa59d98;hpb=f1599796efed1eb67759cf42f47fe4bf6a9bf93c

diff --git a/configure.ac.in b/configure.ac.in
index 8372b98..332c718 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -23,9 +23,12 @@ AC_PREFIX_DEFAULT([/usr/local])
 AS_IF([test "x$CFLAGS" = "x"], [AC_SUBST([CFLAGS], [""])])
 
 AC_PROG_CC
+AC_PROG_LEX
+AC_PROG_YACC
 AC_PROG_INSTALL
 
 AM_INIT_AUTOMAKE
+AC_GNU_SOURCE
 LT_INIT
 
 AX_WITH_CURSES
@@ -173,6 +176,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],
 	[
@@ -195,6 +206,29 @@ DEFINE_HOST_PROG(WGET, wget, [/usr/bin/wget])
 DEFINE_HOST_PROG(IP, ip, [/sbin/ip])
 DEFINE_HOST_PROG(UDHCPC, udhcpc, [/sbin/udhcpc])
 
+AC_ARG_WITH(
+    [tftp],
+    [AS_HELP_STRING([--with-tftp=TYPE],
+        [Use TYPE-type ftp client (either hpa or busybox) [default=runtime-check]]
+    )],
+    [],
+    [with_tftp=detect]
+)
+
+case x$with_tftp in
+'xhpa')
+    tftp_type='TFTP_TYPE_HPA'
+    ;;
+'xbusybox')
+    tftp_type='TFTP_TYPE_BUSYBOX'
+    ;;
+*)
+    tftp_type='TFTP_TYPE_UNKNOWN'
+    ;;
+esac
+
+AC_DEFINE_UNQUOTED(TFTP_TYPE, $tftp_type, [tftp client type])
+
 default_cflags="--std=gnu99 -g \
 	-Wall -W -Wunused -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations -Wredundant-decls"
@@ -222,6 +256,7 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
 	Makefile
 	discover/Makefile
+	discover/grub2/Makefile
 	lib/Makefile
 	man/Makefile
 	test/Makefile