Patchwork [1/4,v2] petitboot: Add --with-twin config option

login
register
mail settings
Submitter Geoff Levand
Date Feb. 18, 2009, 7:15 p.m.
Message ID <499C5E3B.2050708@am.sony.com>
Download mbox | patch
Permalink /patch/23349/
State Accepted
Headers show

Comments

Geoff Levand - Feb. 18, 2009, 7:15 p.m.
Subject: [patch] 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 <geoffrey.levand@am.sony.com>
---
v2: Run PKG_CHECK_MODULES before AC_CHECK_LIB to pickup libtwin package
    info for AC_CHECK_LIB.

 configure.ac |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

Patch

--- 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