sync

diff --git a/configure.ac b/configure.ac
index 03721ac..7ac1474 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,64 +34,59 @@ PKG_CHECK_MODULES(ROOBUILDER, [
 ])
 
 dnl --- libvala -- needs to find matching really..
-PKG_CHECK_MODULES(LIBVALA, [libvala-0.40],
-                       [vala_4_0_enabled=yes],
-                       [vala_4_0_enabled=no]) 
-       if test $vala_4_0_enabled = yes; then
-               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])
+dnl - last supported version is 0.36 - as 0.40 broke the compiler 
+
+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.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])
+          
+               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.26],
-                                                       [vala_2_6_enabled=yes],
-                                                       [vala_2_6_enabled=no])
+                                               PKG_CHECK_MODULES(LIBVALA, [libvala-0.24],
+                                               [vala_2_4_enabled=yes],
+                                               [vala_2_4_enabled=no])
                                        
-                                               if test $vala_2_6_enabled = yes; then
-                                               AC_DEFINE(HAVE_LIBVALA26,1,[libvala 0.26 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.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
+                                                       PKG_CHECK_MODULES(LIBVALA, [libvala-0.22],
+                                                       [vala_2_2_enabled=yes] )
+                                                       
+                                                       AC_DEFINE(HAVE_LIBVALA22,1,[libvala 0.22 support])
                                                fi
                                        fi
                                fi
@@ -99,7 +94,7 @@ PKG_CHECK_MODULES(LIBVALA, [libvala-0.40],
                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")

diff --git a/src/Makefile.am b/src/Makefile.am
index 454a02b..cdb9183 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,10 +33,7 @@ if HAVE_LIBVALA36
 roobuilder_LIBVALA = --pkg libvala-0.36
 endif
 
-if HAVE_LIBVALA40
-roobuilder_LIBVALA = --pkg libvala-0.40
-endif
-
+ 
 # gda