| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame^] | 1 | From 35267d995a81263b98f0ad56399ac3e30f9cf152 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Tue, 30 Apr 2019 09:48:08 +0200 |
| 4 | Subject: [PATCH] configure.ac: Detect vala-api version if not set explicitly |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | |
| 11 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 12 | --- |
| 13 | configure.ac | 2 +- |
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/configure.ac b/configure.ac |
| 17 | index 9bf4230..c489385 100644 |
| 18 | --- a/configure.ac |
| 19 | +++ b/configure.ac |
| 20 | @@ -38,7 +38,7 @@ AC_ARG_WITH([vala-api], |
| 21 | AC_HELP_STRING([--with-vala-api=VERSION], |
| 22 | [Use Vala API version VERSION]), |
| 23 | [vala_api=$withval], |
| 24 | - [vala_api='0.16']) |
| 25 | + [vala_api=`$PKG_CONFIG --variable=vapidir_versioned vapigen | sed -e 's:.*vala-::' -e s:/vapi::`]) |
| 26 | M8T_CHECK_VALA([$vala_api]) |
| 27 | AC_ARG_WITH([default-vapidir], |
| 28 | AC_HELP_STRING([--with-default-vapidir], |
| 29 | -- |
| 30 | 2.20.1 |
| 31 | |