From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 19 Aug 2012 19:27:41 +0000 (-0400)
Subject: vapigen.m4: use $vapigen_pkg_name as the name of the vapigen package
X-Git-Tag: 0.17.5~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c749239be2a8fa58f21accac03b35409e17d5543;p=thirdparty%2Fvala.git

vapigen.m4: use $vapigen_pkg_name as the name of the vapigen package

We should use $vapigen_pkg_name, not "vapigen", as the name of the
vapigen package; if the second parameter to VAPIGEN_CHECK is set, then
$vapigen_pkg_name != "vapigen".

Fixes bug 682203.
---

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