]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
vapigen.m4: use $PKG_CONFIG_SYSROOT_DIR
authorAlexander Kanavin <alex.kanavin@gmail.com>
Fri, 23 Oct 2015 13:13:54 +0000 (16:13 +0300)
committerRico Tzschichholz <ricotz@ubuntu.com>
Sun, 9 Jan 2022 08:48:43 +0000 (09:48 +0100)
This is necessary in cross-compiling environments, where directories
returned by pkg-config should be prefixed with sysroot location.

vapigen/vapigen.m4

index 2c435e74b33f994483c9073e1c55d64038b58d7b..6228991ab06231293f0c8f1689c522eab91c44a1 100644 (file)
@@ -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`
         ])
     ])