blob: 70023c5457245901144018a684b105dd60d76f2e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
--- a/m4/rygel.m4 2012-04-12 08:47:08.000000000 -0700
+++ b/m4/rygel.m4 2012-06-15 11:55:36.000000000 -0700
@@ -99,6 +99,25 @@
[dnl check for vala
AM_PROG_VALAC([$1])
+ dnl See where we should look for vapi files. If it's under
+ dnl $datadir, then assume it's one of the standard locations where
+ dnl vala will look. Otherwise, specify explicitly.
+ dnl
+ dnl Note the distinction between these directories (where we look
+ dnl for APIs when we do vala builds) and VAPIDIR, which is where we
+ dnl install our own vapi files.
+
+ for var in vapidir vapidir_versioned; do
+ AS_IF([dir=`$PKG_CONFIG --variable=$var vapigen`],
+ [
+ AC_MSG_NOTICE([got $var=$dir from pkg-config])
+ AS_IF([expr "$dir" : "${datadir}"],
+ [],
+ [RYGEL_ADD_VALAFLAGS([--vapidir $dir])])
+ ],
+ [AC_MSG_NOTICE([pkg-config didn't return a value for $var, relying on valac built-in defaults])])
+ done
+
AS_IF([test x$VALAC = "x"],
[AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])],
[
|
