configure.ac
authorAlan Knowles <alan@roojs.com>
Fri, 27 May 2016 02:55:54 +0000 (10:55 +0800)
committerAlan Knowles <alan@roojs.com>
Fri, 27 May 2016 02:55:54 +0000 (10:55 +0800)
configure.ac

index b3f15ab..9e401db 100644 (file)
@@ -35,41 +35,48 @@ PKG_CHECK_MODULES(BUILDER, [
 
 dnl --- libvala -- needs to find matching really..
 
-
-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])
-                   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] )
-                                       
-                                   AC_DEFINE(HAVE_LIBVALA22,1,[libvala 0.22 support])
-                           fi
-                   fi
+PKG_CHECK_MODULES(LIBVALA, [libvala-0.32],
+                [vala_3_2_enabled=yes],
+                [vala_3_2_enabled=no]) 
+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])
+                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] )
+                        
+                        AC_DEFINE(HAVE_LIBVALA22,1,[libvala 0.22 support])
+                    fi
+                fi
+        fi
     fi
 fi
+AM_CONDITIONAL(HAVE_LIBVALA30, test "$vala_3_2_enabled" = "yes")
 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")