configure.ac

diff --git a/configure.ac b/configure.ac
index 1e0d603..03721ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -61,43 +61,45 @@ PKG_CHECK_MODULES(LIBVALA, [libvala-0.40],
                        if test $vala_3_2_enabled = yes; then
                                AC_DEFINE(HAVE_LIBVALA32,1,[libvala 0.32 support])
                        else    
-                       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_6_enabled = yes; then
-                                       AC_DEFINE(HAVE_LIBVALA26,1,[libvala 0.26 support])
+                               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.24],
-                                               [vala_2_4_enabled=yes],
-                                               [vala_2_4_enabled=no])
+                                               PKG_CHECK_MODULES(LIBVALA, [libvala-0.26],
+                                                       [vala_2_6_enabled=yes],
+                                                       [vala_2_6_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_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])
                                                
-                                               AC_DEFINE(HAVE_LIBVALA22,1,[libvala 0.22 support])
-                                       fi
+                                                       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
                                        fi
                                fi
                        fi
-                       fi
                fi
        fi
+fi
+AM_CONDITIONAL(HAVE_LIBVALA40, test "$vala_4_0_enabled" = "yes")
 AM_CONDITIONAL(HAVE_LIBVALA36, test "$vala_3_6_enabled" = "yes")
 AM_CONDITIONAL(HAVE_LIBVALA34, test "$vala_3_4_enabled" = "yes")
 AM_CONDITIONAL(HAVE_LIBVALA32, test "$vala_3_2_enabled" = "yes")