X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=configure.ac;h=971300ac073e4f500aaf37698fec6147f1409a0d;hb=9249f0c089b56c7e9baa08fbf0e832b7b62a0e87;hp=c8a41f517ff029dd9eec3b4d39532b974114f8d0;hpb=f34e9af2d57abdd50d3980f0a4c32e00865d7d43;p=app.Builder.js

diff --git a/configure.ac b/configure.ac
index c8a41f517..971300ac0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,15 +26,16 @@ PKG_CHECK_MODULES(BUILDER, [
 		 json-glib-1.0 
 		 gee-1.0 
 		 gobject-introspection-1.0 
-		 webkit2gtk-3.0 
 		 clutter-gtk-1.0 
 		 gladeui-2.0 
 		 libsoup-2.4
- 		 javascriptcoregtk-3.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,21 +49,86 @@ 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 --- gda
+
+
+
+PKG_CHECK_MODULES(GDA, [libgda-5.0],
+                [gda_5_0_enabled=yes],
+                [gda_5_0_enabled=no])
+
+if test $gda_5_0_enabled = yes; then
+        AC_DEFINE(HAVE_GDA5,1,[libgda 5.0 support])
+else
+        PKG_CHECK_MODULES(GDA, [libgda-4.0],
+                [gda_4_0_enabled=yes],
+                [gda_4_0_enabled=no])
+        AC_DEFINE(HAVE_GDA4,1,[libgda 4.0 support])
+       
+
+fi
+AM_CONDITIONAL(HAVE_GDA4, test "$gda_4_0_enabled" = "yes")
+AM_CONDITIONAL(HAVE_GDA5, test "$gda_5_0_enabled" = "yes")
+
+
+dnl  -- webkit-4.0 
+
+
+PKG_CHECK_MODULES(WEBKIT, [webkit2gtk-4.0],
+                [webkit_4_0_enabled=yes],
+                [webkit_4_0_enabled=no])
+
+if test $webkit_4_0_enabled = yes; then
+        AC_DEFINE(HAVE_WEBKIT4,1,[webkit 4.0 support])
+else
+        PKG_CHECK_MODULES(WEBKIT, [webkit2gtk-3.0],
+                [webkit_3_0_enabled=yes],
+                [webkit_3_0_enabled=no])
+        AC_DEFINE(HAVE_WEBKIT3,1,[webkit 3.0 support])
+       
+
+fi
+AM_CONDITIONAL(HAVE_WEBKIT3, test "$webkit_3_0_enabled" = "yes")
+AM_CONDITIONAL(HAVE_WEBKIT4, test "$webkit_4_0_enabled" = "yes")
+
+
+
+dnl  -- javascriptcoregtk-4.0  ** not sure if this is needed....
+
+
+PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [javascriptcoregtk-4.0],
+                [javascriptcoregtk_4_0_enabled=yes],
+                [javascriptcoregtk_4_0_enabled=no])
+
+if test $javascriptcoregtk_4_0_enabled = yes; then
+        AC_DEFINE(HAVE_JAVASCRIPTCOREGTK4,1,[javascriptcoregtk 4.0 support])
+else
+        PKG_CHECK_MODULES(JAVASCRIPTCOREGTK, [javascriptcoregtk-3.0],
+                [javascriptcoregtk_3_0_enabled=yes],
+                [javascriptcoregtk_3_0_enabled=no])
+        AC_DEFINE(HAVE_JAVASCRIPTCOREGTK3,1,[javascriptcoregtk 3.0 support])
+       
+
+fi
+AM_CONDITIONAL(HAVE_JAVASCRIPTCOREGTK3, test "$javascriptcoregtk_3_0_enabled" = "yes")
+AM_CONDITIONAL(HAVE_JAVASCRIPTCOREGTK4, test "$javascriptcoregtk_4_0_enabled" = "yes")
+
+
+
 dnl --- vte -- fixme..
-dnl PKG_CHECK_MODULES(VTE_290, vte-2.90, have_vte_290_x="yes", have_vte_290_x="no")
-dnl AM_CONDITIONAL(HAVE_VTE_290, test "$have_vte_290_x" = "yes")
-
-dnl PKG_CHECK_MODULES(VTE_291, vte-2.91, have_vte_291_x="yes", have_vte_291_x="no")
-dnl AM_CONDITIONAL(HAVE_VTE_291, test "$have_vte_291_x" = "yes")
-
-PKG_CHECK_MODULES(VTE_290, vte-2.90,
-    AC_SUBST(HAVE_VTE_290, 1),
-    PKG_CHECK_MODULES(VTE_291, vte-2.91,
-        AC_SUBST(HAVE_VTE_291, 1)
-    )
-)
  
 
+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([