Fix #5829 - Messing around with flutter API

[roobuilder] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1e0d603..7d2f12d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,7 @@ AC_CHECK_LIB([m],[cos])
 
 dnl we need to check these exist, then it will generate a compile string for them.
 
-PKG_CHECK_MODULES(ROOBUILDER, [
-                clutter-gtk-1.0 
+PKG_CHECK_MODULES(ROOBUILDER, [  clutter-gtk-1.0
                 glib-2.0 >= 2.24.1
                 gobject-2.0 >= 2.24.1
                 gtk+-3.0 >= 3.11.3
@@ -30,10 +29,13 @@ PKG_CHECK_MODULES(ROOBUILDER, [
                 gee-0.8
                 libxml-2.0
                 libsoup-2.4,
-                roojspacker-1.1
+                roojspacker-1.2
 ])
 
 dnl --- libvala -- needs to find matching really..
+
+dnl - last supported version is 0.36 - as 0.40 broke the compiler
+
 PKG_CHECK_MODULES(LIBVALA, [libvala-0.40],
                        [vala_4_0_enabled=yes],
                        [vala_4_0_enabled=no]) 
@@ -41,63 +43,65 @@ PKG_CHECK_MODULES(LIBVALA, [libvala-0.40],
                AC_DEFINE(HAVE_LIBVALA40,1,[libvala 0.40 support])
        else
 
-       PKG_CHECK_MODULES(LIBVALA, [libvala-0.36],
-                               [vala_3_6_enabled=yes],
-                               [vala_3_6_enabled=no]) 
-               if test $vala_3_6_enabled = yes; then
-                       AC_DEFINE(HAVE_LIBVALA36,1,[libvala 0.36 support])
-               else
-                  
-               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_LIBVALA34,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.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
-               fi
-       fi
+                PKG_CHECK_MODULES(LIBVALA, [libvala-0.36],
+                                        [vala_3_6_enabled=yes],
+                                        [vala_3_6_enabled=no]) 
+                        if test $vala_3_6_enabled = yes; then
+                                AC_DEFINE(HAVE_LIBVALA36,1,[libvala 0.36 support])
+                        else
+                           
+                        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_LIBVALA34,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.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
+                        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")