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

diff --git a/configure.ac b/configure.ac
index ae8867819..8161205a8 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
 		  
 ])
 
@@ -59,17 +57,61 @@ 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
+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")
+
+
+
+dnl  -- 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..