From 8dbd2fe3c33cebdc20315dee7084a137e5843184 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Sat, 12 Nov 2011 14:16:05 -0800 Subject: [PATCH] Add twin checks to configure Signed-off-by: Geoff Levand --- Makefile.in | 1 + configure.ac | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 -- 2.39.2