From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 23 Oct 2015 13:13:54 +0000 (+0300)
Subject: vapigen.m4: use $PKG_CONFIG_SYSROOT_DIR
X-Git-Tag: 0.52.10~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8a38a23bc1b480e9beb0f5b23d4953c84c9c112;p=thirdparty%2Fvala.git

vapigen.m4: use $PKG_CONFIG_SYSROOT_DIR

This is necessary in cross-compiling environments, where directories
returned by pkg-config should be prefixed with sysroot location.
---

diff --git a/vapigen/vapigen.m4 b/vapigen/vapigen.m4
index 2c435e74b..6228991ab 100644
--- a/vapigen/vapigen.m4
+++ b/vapigen/vapigen.m4
@@ -82,12 +82,12 @@ AC_DEFUN([VAPIGEN_CHECK],
 
   AS_CASE([$enable_vala],
     [yes], [
-      VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name`
-      VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen
+      VAPIGEN=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name`
+      VAPIGEN_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen
       AS_IF([test "x$2" = "x"], [
-          VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name`
+          VAPIGEN_VAPIDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name`
         ], [
-          VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name`
+          VAPIGEN_VAPIDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name`
         ])
     ])