[systemd-devel] [PATCH] buildsys: don't look for vala without --enable-gtk

Dave Reisner d at falconindy.com
Thu Jan 20 20:08:19 PST 2011


if --disable-gtk is passed, vala is no longer a build dependency. under
these conditions, configure should not fail when vala 0.10 is found.

Signed-off-by: Dave Reisner <d at falconindy.com>
---
My autoconf-fu is weak, so I'm not sure this is the best way to do things. Feel
free to mangle my patch.

 configure.ac |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1eb931d..71e375a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,6 +254,12 @@ if test "x$enable_gtk" != "xno"; then
 fi
 AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"])
 
+if test "x$enable_gtk" != "xno"; then
+        AM_PROG_VALAC([0.11])
+        AC_SUBST(VAPIDIR)
+fi
+AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
+
 if test "$have_gtk" = "yes"; then
         PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
         PKG_CHECK_EXISTS([ libnotify >= 0.7.0 ], [ libnotify07=yes ])
@@ -263,10 +269,6 @@ if test "$have_gtk" = "yes"; then
 fi
 AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
 
-AM_PROG_VALAC([0.11])
-AC_SUBST(VAPIDIR)
-AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
-
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
 
-- 
1.7.3.5



More information about the systemd-devel mailing list