configure.ac

[app.Builder.js] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9e2357c..bf2855e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -38,10 +38,8 @@ dnl --- libvala -- needs to find matching really..
 
 PKG_CHECK_MODULES(LIBVALA, [libvala-0.28],
                 [vala_2_8_enabled=yes],
-                [vala_2_8_enabled=no])
+                [vala_2_8_enabled=no]) 
                 
-                
-
 if test $vala_2_8_enabled = yes; then
         AC_DEFINE(HAVE_LIBVALA28,1,[libvala 0.28 support])
 else
@@ -68,8 +66,12 @@ else
                fi
 fi
 
+AM_CONDITIONAL(HAVE_LIBVALA28, test "$vala_2_8_enabled" = "yes")
+AM_CONDITIONAL(HAVE_LIBVALA26, test "$vala_2_6_enabled" = "yes")
+AM_CONDITIONAL(HAVE_LIBVALA24, test "$vala_2_4_enabled" = "yes")
+AM_CONDITIONAL(HAVE_LIBVALA22, test "$vala_2_2_enabled" = "yes")
 
-  
+ 
 
 dnl --- gda
 
@@ -83,8 +85,7 @@ 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])
+                [gda_4_0_enabled=yes] )
         AC_DEFINE(HAVE_GDA4,1,[libgda 4.0 support])
 fi
 AM_CONDITIONAL(HAVE_GDA4, test "$gda_4_0_enabled" = "yes")
@@ -102,8 +103,7 @@ 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])
+                [webkit_3_0_enabled=yes] )
         AC_DEFINE(HAVE_WEBKIT3,1,[webkit 3.0 support])
        
 
@@ -124,8 +124,7 @@ 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])
+                [javascriptcoregtk_3_0_enabled=yes] )
         AC_DEFINE(HAVE_JAVASCRIPTCOREGTK3,1,[javascriptcoregtk 3.0 support])
        
 
@@ -138,19 +137,22 @@ AM_CONDITIONAL(HAVE_JAVASCRIPTCOREGTK4, test "$javascriptcoregtk_4_0_enabled" =
 dnl --- vte -- fixme..
  
 
-PKG_CHECK_MODULES(HAVE_VTE, [vte-2.91],
+PKG_CHECK_MODULES(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])
+        PKG_CHECK_MODULES(VTE, [vte-2.90],
+                [vte_2_90_enabled=yes]
+               )
         AC_DEFINE(HAVE_VTE_2_90,1,[libvte 2.90 support])
 fi
 
- 
+AM_CONDITIONAL(HAVE_VTE_2_90, test "$vte_2_90_enabled" = "yes")
+AM_CONDITIONAL(HAVE_VTE_2_91, test "$vte_2_91_enabled" = "yes")
+
 AC_CONFIG_FILES([
     Makefile
     src/Makefile