diff options
| author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-08-19 15:27:41 -0400 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2012-08-20 11:06:21 +0200 |
| commit | c749239be2a8fa58f21accac03b35409e17d5543 (patch) | |
| tree | 6c1cec083ccc53c62c4c29e803a6faafbe12f889 /vapigen/vapigen.m4 | |
| parent | 24549e9535cbacf2784ff69923d4ac72c50387e7 (diff) | |
| download | vala-c749239be2a8fa58f21accac03b35409e17d5543.tar.gz | |
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.
Diffstat (limited to 'vapigen/vapigen.m4')
| -rw-r--r-- | vapigen/vapigen.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
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` ]) ]) |