[folks] Cut dependence on vala-1.0.pc for other programs



commit c1c0d0f28fac9e6a66483188d3598643cb5f19a2
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Thu Aug 12 10:39:34 2010 -0700

    Cut dependence on vala-1.0.pc for other programs

 configure.ac |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 106bb2c..0ecc693 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,13 +91,14 @@ AC_SUBST(DBUS_GLIB_LIBS)
 VALACFLAGS="$VALACFLAGS --target-glib=2.24"
 AC_SUBST(VALACFLAGS)
 AC_SUBST(VALAFLAGS)
-
-VAPIDIR=`$PKG_CONFIG --variable=vapidir vala-1.0`
 AC_SUBST(VAPIDIR)
-VAPIGEN=`$PKG_CONFIG --variable=vapigen vala-1.0`
+
+AC_PATH_PROG(VAPIGEN, vapigen, vapigen)
 AC_SUBST(VAPIGEN)
 
-VALA_GEN_INTROSPECT=`$PKG_CONFIG --variable=gen_introspect vala-1.0`
+# XXX: using this path instead of the wrapper script vala-gen-introspect is
+# sub-optimal, but the wrapper fails without explanation
+VALA_GEN_INTROSPECT='$(libdir)/vala/gen-introspect'
 AC_SUBST(VALA_GEN_INTROSPECT)
 
 AS_IF([test "$VAPIGEN" = "" -o "$VALA_GEN_INTROSPECT" = ""],



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]