Add twin checks to configure

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

diff --git a/Makefile.in b/Makefile.in
index 23135aa836d06d83ed0347043a346432697bcadc..ad93a2947fd5618d21f792d07db91a8bc4de6d3d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,6 +18,7 @@ twin_LDFLAGS = @twin_LIBS@
 
 # build target
 ENABLE_PS3 = @ENABLE_PS3@
 
 # build target
 ENABLE_PS3 = @ENABLE_PS3@

+ENABLE_X11 = @ENABLE_X11@

 
 # other programs
 INSTALL = @INSTALL@
 
 # other programs
 INSTALL = @INSTALL@

diff --git a/configure.ac b/configure.ac
index d12355667c303d52832b0208524853ff6b281e59..758207125c1b9e50ba5447a8c5184bb093bb077a 100644 (file)
--- 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],
                [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
 
 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