X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=configure.ac;h=d9fe8ad9cdb87688f86b2ca24d1866e7c63689f0;hp=88e5833ca213fa0897688ed6d9779d4ce4c72343;hb=90428c4cc95d11c74871a92e3e7a340195d0997b;hpb=dae4540e417e2bf72dd83b2713a670bde0056ba9

diff --git a/configure.ac b/configure.ac
index 88e5833..d9fe8ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-AC_INIT([petitboot], [0.2], [Jeremy Kerr <jk@ozlabs.org>])
+AC_INIT([petitboot], [0.3], [Geoff Levand <geoff@infradead.org>])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
@@ -29,9 +29,36 @@ fi
 AC_PROG_CC
 AC_PROG_INSTALL
 
-PKG_CHECK_MODULES([twin], [libtwin])
+AC_ARG_ENABLE([ps3],
+	[AS_HELP_STRING([--enable-ps3],
+		[build support for the PS3 game console])],
+	[],
+	[enable_ps3=check])
 
-mkdir -p discover ui/test ui/common lib/talloc lib/pb-protocol lib/list \
-	      lib/waiter lib/log
+AS_IF([test "x$enable_ps3" != xno], [AC_SUBST([ENABLE_PS3], ["y"])], [])
+
+AC_ARG_WITH([twin],
+	[AS_HELP_STRING([--with-twin],
+		[build GUI versions using the twin window system])],
+	[],
+	[with_twin=check])
+
+PBTWIN=
+LIBTWIN=
+AS_IF([test "x$with_twin" != xno],
+	[PKG_CHECK_MODULES([twin], [libtwin], [],
+		[AC_MSG_RESULT([$twin_PKG_ERRORS])
+		AC_MSG_RESULT([Consider adjusting PKG_CONFIG_PATH environment variable])])
+	AC_CHECK_LIB([twin], [main],
+		[AC_SUBST([LIBTWIN], ["-ltwin"])
+			AC_SUBST([PBTWIN], ["y"])
+			AC_DEFINE([HAVE_LIBTWIN], [1], [Define if you have libtwin])],
+		[if test "x$with_twin" != xcheck; then
+			AC_MSG_FAILURE([--with-twin was given, but test for twin failed])
+		fi],
+		[${twin_LIBS}])])
+
+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
 
 AC_OUTPUT