From: Geoff Levand <geoff@infradead.org>
Date: Sat, 12 Nov 2011 22:16:05 +0000 (-0800)
Subject: Add twin checks to configure
X-Git-Tag: v1.0.0~812
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=8dbd2fe3c33cebdc20315dee7084a137e5843184

Add twin checks to configure

Signed-off-by: Geoff Levand <geoff@infradead.org>
---

diff --git a/Makefile.in b/Makefile.in
index 23135aa..ad93a29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,6 +18,7 @@ twin_LDFLAGS = @twin_LIBS@
 
 # build target
 ENABLE_PS3 = @ENABLE_PS3@
+ENABLE_X11 = @ENABLE_X11@
 
 # other programs
 INSTALL = @INSTALL@
diff --git a/configure.ac b/configure.ac
index d123556..7582071 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,18 @@ AS_IF([test "x$with_twin" != xno],
 		[if test "x$with_twin" != xcheck; then
 			AC_MSG_FAILURE([--with-twin was given, but test for twin failed])
 		fi],
-		[${twin_LIBS}])])
+		[${twin_LIBS}])
+	AC_CHECK_HEADERS([libtwin/twin_x11.h])
+	AC_CHECK_HEADERS([libtwin/twin_fbdev.h])])
+
+AC_ARG_ENABLE([x11],
+	[AS_HELP_STRING([--enable-x11],
+		[build for x11])],
+	[],
+	[enable_x11=check])
+
+AS_IF([test "x$enable_x11" != xno], [AC_SUBST([ENABLE_X11], ["y"])], [])
+
 
 mkdir -p discover lib/list lib/log lib/pb-protocol lib/system lib/talloc \
 	lib/waiter test ui/common ui/ncurses ui/test ui/twin utils