X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=configure.ac;h=8dc7ad4031da363e10ffd56671a9f6376eddde78;hb=2263a794ef18f74ff6d72fa19747d85a76d9cd52;hp=0de0895fc37ec6c82b8eb730ec4788cf8e2780c9;hpb=e039d15e537e6550cc767dfeb124017cc7483f3b;p=app.Builder.js

diff --git a/configure.ac b/configure.ac
index 0de0895fc..8dc7ad403 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,28 +13,58 @@ AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 
-AM_PROG_VALAC([0.26.0])
-
-
-BUILDER_PACKAGES=" --pkg glib-2.0 >= 2.24.1
-          --pkg    gobject-2.0 >= 2.24.1
-		 --pkg gtk+-3.0 
-		 --pkg gtksourceview-3.0 
-		--pkg  libxml-2.0 
-		 --pkg json-glib-1.0 
-		--pkg  gee-1.0 
-		 --pkg gobject-introspection-1.0 
-		 --pkg webkit2gtk-3.0 
-		 --pkg clutter-gtk-1.0 
-		 --pkg gladeui-2.0 
-		 --pkg libsoup-2.4 
- 		 --pkg javascriptcoregtk-3.0  
-		 --pkg vte >= 0.28
-		--pkg  libvala-0.26 "
-
-PKG_CHECK_MODULES(BUILDER, [ BUILDER_PACKAGES ])
-
-AC_SUBST(BUILDER_PACKAGES)
+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
+		 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  
+		  
+])
+
+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 --- 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
@@ -42,7 +72,8 @@ AC_CONFIG_FILES([
 ])
 
   
- 
+AC_SUBST(BUILDER_CFLAGS)
+AC_SUBST(BUILDER_LIBS)
 
 
-AC_OUTPUT
\ No newline at end of file
+AC_OUTPUT