From: Geoff Levand Date: Wed, 18 Feb 2009 09:15:07 +0000 (+0000) Subject: petitboot: Add --with-twin config option X-Git-Tag: v1.0.0~913 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=d7196a1972f05a17abf979fe71231ccf94e13976;ds=sidebyside petitboot: Add --with-twin config option Make the build of the GUI components conditional on the installation of libtwin. Also, add options --with-twin and --without-twin to allow the user to override the default. Signed-off-by: Geoff Levand Signed-off-by: Jeremy Kerr --- diff --git a/configure.ac b/configure.ac index 88e5833..467104a 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,25 @@ fi AC_PROG_CC AC_PROG_INSTALL -PKG_CHECK_MODULES([twin], [libtwin]) +AC_ARG_WITH([twin], + [AS_HELP_STRING([--with-twin], + [build GUI versions using the twin window system])], + [], + [with_twin=check]) + +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_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 ui/test ui/common lib/talloc lib/pb-protocol lib/list \ lib/waiter lib/log