[vala/0.54] vapigen.m4: use $PKG_CONFIG_SYSROOT_DIR



commit aa9f5921f57eb731346993c612fac118eb0ef590
Author: Alexander Kanavin <alex kanavin gmail com>
Date:   Fri Oct 23 16:13:54 2015 +0300

    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.

 vapigen/vapigen.m4 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
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`
         ])
     ])
 


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