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

diff --git a/configure.ac b/configure.ac
index f1b74e594..971300ac0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,12 +26,10 @@ PKG_CHECK_MODULES(BUILDER, [
 		 json-glib-1.0 
 		 gee-1.0 
 		 gobject-introspection-1.0 
-		 webkit2gtk-4.0 
 		 clutter-gtk-1.0 
 		 gladeui-2.0 
 		 libsoup-2.4
- 		 javascriptcoregtk-4.0 
-		libgda-5.0
+ 		 libgda-5.0
 		  
 ])
 
@@ -55,19 +53,67 @@ dnl --- gda
 
 
 
-PKG_CHECK_MODULES(HAVE_GDA, [libgda = 5.0],
+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(HAVE_GDA, [libgda = 4.0],
+        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..