From 6f1a29c08e2053486b63c66bcb83146444f687ad Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 4 Nov 2015 17:19:48 +0800 Subject: [PATCH] configure.ac --- configure.ac | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index eb7d94061..b3f15ab8e 100644 --- a/configure.ac +++ b/configure.ac @@ -36,33 +36,39 @@ PKG_CHECK_MODULES(BUILDER, [ dnl --- libvala -- needs to find matching really.. -PKG_CHECK_MODULES(LIBVALA, [libvala-0.28], +PKG_CHECK_MODULES(LIBVALA, [libvala-0.30], + [vala_3_0_enabled=yes], + [vala_3_0_enabled=no]) +if test $vala_3_0_enabled = yes; then + AC_DEFINE(HAVE_LIBVALA30,1,[libvala 0.30 support]) +else + PKG_CHECK_MODULES(LIBVALA, [libvala-0.28], [vala_2_8_enabled=yes], [vala_2_8_enabled=no]) - -if test $vala_2_8_enabled = yes; then - AC_DEFINE(HAVE_LIBVALA28,1,[libvala 0.28 support]) -else - PKG_CHECK_MODULES(LIBVALA, [libvala-0.26], - [vala_2_6_enabled=yes], - [vala_2_6_enabled=no]) + if test $vala_2_8_enabled = yes; then + AC_DEFINE(HAVE_LIBVALA28,1,[libvala 0.28 support]) + else + PKG_CHECK_MODULES(LIBVALA, [libvala-0.26], + [vala_2_6_enabled=yes], + [vala_2_6_enabled=no]) - if test $vala_2_6_enabled = yes; then - AC_DEFINE(HAVE_LIBVALA26,1,[libvala 0.26 support]) - else - PKG_CHECK_MODULES(LIBVALA, [libvala-0.24], - [vala_2_4_enabled=yes], - [vala_2_4_enabled=no]) + if test $vala_2_6_enabled = yes; then + AC_DEFINE(HAVE_LIBVALA26,1,[libvala 0.26 support]) + else + PKG_CHECK_MODULES(LIBVALA, [libvala-0.24], + [vala_2_4_enabled=yes], + [vala_2_4_enabled=no]) - if test $vala_2_4_enabled = yes; then - AC_DEFINE(HAVE_LIBVALA24,1,[libvala 0.24 support]) - else - PKG_CHECK_MODULES(LIBVALA, [libvala-0.22], - [vala_2_2_enabled=yes] ) + if test $vala_2_4_enabled = yes; then + AC_DEFINE(HAVE_LIBVALA24,1,[libvala 0.24 support]) + else + PKG_CHECK_MODULES(LIBVALA, [libvala-0.22], + [vala_2_2_enabled=yes] ) - AC_DEFINE(HAVE_LIBVALA22,1,[libvala 0.22 support]) - fi - fi + AC_DEFINE(HAVE_LIBVALA22,1,[libvala 0.22 support]) + fi + fi + fi fi AM_CONDITIONAL(HAVE_LIBVALA30, test "$vala_3_0_enabled" = "yes") AM_CONDITIONAL(HAVE_LIBVALA28, test "$vala_2_8_enabled" = "yes") -- 2.39.2