From: Alan Knowles <alan@roojs.com>
Date: Tue, 7 Mar 2017 07:12:51 +0000 (+0800)
Subject: configure.ac
X-Git-Tag: release-4.4.2~286
X-Git-Url: http://git.roojs.org/?p=roobuilder;a=commitdiff_plain;h=19ddefd7879cd4b7f279360ad626e1a9ff0eeda2

configure.ac
---

diff --git a/configure.ac b/configure.ac
index 26823ff49..58b236b00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,47 +35,54 @@ PKG_CHECK_MODULES(ROOBUILDER, [
 
 dnl --- libvala -- needs to find matching really..
 
-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])
+PKG_CHECK_MODULES(LIBVALA, [libvala-0.34],
+                    [vala_3_4_enabled=yes],
+                    [vala_3_4_enabled=no]) 
+    if test $vala_3_4_enabled = yes; then
+                AC_DEFINE(HAVE_LIBVALA32,1,[libvala 0.34 support])
+    else
+   
+    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.22],
-                            [vala_2_2_enabled=yes] )
+                         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])
+                        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
 AM_CONDITIONAL(HAVE_LIBVALA32, 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")