X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=configure.ac;h=7184541a4f088b8a3ae568f6ea7dcf4f6c8feca2;hp=b3f15ab8e9ef0a87821fcc7bebf26febf45baf26;hb=HEAD;hpb=6f1a29c08e2053486b63c66bcb83146444f687ad

diff --git a/configure.ac b/configure.ac
index b3f15ab8e..7184541a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.68])
 
-AC_INIT([builder], [4.0.0])
+AC_INIT([roobuilder], [4.0.0])
 
 AC_CONFIG_HEADERS([config.h])
 
@@ -20,7 +20,7 @@ AC_CHECK_LIB([m],[cos])
 
 dnl we need to check these exist, then it will generate a compile string for them.
 
-PKG_CHECK_MODULES(BUILDER, [
+PKG_CHECK_MODULES(ROOBUILDER, [
 		 clutter-gtk-1.0 
 		 glib-2.0 >= 2.24.1
 		 gobject-2.0 >= 2.24.1
@@ -29,47 +29,55 @@ PKG_CHECK_MODULES(BUILDER, [
 		 json-glib-1.0 		 
 		 gee-1.0 
  		 libxml-2.0 
-		 libsoup-2.4
+		 libsoup-2.4,
+		 roojspacker-1.0
 		  
 ])
 
 dnl --- libvala -- needs to find matching really..
 
-
-PKG_CHECK_MODULES(LIBVALA, [libvala-0.30],
-				[vala_3_0_enabled=yes],
-				[vala_3_0_enabled=no]) 
-if test $vala_3_0_enabled = yes; then
-		    AC_DEFINE(HAVE_LIBVALA30,1,[libvala 0.30 support])
-else				
-    PKG_CHECK_MODULES(LIBVALA, [libvala-0.28],
-				[vala_2_8_enabled=yes],
-				[vala_2_8_enabled=no]) 
-    if test $vala_2_8_enabled = yes; then
-		    AC_DEFINE(HAVE_LIBVALA28,1,[libvala 0.28 support])
-    else
-		    PKG_CHECK_MODULES(LIBVALA, [libvala-0.26],
-				    [vala_2_6_enabled=yes],
-				    [vala_2_6_enabled=no])
-		
-		    if test $vala_2_6_enabled = yes; then
-			    AC_DEFINE(HAVE_LIBVALA26,1,[libvala 0.26 support])
-		    else
-			     PKG_CHECK_MODULES(LIBVALA, [libvala-0.24],
-				    [vala_2_4_enabled=yes],
-				    [vala_2_4_enabled=no])
-				
-			    if test $vala_2_4_enabled = yes; then
-				    AC_DEFINE(HAVE_LIBVALA24,1,[libvala 0.24 support])
-			    else
-				    PKG_CHECK_MODULES(LIBVALA, [libvala-0.22],
-					    [vala_2_2_enabled=yes] )
-					
-				    AC_DEFINE(HAVE_LIBVALA22,1,[libvala 0.22 support])
-			    fi
-		    fi
+PKG_CHECK_MODULES(LIBVALA, [libvala-0.32],
+                [vala_3_2_enabled=yes],
+                [vala_3_2_enabled=no]) 
+if test $vala_3_2_enabled = yes; then
+            AC_DEFINE(HAVE_LIBVALA32,1,[libvala 0.32 support])
+else	
+    PKG_CHECK_MODULES(LIBVALA, [libvala-0.30],
+                    [vala_3_0_enabled=yes],
+                    [vala_3_0_enabled=no]) 
+    if test $vala_3_0_enabled = yes; then
+                AC_DEFINE(HAVE_LIBVALA30,1,[libvala 0.30 support])
+    else				
+        PKG_CHECK_MODULES(LIBVALA, [libvala-0.28],
+                    [vala_2_8_enabled=yes],
+                    [vala_2_8_enabled=no]) 
+        if test $vala_2_8_enabled = yes; then
+                AC_DEFINE(HAVE_LIBVALA28,1,[libvala 0.28 support])
+        else
+                PKG_CHECK_MODULES(LIBVALA, [libvala-0.26],
+                        [vala_2_6_enabled=yes],
+                        [vala_2_6_enabled=no])
+            
+                if test $vala_2_6_enabled = yes; then
+                    AC_DEFINE(HAVE_LIBVALA26,1,[libvala 0.26 support])
+                else
+                     PKG_CHECK_MODULES(LIBVALA, [libvala-0.24],
+                        [vala_2_4_enabled=yes],
+                        [vala_2_4_enabled=no])
+                    
+                    if test $vala_2_4_enabled = yes; then
+                        AC_DEFINE(HAVE_LIBVALA24,1,[libvala 0.24 support])
+                    else
+                        PKG_CHECK_MODULES(LIBVALA, [libvala-0.22],
+                            [vala_2_2_enabled=yes] )
+                        
+                        AC_DEFINE(HAVE_LIBVALA22,1,[libvala 0.22 support])
+                    fi
+                fi
+        fi
     fi
 fi
+AM_CONDITIONAL(HAVE_LIBVALA32, test "$vala_3_2_enabled" = "yes")
 AM_CONDITIONAL(HAVE_LIBVALA30, test "$vala_3_0_enabled" = "yes")
 AM_CONDITIONAL(HAVE_LIBVALA28, test "$vala_2_8_enabled" = "yes")
 AM_CONDITIONAL(HAVE_LIBVALA26, test "$vala_2_6_enabled" = "yes")
@@ -161,11 +169,12 @@ AM_CONDITIONAL(HAVE_VTE_2_91, test "$vte_2_91_enabled" = "yes")
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
+	pixmaps/Makefile
 ])
 
   
-AC_SUBST(BUILDER_CFLAGS)
-AC_SUBST(BUILDER_LIBS)
+AC_SUBST(ROOBUILDER_CFLAGS)
+AC_SUBST(ROOBUILDER_LIBS)
 
 
 AC_OUTPUT