X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=configure.ac;h=b3f15ab8e9ef0a87821fcc7bebf26febf45baf26;hb=71ec2fc5abf34a60f3eea4ecfb438b64040e38c5;hp=09286f1a4ea2ed8eb69bf503be22e0103631790f;hpb=73b5f63e07489868ca4063aa108f38f0fc054b4b;p=app.Builder.js diff --git a/configure.ac b/configure.ac index 09286f1a4..b3f15ab8e 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,9 @@ AC_PROG_CC AM_PROG_VALAC([0.22.0]) + +AC_CHECK_LIB([m],[cos]) + dnl we need to check these exist, then it will generate a compile string for them. PKG_CHECK_MODULES(BUILDER, [ @@ -33,35 +36,41 @@ 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") AM_CONDITIONAL(HAVE_LIBVALA26, test "$vala_2_6_enabled" = "yes") AM_CONDITIONAL(HAVE_LIBVALA24, test "$vala_2_4_enabled" = "yes")