X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=configure.ac;h=ae8867819da9ad0d674c041cb95a9b935d2c5d16;hb=ab44d192a198520f653b4cba4d1637bcebaca231;hp=b89a522c689f02053d25eefadeafd17865dda066;hpb=c10eb9949ff5bc1839bc0bc837472e177fde780c;p=app.Builder.js

diff --git a/configure.ac b/configure.ac
index b89a522c6..ae8867819 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,15 +26,18 @@ PKG_CHECK_MODULES(BUILDER, [
 		 json-glib-1.0 
 		 gee-1.0 
 		 gobject-introspection-1.0 
-		 webkit2gtk-3.0 
+		 webkit2gtk-4.0 
 		 clutter-gtk-1.0 
 		 gladeui-2.0 
 		 libsoup-2.4
- 		 javascriptcoregtk-3.0  
+ 		 javascriptcoregtk-4.0 
+		libgda-5.0
 		  
 ])
 
-dnl --- libvala
+dnl --- libvala -- needs to find matching really..
+
+
 PKG_CHECK_MODULES(LIBVALA_0_28_X, libvala-0.28 > 0.26.0, have_libvala_0_28_x="yes", have_libvala_0_28_x="no")
 AM_CONDITIONAL(HAVE_LIBVALA_0_28_X, test "$have_libvala_0_28_x" = "yes")
 
@@ -48,13 +51,40 @@ PKG_CHECK_MODULES(LIBVALA_0_22_X, libvala-0.22 >= 0.17.4, have_libvala_0_22_x="y
 AM_CONDITIONAL(HAVE_LIBVALA_0_22_X, test "$have_libvala_0_22_x" = "yes")
 
 
-dnl --- vte -- fixme..
-PKG_CHECK_MODULES(VTE_290, vte-2.90, have_vte_290_x="yes", have_vte_290_x="no")
-AM_CONDITIONAL(HAVE_VTE_290, test "$have_vte_290_x" = "yes")
+dnl --- gda
+
+
 
-PKG_CHECK_MODULES(VTE_291, vte-2.91, have_vte_291_x="yes", have_vte_291_x="no")
-AM_CONDITIONAL(HAVE_VTE_291, test "$have_vte_291_x" = "yes")
+PKG_CHECK_MODULES(HAVE_GDA, [libgda-5.0],
+                [gda_5_0_enabled=yes],
+                [gda_5_0_enabled=no])
+
+if test $vte_2_91_enabled = yes; then
+        AC_DEFINE(HAVE_GDA5,1,[libgda 5.0 support])
+else
+        
+        PKG_CHECK_MODULES(HAVE_GDA, [libgda-4.0],
+                [gda_4_0_enabled=yes],
+                [gda_4_0_enabled=no])
+    
+        AC_DEFINE(HAVE_GDA4,1,[libgda 4.0 support])
+fi
+    
+
+dnl --- vte -- fixme..
+ 
 
+PKG_CHECK_MODULES(HAVE_VTE, [vte-2.91],
+                [vte_2_91_enabled=yes],
+                [vte_2_91_enabled=no])
+                
+if test $vte_2_91_enabled = yes; then
+        AC_DEFINE(HAVE_VTE_2_91,1,[libvte 2.91 support])
+else
+        PKG_CHECK_MODULES(HAVE_VTE, [vte-2.90],
+                [vte_2_90_enabled=yes])
+        AC_DEFINE(HAVE_VTE_2_90,1,[libvte 2.90 support])
+fi
 
  
 AC_CONFIG_FILES([