X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=configure.ac;h=f3d369fc97f577b48eb4eea0f2001c4b87fd5df7;hb=6abc9d7ea8a25490e302071afdbf72feab94028c;hp=0c1fdd50616d2c1c84d4d0ea118d43ca25dd857c;hpb=123150be51b3aeab228d5b51c868e203543e1025;p=app.Builder.js

diff --git a/configure.ac b/configure.ac
index 0c1fdd506..f3d369fc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,20 +1,25 @@
-dnl AC_PREREQ([2.65])
 
+dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ([2.68])
 
-AC_INIT([Builder4], [1], [alan@roojs.com])
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
+AC_INIT([builder], [4.0.0])
+
+AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.11 subdir-objects])
+AM_MAINTAINER_MODE([enable])
+
+AM_SILENT_RULES([yes])
 
-AC_CONFIG_FILES([
-	Makefile
-	src/Makefile
-])
-LT_INIT
 AC_PROG_CC
-AM_PROG_VALAC
 
-pkg_modules="glib-2.0 >= 2.24.1
-             gobject-2.0 >= 2.24.1
+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 
@@ -24,15 +29,55 @@ pkg_modules="glib-2.0 >= 2.24.1
 		 webkit2gtk-3.0 
 		 clutter-gtk-1.0 
 		 gladeui-2.0 
-		 libsoup-2.4 
- 		 javascriptcore  
-		  vte-2.90  
-		 libvala
-		 posix
-"
-PKG_CHECK_MODULES(BUILDER4, [$pkg_modules])
-AC_SUBST(BUILDER4_CFLAGS)
-AC_SUBST(BUILDER4_LIBS)
-
-
-AC_OUTPUT
\ No newline at end of file
+		 libsoup-2.4
+ 		 javascriptcoregtk-3.0  
+		  
+])
+
+dnl --- libvala
+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..
+dnl PKG_CHECK_MODULES(VTE_290, vte-2.90, have_vte_290_x="yes", have_vte_290_x="no")
+dnl AM_CONDITIONAL(HAVE_VTE_290, test "$have_vte_290_x" = "yes")
+
+dnl PKG_CHECK_MODULES(VTE_291, vte-2.91, have_vte_291_x="yes", have_vte_291_x="no")
+dnl AM_CONDITIONAL(HAVE_VTE_291, test "$have_vte_291_x" = "yes")
+
+ 
+
+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
+    src/Makefile
+])
+
+  
+AC_SUBST(BUILDER_CFLAGS)
+AC_SUBST(BUILDER_LIBS)
+
+
+AC_OUTPUT