X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=configure.ac;h=3516cd23985fb5f2ad89f79a6fd6d9de383ef543;hp=eb7d94061ce659cbea6c27ed5babcd64177f106d;hb=df4b01e7b27637e4fcfce7b72af267ee54b2c31c;hpb=8d849c06da0eb31acd9b61291aabe6bed1de85ec

diff --git a/configure.ac b/configure.ac
index eb7d94061..3516cd239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,35 +35,48 @@ PKG_CHECK_MODULES(BUILDER, [
 
 dnl --- libvala -- needs to find matching really..
 
-
-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_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")
 AM_CONDITIONAL(HAVE_LIBVALA26, test "$vala_2_6_enabled" = "yes")
@@ -155,6 +168,7 @@ AM_CONDITIONAL(HAVE_VTE_2_91, test "$vte_2_91_enabled" = "yes")
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
+	pixmaps/Makefile
 ])