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 17558df95fb0e1ae9db6bde364b71394037ecf15..051ccd2e46ead04c5b900fc0b9fbf84484c4eac5 100644 (file)
--- 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`
         ])
     ])