X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=configure.ac;h=47d35878cd22d02d0921182e0a2a8cbbc731b2ee;hp=25c2d9c2c1b86987f4e54ee88056496779a70dca;hb=5168eae381e56091595871679df1942447f9c82f;hpb=10590448ab6fb54f983bb140317e42991d51fb40

diff --git a/configure.ac b/configure.ac
index 25c2d9c2c..47d35878c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,27 +13,121 @@ AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 
-AM_PROG_VALAC([0.26.0])
+AM_PROG_VALAC([0.22.0])
+
+dnl we need to check these exist, then it will generate a compile string for them.
 
 PKG_CHECK_MODULES(BUILDER, [
-	glib-2.0 >= 2.24.1
-             gobject-2.0 >= 2.24.1
+		 glib-2.0 >= 2.24.1
+         gobject-2.0 >= 2.24.1
 		 gtk+-3.0 
 		 gtksourceview-3.0 
 		 libxml-2.0 
 		 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  
-		 vte >= 0.28
-		 libvala-0.26
-		 
+		 libsoup-2.4
+ 		 libgda-5.0
+		  
 ])
 
+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")
+
+PKG_CHECK_MODULES(LIBVALA_0_26_X, libvala-0.26 > 0.25.2, have_libvala_0_26_x="yes", have_libvala_0_26_x="no")
+AM_CONDITIONAL(HAVE_LIBVALA_0_26_X, test "$have_libvala_0_26_x" = "yes")
+
+PKG_CHECK_MODULES(LIBVALA_0_24_X, libvala-0.24 > 0.23.1, have_libvala_0_24_x="yes", have_libvala_0_24_x="no")
+AM_CONDITIONAL(HAVE_LIBVALA_0_24_X, test "$have_libvala_0_24_x" = "yes")
+
+PKG_CHECK_MODULES(LIBVALA_0_22_X, libvala-0.22 >= 0.17.4, have_libvala_0_22_x="yes", have_libvala_0_22_x="no")
+AM_CONDITIONAL(HAVE_LIBVALA_0_22_X, test "$have_libvala_0_22_x" = "yes")
+
+
+dnl --- gda
+
+
+
+PKG_CHECK_MODULES(HAVE_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(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
+AM_CONDITIONAL(HAVE_GDA4, test "$gda_4_0_enabled" = "yes")
+AM_CONDITIONAL(HAVE_GDA5, test "$gda_5_0_enabled" = "yes")
+
+
+
+PKG_CHECK_MODULES(HAVE_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(HAVE_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")
+
+
+
+javascriptcoregtk-4.0 
+
+
+PKG_CHECK_MODULES(HAVE_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(HAVE_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..
+ 
+
+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([
     Makefile
@@ -41,7 +135,8 @@ AC_CONFIG_FILES([
 ])
 
   
- 
+AC_SUBST(BUILDER_CFLAGS)
+AC_SUBST(BUILDER_LIBS)
 
 
-AC_OUTPUT
\ No newline at end of file
+AC_OUTPUT